From fd7a40f56dee72487463a5004d85f32619f250ff Mon Sep 17 00:00:00 2001
From: charles leggett <leggett@cern.ch>
Date: Mon, 19 Mar 2018 16:43:14 -0700
Subject: [PATCH] Preparation for Gaudi v30r2
major changes:
- removal of DECLARE_FACTORY_ENTRIES
- DECLARE_CONVERTER_FACTORY -> DECLARE_CONVERTER
- DECLARE_TOOL_FACTORY -> DECLARE_COMPONENT
- DECLARE_SERVICE_FACTORY -> DECLARE_COMPONENT
- DECLARE_ALGORITHM_FACTORY -> DECLARE_COMPONENT
- constructor of Converters is public, not protected
- remove #include "GaudiKernel/CnvFactory.h"
- remove #include "GaudiKernel/ToolFactory.h"
- remove #include "GaudiKernel/AlgFactory.h"
- remove #include "GaudiKernel/AudFactory.h"
- remove #include "DeclareFactoryEntries.h"
---
.../AthenaPoolMultiTest/src/EventSplit.cxx | 1 -
.../AthenaPoolMultiTest/src/EventTagReader.h | 1 -
.../src/CaloClusterFakeReader.cxx | 1 -
.../src/LArCellContFakeWriter.cxx | 1 -
.../AthenaPoolTest/src/TrkTrackFakeWriter.cxx | 1 -
.../src/CaloCellLinkContainerCnv.h | 2 +
.../src/CaloClusterContainerCnv.h | 2 +
.../src/CaloShowerContainerCnv.h | 2 +
.../CaloMgrDetDescrCnv.h | 2 -
.../CaloSuperCellMgrDetDescrCnv.h | 4 -
.../src/CaloDetMgrDetDescrCnv_entries.cxx | 4 +-
.../src/CaloMgrDetDescrCnv.cxx | 1 -
.../CaloIdCnv/CaloIDHelper_IDDetDescrCnv.h | 5 -
.../CaloIdCnv/CaloIdMgrDetDescrCnv.h | 2 -
.../CaloIdCnv/src/CaloIdCnv_entries.cxx | 32 ++--
.../CaloIdCnv/src/CaloIdMgrDetDescrCnv.cxx | 1 -
.../src/CaloCalibrationHitContainerCnv.h | 3 +-
.../src/CaloTTDetDescrCnv_entries.cxx | 2 +-
.../src/CaloTTMgrDetDescrCnv.cxx | 1 -
.../src/CaloTTMgrDetDescrCnv.h | 2 -
.../AthenaAuditors/src/AthMemoryAuditor.cxx | 1 -
Control/AthenaAuditors/src/CoWAuditor.cxx | 1 -
Control/AthenaAuditors/src/FPEAuditor.cxx | 1 -
Control/AthenaBaseComps/src/AthCnvSvc.cxx | 2 -
.../AthenaBaseComps/src/FilteredAlgorithm.cxx | 1 -
.../AthenaConfiguration/python/bootstrap.pkl | 157 +++++++++---------
.../AthExHive/src/ASCIICondDbSvc.cxx | 1 -
.../AthExHive/src/HiveExSvc.cxx | 1 -
.../AthenaExamples/AthExHive/src/HiveTool.cxx | 1 -
.../AthExJobOptions/CMakeLists.txt | 1 +
.../src/AnotherConcreteSvc.cxx | 1 -
.../AthExJobOptions/src/ConcreteSvc.cxx | 1 -
.../Tutorial/SGRead.cxx_solution | 1 -
.../Tutorial/SGWrite.cxx_solution | 1 -
.../AthExThinning/src/AthExDecayCnv.h | 2 +
.../AthExThinning/src/AthExElephantinoCnv.h | 2 +
.../AthExThinning/src/AthExFatObjectCnv.h | 2 +
.../AthExThinning/src/AthExParticlesCnv.h | 2 +
.../ToyConversion/ToyConverter.h | 4 +-
.../src/components/ToyConversion_entries.cxx | 4 +-
Control/AthenaPython/src/PyComponentMgr.cxx | 1 -
.../AthenaServices/src/AthenaOutputStream.cxx | 1 -
Control/AthenaServices/src/AthenaSealSvc.cxx | 1 -
Control/AthenaServices/src/DecisionSvc.h | 1 -
Control/AthenaServices/src/ItemListSvc.h | 1 -
.../AthenaServices/src/LoggedMessageSvc.cxx | 1 -
Control/AthenaServices/src/ThinningSvc.cxx | 1 -
.../src/ToyNextPassFilterAlg.cxx | 1 -
.../src/ToyNextPassFilterTool.cxx | 1 -
.../test/AthenaEventLoopMgr_test.cxx | 4 +-
Control/AthenaServices/test/RCUSvc_test.cxx | 2 +-
.../DataModelRunTests/share/CondReaderMT.ref | 2 -
.../share/xAODTestDecorHandle1MT.ref | 4 +-
.../share/xAODTestDecorHandle2MT.ref | 2 -
.../share/xAODTestSymlinks1MT.ref | 4 +-
.../share/xAODTestSymlinks2MT.ref | 2 -
Control/IOVSvc/src/CondSvc.cxx | 1 -
Control/IOVSvc/src/IOVSvc.cxx | 1 -
.../PerfMonComps/src/CallGraphAuditor.cxx | 1 -
.../PerfMonComps/src/CallGraphBuilderSvc.cxx | 1 -
.../PerfMonComps/src/PerfMonAuditor.cxx | 1 -
.../PerfMonComps/src/PerfMonSvc.cxx | 1 -
Control/SGMon/SGAudSvc/src/SGAudSvc.cxx | 1 -
Control/Valkyrie/src/ValgrindSvc.cxx | 1 -
.../AthenaPoolCnvSvc/T_AthenaPoolCnv.h | 6 +-
.../AthenaPoolCnvSvc/T_AthenaPoolCnvBase.h | 5 +-
.../T_AthenaPoolCoolMultChanCnv.h | 4 +-
.../AthenaPoolCnvSvc/T_AthenaPoolCustomCnv.h | 4 +-
.../T_AthenaPoolExtendingCnv.h | 5 +-
.../src/AthenaAttributeListCnv.h | 3 -
.../src/CondAttrListCollCnv.h | 3 -
.../AthenaPoolCnvSvc/src/CondAttrListVecCnv.h | 3 -
.../components/AthenaPoolCnvSvc_entries.cxx | 6 +-
.../src/ReadMeta.cxx | 1 -
.../AthenaPoolTools/src/BookkeeperDumper.cxx | 1 -
.../AthenaPoolTools/src/EventCount.cxx | 1 -
.../AthenaPoolTools/src/MetadataTest.cxx | 1 -
.../src/RequireUniqueEvent.cxx | 1 -
.../StlAthenaPoolCnv/src/StlAthenaPoolCnv.cxx | 6 +-
.../src/RootNtupleOutputStream.cxx | 1 -
.../DBReplicaSvc/src/DBReplicaSvc.cxx | 1 -
.../src/IOVDbMetaDataTool.cxx | 1 -
.../src/IOVRegistrationSvc.cxx | 2 +-
.../src/OutputConditionsAlg.cxx | 1 -
.../src/RegistrationStream.cxx | 1 -
.../AGDD/AGDD2GeoSvc/src/AGDD2GeoSvc.cxx | 1 -
.../DetDescrCnvSvc/src/DetDescrCnvSvc.cxx | 2 -
.../DetDescrCnvSvc/src/DetDescrConverter.cxx | 3 -
.../src/AlignableTransformContainerCnv.h | 2 +
.../DetDescrCondTools/src/AlignTransTool.cxx | 1 -
.../DetDescrCondTools/src/CoolStrFileSvc.cxx | 1 -
.../DetectorStatus/src/DetStatusSvc.cxx | 1 -
.../src/AtlasIDDetDescrCnv.cxx | 1 -
.../src/AtlasIDDetDescrCnv.h | 2 -
.../src/IdDictDetDescrCnv.cxx | 1 -
.../IdDictDetDescrCnv/src/IdDictDetDescrCnv.h | 2 -
.../src/IdDictDetDescrCnv_entries.cxx | 4 +-
.../src/ByteStreamMergeOutputSvc.cxx | 1 -
.../src/ByteStreamSingleEventInputSvc.cxx | 1 -
.../src/EventInfoByteStreamCnv.cxx | 1 -
.../src/EventInfoByteStreamCnv.h | 5 +-
.../components/ByteStreamCnvSvc_entries.cxx | 2 +-
.../CollectionByteStreamCnv.icc | 1 -
Event/EventAthenaPool/src/EventInfoCnv.h | 2 +
.../EventAthenaPool/src/EventStreamInfoCnv.h | 2 +
.../EventAthenaPool/src/MergedEventInfoCnv.h | 2 +
.../EventAthenaPool/src/PileUpEventInfoCnv.h | 2 +
.../src/EventBookkeeperCnv.h | 2 +
.../src/EventBookkeeperCollectionCnv.h | 2 +
.../src/SkimDecisionCnv.h | 2 +
.../src/SkimDecisionCollectionCnv.h | 2 +
.../src/INav4MomAssocsCnv.h | 2 +
.../src/INav4MomLinkContainerCnv.h | 2 +
.../src/IParticleLinkContainerCnv.h | 2 +
Event/EventInfoMgt/src/TagInfoMgr.cxx | 1 -
.../src/xAODBTagVertexAuxContainerCnv.h | 8 +-
.../src/xAODBTaggingAuxContainerCnv.h | 8 +-
.../src/xAODBTaggingTrigAuxContainerCnv.h | 2 +
.../src/xAODCaloClusterAuxContainerCnv.h | 2 +
.../src/xAODCaloTowerAuxContainerCnv.h | 2 +
.../src/xAODCaloRingsAuxContainerCnv.h | 8 +-
.../src/xAODRingSetAuxContainerCnv.h | 2 +
.../src/xAODRingSetConfAuxContainerCnv.h | 2 +
.../src/xAODAuxContainerBaseCnv.h | 6 +-
.../src/xAODShallowAuxContainerCnv.h | 6 +-
.../src/xAODCutBookkeeperAuxContainerCnv.h | 6 +-
.../src/xAODElectronAuxContainerCnv.h | 2 +
.../src/xAODPhotonAuxContainerCnv.h | 2 +
.../src/xAODAFPSiHitAuxContainerCnv.h | 6 +-
.../src/xAODAFPSiHitsClusterAuxContainerCnv.h | 6 +-
.../src/xAODAFPTrackAuxContainerCnv.h | 6 +-
.../src/xAODJetAuxContainerCnv.h | 2 +
.../src/xAODJetTrigAuxContainerCnv.h | 2 +
.../src/xAODMissingETAuxAssociationMapCnv.h | 2 +
.../src/xAODMissingETAuxComponentMapCnv.h | 2 +
.../src/xAODMissingETAuxContainerCnv.h | 2 +
.../src/xAODMuonAuxContainerCnv.h | 2 +
.../src/xAODMuonSegmentAuxContainerCnv.h | 2 +
.../src/xAODSlowMuonAuxContainerCnv.h | 2 +
.../src/xAODPFOAuxContainerCnv.h | 2 +
.../src/xAODTrackCaloClusterAuxContainerCnv.h | 2 +
.../xAODCompositeParticleAuxContainerCnv.h | 2 +
.../src/xAODParticleAuxContainerCnv.h | 2 +
.../src/xAODDiTauJetAuxContainerCnv.h | 2 +
.../src/xAODTauJetAuxContainerCnv.h | 2 +
.../src/xAODTauTrackAuxContainerCnv.h | 2 +
.../src/xAODNeutralParticleAuxContainerCnv.h | 6 +-
...rackMeasurementValidationAuxContainerCnv.h | 6 +-
.../src/xAODTrackParticleAuxContainerCnv.h | 9 +-
.../xAODTrackStateValidationAuxContainerCnv.h | 6 +-
.../src/xAODVertexAuxContainerCnv.h | 6 +-
.../src/xAODTrigBphysAuxContainerCnv.h | 6 +-
.../src/xAODCaloClusterTrigAuxContainerCnv.h | 2 +
.../src/xAODTrigCaloClusterAuxContainerCnv.h | 2 +
.../src/xAODTrigEMClusterAuxContainerCnv.h | 2 +
.../src/xAODElectronTrigAuxContainerCnv.h | 2 +
.../src/xAODPhotonTrigAuxContainerCnv.h | 2 +
.../src/xAODTrigElectronAuxContainerCnv.h | 2 +
.../src/xAODTrigPhotonAuxContainerCnv.h | 2 +
.../xAODTrigSpacePointCountsAuxContainerCnv.h | 6 +-
.../src/xAODTrigT2MbtsBitsAuxContainerCnv.h | 6 +-
.../src/xAODTrigT2ZdcSignalsAuxContainerCnv.h | 6 +-
.../src/xAODTrigTrackCountsAuxContainerCnv.h | 6 +-
.../src/xAODTrigVertexCountsAuxContainerCnv.h | 6 +-
.../src/xAODTrigMissingETAuxContainerCnv.h | 6 +-
.../src/xAODL2CombinedMuonAuxContainerCnv.h | 6 +-
.../src/xAODL2IsoMuonAuxContainerCnv.h | 6 +-
.../src/xAODL2StandAloneMuonAuxContainerCnv.h | 6 +-
.../src/xAODTrigRNNOutputAuxContainerCnv.h | 8 +-
.../src/xAODTrigRingerRingsAuxContainerCnv.h | 7 +-
.../src/xAODEmTauRoIAuxContainerCnv.h | 2 +
.../src/xAODEnergySumRoIAuxInfoCnv.h | 2 +
.../src/xAODJetRoIAuxContainerCnv.h | 2 +
.../src/xAODTrigNavigationAuxInfoCnv.h | 2 +
.../src/xAODTriggerMenuAuxContainerCnv.h | 2 +
.../src/xAODTruthEventAuxContainerCnv.h | 6 +-
.../src/xAODTruthParticleAuxContainerCnv.h | 6 +-
.../src/xAODTruthPileupEventAuxContainerCnv.h | 6 +-
.../src/xAODTruthVertexAuxContainerCnv.h | 6 +-
.../AFP_ByteStream2RawCnv.h | 1 -
.../AFP_RawDataProviderTool.h | 1 -
.../src/components/AFP_DBTools_entries.cxx | 8 +-
.../src/AFP_SIDLocRecoEvCollectionCnv.h | 2 +
.../src/AFP_SIDSimHitCollectionCnv.h | 2 +
.../src/AFP_SiDigiCollectionCnv.h | 2 +
.../src/AFP_TDDigiCollectionCnv.h | 3 +-
.../src/AFP_TDLocRecoEvCollectionCnv.h | 2 +
.../src/AFP_TDSimHitCollectionCnv.h | 2 +
.../src/ALFA_CLinkEventCnv.h | 2 +
.../src/ALFA_DigitCollectionCnv.h | 2 +
.../src/ALFA_GloRecEvCollectionCnv.h | 2 +
.../src/ALFA_HitCollectionCnv.h | 2 +
.../src/ALFA_LocRecCorrEvCollectionCnv.h | 2 +
.../src/ALFA_LocRecCorrODEvCollectionCnv.h | 2 +
.../src/ALFA_LocRecEvCollectionCnv.h | 2 +
.../src/ALFA_LocRecODEvCollectionCnv.h | 2 +
.../src/ALFA_ODDigitCollectionCnv.h | 2 +
.../src/ALFA_ODHitCollectionCnv.h | 2 +
.../src/ALFA_RawDataContainerCnv.h | 5 +-
.../src/ALFA_RawDataContainerCnv_charge.h | 1 -
.../ALFA_RawDataByteStreamCnv/ALFA_Decoder.h | 1 -
.../ALFA_Decoder_charge.h | 1 -
.../ALFA_RawDataProviderTool.h | 1 -
.../ALFA_RawDataProviderTool_charge.h | 1 -
.../ForwardIdCnv/src/ForwardIdCnv_entries.cxx | 2 +-
.../ForwardIdCnv/src/ZdcIDDetDescrCnv.cxx | 1 -
.../ForwardIdCnv/src/ZdcIDDetDescrCnv.h | 4 +-
.../src/SimulationHitCollectionCnv.h | 2 +
.../src/LUCID_DigitContainerCnv.h | 2 +
.../src/LUCID_RawDataContainerCnv.h | 2 +
.../LUCID_DigitByteStreamCnv.h | 1 -
.../LUCID_RawDataByteStreamCnv_entries.cxx | 2 +-
.../ZdcByteStream/ZdcByteStreamCnv.h | 5 +-
.../ZdcByteStream/src/ZdcByteStreamCnv.cxx | 1 -
.../src/components/ZdcByteStream_entries.cxx | 2 +-
.../src/ZDC_SimPixelHit_CollectionCnv.h | 2 +
.../src/ZDC_SimStripHit_CollectionCnv.h | 2 +
.../src/ZdcDigitsCollectionCnv.h | 2 +
.../src/ZdcRawChannelCollectionCnv.h | 3 +-
Generators/EvtGen_i/src/EvtInclusiveDecay.cxx | 1 -
.../src/BoostedHadTopAndTopPair.cxx | 1 -
Generators/GeneratorFilters/src/HTFilter.cxx | 1 -
.../GeneratorFilters/src/HiggsFilter.cxx | 1 -
.../GeneratorFilters/src/LeptonPairFilter.cxx | 1 -
.../src/SusySubprocessFinder.cxx | 1 -
.../src/TTbarPlusHeavyFlavorFilter.cxx | 1 -
.../src/TtHtoVVDecayFilter.cxx | 3 +-
.../src/VHtoVVDiLepFilter.cxx | 1 -
.../GeneratorFilters/src/VHtoVVFilter.cxx | 1 -
.../GeneratorFilters/src/XtoVVDecayFilter.cxx | 1 -
.../src/XtoVVDecayFilterExtended.cxx | 1 -
.../src/McEventCollectionCnv.h | 2 +
.../src/McAsciiCnvSvc.cxx | 2 -
.../src/McAsciiEventCnv.cxx | 1 -
.../src/McAsciiEventCnv.h | 6 -
.../McAsciiEventSelector_entries.cxx | 2 +-
.../McEventSelector/McEventCnv.h | 4 +-
Generators/McEventSelector/src/McCnvSvc.cxx | 2 -
Generators/McEventSelector/src/McEventCnv.cxx | 1 -
.../McEventSelector/src/McEventSelector.cxx | 1 -
.../src/McEventSelector_entries.cxx | 2 +-
Generators/PythiaB/src/PythiaB.cxx | 1 -
.../TrigServices/src/TrigMessageSvc.cxx | 1 -
.../TrigServices/src/TrigMonTHistSvc.cxx | 1 -
.../src/TrigALFAROBMonitor.cxx | 1 -
.../src/TrigMuCTPiROBMonitor.cxx | 1 -
.../TrigOnlineMonitor/src/TrigROBMonitor.cxx | 1 -
.../InDetBeamSpotService/src/BeamCondSvc.cxx | 1 -
.../src/InDetBSErrContainerCnv.h | 5 +-
.../src/SCT_ByteStreamFractionContainerCnv.h | 3 +-
.../src/TRT_BSErrContainerCnv.h | 5 +-
.../src/TRT_BSIdErrContainerCnv.h | 5 +-
.../test/PixelMapTestAlg.cxx | 1 -
.../src/PixelDCSTestReadWrite.cxx | 1 -
.../src/PixelDistortionsTestReadWrite.cxx | 1 -
.../src/TRT_ByteStream_ConditionsSvc.cxx | 1 -
.../src/TRT_DAQ_ConditionsSvc.cxx | 1 -
.../src/SCT_TestDistortionsTool.cxx | 1 -
.../TRT_Cabling/src/TRT_CablingSvc.cxx | 1 -
.../src/TRT_FillCablingData_DC1.cxx | 1 -
.../src/TRT_FillCablingData_DC2.cxx | 1 -
.../src/TRT_FillCablingData_DC3.cxx | 1 -
.../src/TRT_FillCablingData_SR1.cxx | 1 -
.../src/TRT_FillCablingData_SR1_ECC.cxx | 1 -
.../src/TRT_FillCablingData_TB04.cxx | 1 -
.../InDetIdCnv/src/InDetIdCnv_entries.cxx | 8 +-
.../InDetIdCnv/src/PixelIDDetDescrCnv.cxx | 1 -
.../InDetIdCnv/src/PixelIDDetDescrCnv.h | 2 -
.../InDetIdCnv/src/SCT_IDDetDescrCnv.cxx | 1 -
.../InDetIdCnv/src/SCT_IDDetDescrCnv.h | 2 -
.../InDetIdCnv/src/SiliconIDDetDescrCnv.cxx | 1 -
.../InDetIdCnv/src/SiliconIDDetDescrCnv.h | 2 -
.../InDetIdCnv/src/TRT_IDDetDescrCnv.cxx | 1 -
.../InDetIdCnv/src/TRT_IDDetDescrCnv.h | 2 -
.../src/ChargeCollProbSvc.cxx | 1 -
.../BCM_RawDataByteStreamCnv_entries.cxx | 2 +-
.../src/BCM_RDO_ContainerCnv.h | 7 +-
.../src/InDetLowBetaCandidateCnv.h | 2 +
.../src/InDetLowBetaContainerCnv.h | 2 +
.../src/InDetSimDataCollectionCnv.h | 2 +
.../InDetEventAthenaPool/src/InDetTrackCnv.h | 2 +
.../src/PixelClusterContainerCnv.h | 2 +
.../src/PixelClusterContainerCnv_p0.cxx | 1 -
.../src/PixelGangedClusterAmbiguitiesCnv.h | 2 +
.../src/PixelRDO_ContainerCnv.h | 3 +-
.../src/SCT_ClusterContainerCnv.h | 2 +
.../src/SCT_ClusterContainerCnv_p0.cxx | 1 -
.../src/SCT_RDO_ContainerCnv.h | 2 +
.../src/TRT_DriftCircleContainerCnv.h | 2 +
.../src/TRT_DriftCircleContainerCnv_p0.cxx | 1 -
.../src/TRT_RDO_ContainerCnv.h | 3 +-
.../PixelClusterContainerCnv_p1.cxx | 1 -
.../PixelGangedClusterAmbiguitiesCnv_p1.cxx | 1 -
.../SCT_ClusterContainerCnv_p1.cxx | 1 -
.../TRT_DriftCircleContainerCnv_p1.cxx | 1 -
.../src/PixelClusterContainerCnv_p2.cxx | 1 -
.../src/PixelClusterContainerCnv_p3.cxx | 1 -
.../src/SCT_ClusterContainerCnv_p2.cxx | 1 -
.../src/SCT_ClusterContainerCnv_p3.cxx | 1 -
.../src/TRT_DriftCircleContainerCnv_p2.cxx | 1 -
.../src/SiHitCollectionCnv.h | 3 +-
.../src/TRTUncompressedHitCollectionCnv.h | 3 +-
.../src/PixelRawContByteStreamCnv.h | 3 -
.../PixelRawDataByteStreamCnv_entries.cxx | 2 +-
.../src/SCTRawContByteStreamCnv.h | 6 +-
.../SCT_RawDataByteStreamCnv_entries.cxx | 2 +-
.../src/TRTRawContByteStreamCnv.h | 8 +-
.../src/TRTRawContByteStreamTool.cxx | 1 -
.../src/TRTRawDataProviderTool.cxx | 1 -
.../TRT_RawDataByteStreamCnv_entries.cxx | 2 +-
.../src/InDetSVWithMuonTool.cxx | 1 -
.../src/BTagVrtSecMulti.cxx | 1 -
.../src/InDetVKalVxInJetTool.cxx | 1 -
.../src/PixelGangedAmbiguitiesFinder.cxx | 1 -
.../src/TRT_DriftCircleTool.cxx | 1 -
.../src/TRT_DriftCircleToolCosmics.cxx | 1 -
.../src/TRT_DriftFunctionTool.cxx | 1 -
.../TRT_ToT_Tools/src/TRT_ToT_dEdx.cxx | 1 -
.../src/TRT_TrackExtensionTool_DAF.cxx | 1 -
.../src/InDetTrigExtensProcessor.cxx | 2 -
.../src/InDetEventSplitter.cxx | 1 -
.../src/InDetVertexSplitter.cxx | 1 -
.../src/InDetVertexSplitterHist.cxx | 1 -
LArCalorimeter/LArCafJobs/src/LArHECNoise.cxx | 1 -
.../LArCafJobs/src/LArNoiseBursts.cxx | 1 -
.../LArCafJobs/src/LArShapeDumper.cxx | 1 -
.../LArCafJobs/src/LArSimpleShapeDumper.cxx | 1 -
.../LArCalibTools/src/ForceLoadCondObj.cxx | 1 -
.../src/LArAutoCorrDecoderTool.cxx | 1 -
.../LArCalibUtils/src/LArCalibDigitMaker.cxx | 1 -
.../src/LArPedestalInPhysicsMaker.cxx | 1 -
.../LArCalibUtils/src/LArPedestalMaker.cxx | 1 -
.../LArAthenaPool/src/LArDigitContainerCnv.h | 4 +-
.../LArAthenaPool/src/LArFebErrorSummaryCnv.h | 4 +-
.../LArAthenaPool/src/LArNoisyROSummaryCnv.h | 4 +-
.../src/LArRawEventContainerCnv.h | 6 +-
...ArAccumulatedCalibDigitContByteStreamCnv.h | 1 -
.../LArAccumulatedDigitContByteStreamCnv.h | 1 -
.../LArCalibDigitContByteStreamCnv.h | 1 -
.../LArByteStream/LArDigitContByteStreamCnv.h | 1 -
.../LArFebHeaderContByteStreamCnv.h | 6 +-
.../LArRawChannelContByteStreamCnv.h | 1 -
...AccumulatedCalibDigitContByteStreamCnv.cxx | 1 -
.../LArAccumulatedDigitContByteStreamCnv.cxx | 1 -
.../src/LArCalibDigitContByteStreamCnv.cxx | 1 -
.../src/LArDigitContByteStreamCnv.cxx | 1 -
.../src/LArFebHeaderContByteStreamCnv.cxx | 1 -
.../src/LArRawChannelContByteStreamCnv.cxx | 1 -
.../src/LArRawDataContByteStreamTool.cxx | 1 -
.../src/components/LArByteStream_entries.cxx | 15 +-
.../src/LArAutoCorrCompleteCnv.h | 2 +
.../LArCondAthenaPool/src/LArAutoCorrMCCnv.h | 2 +
.../src/LArCaliWaveContainerCnv.h | 2 +
.../src/LArDAC2uACompleteCnv.h | 2 +
.../LArCondAthenaPool/src/LArDAC2uAMCCnv.h | 2 +
.../src/LArDSPThresholdsCompleteCnv.h | 2 +
.../src/LArHVScaleCorrCompleteCnv.h | 2 +-
.../src/LArMphysOverMcalCompleteCnv.h | 2 +
.../src/LArMphysOverMcalMCCnv.h | 2 +
.../src/LArOFCBinCompleteCnv.h | 2 +
.../LArCondAthenaPool/src/LArOFCCompleteCnv.h | 2 +
.../LArCondAthenaPool/src/LArOFCMCCnv.h | 2 +
.../src/LArPedestalCompleteCnv.h | 2 +
.../LArCondAthenaPool/src/LArPedestalMCCnv.h | 2 +
.../src/LArPhysWaveContainerCnv.h | 2 +
.../src/LArRampCompleteCnv.h | 2 +
.../LArCondAthenaPool/src/LArRampMCCnv.h | 2 +
.../LArCondAthenaPool/src/LArShape32MCCnv.h | 2 +
.../src/LArShapeCompleteCnv.h | 2 +
.../LArCondAthenaPool/src/LArShapeMCCnv.h | 2 +
.../src/LAruA2MeVCompleteCnv.h | 2 +
.../LArCondAthenaPool/src/LAruA2MeVMCCnv.h | 2 +
.../LArIdCnv/LArElectrodeIDDetDescrCnv.h | 3 -
.../LArIdCnv/LArHVLineIDDetDescrCnv.h | 2 -
.../LArIdCnv/LArIdCnv/LArIdMgrDetDescrCnv.h | 2 -
.../LArIdCnv/LArOnlineIDDetDescrCnv.h | 2 -
.../LArOnline_SuperCellIDDetDescrCnv.h | 2 -
.../src/LArElectrodeIDDetDescrCnv.cxx | 1 -
.../LArIdCnv/src/LArHVLineIDDetDescrCnv.cxx | 1 -
.../LArCnv/LArIdCnv/src/LArIdCnv_entries.cxx | 10 +-
.../LArIdCnv/src/LArIdMgrDetDescrCnv.cxx | 1 -
.../LArIdCnv/src/LArOnlineIDDetDescrCnv.cxx | 1 -
.../src/LArOnline_SuperCellIDDetDescrCnv.cxx | 1 -
.../src/LArHitContainerCnv.h | 2 +
.../src/LArHitFloatContainerCnv.h | 2 +
.../src/TestLArHWID_Algo.cxx | 1 -
.../TestLArHardwareID/src/initTTMap_Algo.cxx | 1 -
.../src/reinitTTMap_Algo.cxx | 1 -
.../TestLArHardwareID/src/testTTMap_Algo.cxx | 1 -
.../src/updateTTMap_Algo.cxx | 1 -
.../src/MiniFCALAssignIdentifier.h | 1 -
.../src/Other/LArTBH6BeamInfo.cc | 1 -
LArCalorimeter/LArMonTools/src/LArFEBMon.cxx | 1 -
LArCalorimeter/LArROD/src/ReadLArDigits.cxx | 1 -
.../LArRecUtils/src/LArADC2MeVTool.cxx | 1 -
.../LArRecUtils/src/LArAutoCorrTotalTool.cxx | 1 -
.../LArRecUtils/src/LArHVCorrTool.cxx | 1 -
LArCalorimeter/LArRecUtils/src/LArOFCTool.cxx | 1 -
.../LArSim/src/LArFakeHitProducer.cxx | 1 -
LArCalorimeter/LArSim/src/LArHitMaker.cxx | 1 -
LArCalorimeter/LArSim/src/LArHitProducer.cxx | 1 -
LArCalorimeter/LArSim/src/LArHitReader.cxx | 1 -
.../LArCalibTest/src/LArCablingChecker.cxx | 1 -
.../LArEventTest/src/CheckLArFebHeader.cxx | 1 -
.../Root/LumiBlockMetaDataTool.cxx | 1 -
LumiBlock/LumiBlockComps/src/LumiCalcSvc.cxx | 1 -
.../src/LumiBlockCollectionCnv.h | 2 +
.../Amdcsimrec/AmdcDb/src/AmdcDb.cxx | 1 -
.../AmdcMGM/src/AmdcDumpGeoModel.cxx | 1 -
.../AmdcOracle/src/AmdcDumpOracle.cxx | 1 -
.../MdtCalibSvc/src/MdtCalibrationDbSvc.cxx | 1 -
.../src/MdtCalibrationRegionSvc.cxx | 1 -
.../src/RpcExtrapolationTool.cxx | 1 -
.../RpcCalibTools/src/RpcResidualsTool.cxx | 1 -
.../MuonByteStream/CscRdoContByteStreamCnv.h | 3 +-
.../MuonByteStream/MdtCsmContByteStreamCnv.h | 3 +-
.../MuonByteStream/RpcPadContByteStreamCnv.h | 3 +-
.../MuonByteStream/TgcRdoContByteStreamCnv.h | 4 +-
.../src/CscRdoContByteStreamCnv.cxx | 1 -
.../src/MdtCsmContByteStreamCnv.cxx | 1 -
.../src/RpcPadContByteStreamCnv.cxx | 1 -
.../src/TgcRdoContByteStreamCnv.cxx | 1 -
.../src/components/MuonByteStream_entries.cxx | 8 +-
.../src/MuonRdoToMuonDigitTool.cxx | 1 -
.../src/CscRdoContByteStreamTool.cxx | 1 -
.../MuonEventAthenaPool/src/ChamberT0sCnv.h | 2 +
.../src/CscPrepDataContainerCnv.cxx | 1 -
.../src/CscSimDataCollectionCnv.cxx | 1 -
.../src/CscStripPrepDataContainerCnv.cxx | 1 -
.../src/MMPrepDataContainerCnv.cxx | 1 -
.../src/MdtPrepDataContainerCnv.cxx | 1 -
.../src/MmDigitContainerCnv.cxx | 1 -
.../src/MuonMeasurementsCnv.h | 2 +
.../src/MuonRdoContainerCnv.icc | 1 -
.../src/MuonRdoContainerTPCnv.h | 3 +-
.../src/MuonSimDataCollectionCnv.cxx | 1 -
.../src/RpcCoinDataContainerCnv.cxx | 1 -
.../src/RpcPadContainerCnv_p1.cxx | 1 -
.../src/RpcPadContainerCnv_p2.cxx | 1 -
.../src/RpcPrepDataContainerCnv.cxx | 1 -
.../src/RpcSectorLogicContainerCnv.h | 2 +
.../src/RpcSectorLogicContainerCnv_p1.cxx | 1 -
.../src/TgcCoinDataContainerCnv.cxx | 1 -
.../src/TgcPrepDataContainerCnv.cxx | 1 -
.../src/sTgcDigitContainerCnv.cxx | 1 -
.../src/sTgcPrepDataContainerCnv.cxx | 1 -
.../test/RpcPadContainerCnv_p1_test.cxx | 2 +-
.../test/RpcPadContainerCnv_p2_test.cxx | 2 +-
.../MM_DigitContainerCnv_p1.cxx | 3 -
.../MM_DigitContainerCnv_p2.cxx | 3 -
.../STGC_DigitContainerCnv_p1.cxx | 3 -
.../CscPrepDataContainerCnv_p1.cxx | 1 -
.../CscPrepDataContainerCnv_p2.cxx | 3 -
.../CscStripPrepDataContainerCnv_p1.cxx | 1 -
.../MMPrepDataContainerCnv_p1.cxx | 3 -
.../MdtPrepDataContainerCnv_p1.cxx | 1 -
.../MdtPrepDataContainerCnv_p2.cxx | 3 -
.../RpcPrepDataContainerCnv_p1.cxx | 1 -
.../RpcPrepDataContainerCnv_p2.cxx | 1 -
.../RpcPrepDataContainerCnv_p3.cxx | 3 -
.../TgcPrepDataContainerCnv_p1.cxx | 1 -
.../TgcPrepDataContainerCnv_p2.cxx | 3 -
.../TgcPrepDataContainerCnv_p3.cxx | 3 -
.../sTgcPrepDataContainerCnv_p1.cxx | 3 -
.../RpcCoinDataContainerCnv_p1.cxx | 5 -
.../TgcCoinDataContainerCnv_p1.cxx | 1 -
.../TgcCoinDataContainerCnv_p2.cxx | 1 -
.../TgcCoinDataContainerCnv_p3.cxx | 1 -
.../MuonIdCnv/src/CSC_IDDetDescrCnv.cxx | 1 -
.../MuonCnv/MuonIdCnv/src/CSC_IDDetDescrCnv.h | 2 -
.../MuonIdCnv/src/MDT_IDDetDescrCnv.cxx | 1 -
.../MuonCnv/MuonIdCnv/src/MDT_IDDetDescrCnv.h | 2 -
.../MuonIdCnv/src/MM_IDDetDescrCnv.cxx | 1 -
.../MuonCnv/MuonIdCnv/src/MM_IDDetDescrCnv.h | 2 -
.../MuonIdCnv/src/MuonIdCnv_entries.cxx | 12 +-
.../MuonIdCnv/src/RPC_IDDetDescrCnv.cxx | 1 -
.../MuonCnv/MuonIdCnv/src/RPC_IDDetDescrCnv.h | 2 -
.../MuonIdCnv/src/TGC_IDDetDescrCnv.cxx | 1 -
.../MuonCnv/MuonIdCnv/src/TGC_IDDetDescrCnv.h | 2 -
.../MuonIdCnv/src/sTGC_IDDetDescrCnv.cxx | 1 -
.../MuonIdCnv/src/sTGC_IDDetDescrCnv.h | 2 -
.../src/MdtCsmContByteStreamTool.cxx | 1 -
.../src/MuonPrdSelectorAlg.cxx | 1 -
.../src/RpcPadContByteStreamTool.cxx | 1 -
.../src/CSCSimHitCollectionCnv.cxx | 1 -
.../src/GenericMuonSimHitCollectionCnv.cxx | 1 -
.../src/MDTSimHitCollectionCnv.cxx | 1 -
.../src/RPCSimHitCollectionCnv.cxx | 1 -
.../src/TGCSimHitCollectionCnv.cxx | 1 -
.../MuonCondCool/src/CscCoolTest.cxx | 1 -
.../MuonCondSvc/src/CscCoolStrSvc.cxx | 1 -
.../MuonCondSvc/src/MdtCoolStrSvc.cxx | 1 -
.../MuonCondSvc/src/RpcCoolStrSvc.cxx | 1 -
.../MuonCondSvc/src/TriggerCoolSvc.cxx | 1 -
.../src/RpcByteStreamErrorContainerCnv.h | 3 +-
.../MuonAGDD/src/MuonAGDDToolHelper.cxx | 1 -
.../MDT_Digitization/chargeCalculator.h | 1 -
.../chargeCalculator_PileUp.h | 1 -
.../MDT_Digitization/particleGamma.h | 1 -
.../MDT_Digitization/particleGamma_PileUp.h | 1 -
.../src/RT_Relation_DB_DigiTool.cxx | 1 -
.../MM_Digitization/StripsResponse.h | 1 -
.../src/MM_Response_DigitTool.cxx | 1 -
.../src/MmDigitizationTool.cxx | 1 -
.../src/sTgcDigitizationTool.cxx | 1 -
.../src/MuonCombinePatternTool.cxx | 1 -
.../src/AdjustableT0Tool.cxx | 1 -
.../src/MuonHolesOnTrackTool.cxx | 2 -
.../src/MuonTGMeasurementTool.cxx | 2 -
.../MuonAlignMonitoring/MuonAlignSegment.h | 1 -
.../MuonAlignMonitoring/MuonAlignValidation.h | 1 -
.../src/MuonAlignValidation.cxx | 1 -
.../MuonDQAUtils/InnerDetProbeCollectorTool.h | 1 -
.../MuonDQAUtils/InsituTrackTools.h | 1 -
.../MuonSpectrometerProbeCollectorTool.h | 1 -
.../src/MdtVsRpcRawDataValAlg.cxx | 1 -
.../src/MdtVsTgcRawDataValAlg.cxx | 1 -
.../src/MdtVsTgcRawData_correlation.cxx | 1 -
.../src/MdtVsTgcRawData_functions.cxx | 1 -
.../src/RPCStandaloneTracksMon.cxx | 1 -
.../src/RpcLv1RawDataEfficiency.cxx | 1 -
.../src/RpcLv1RawDataSectorLogic.cxx | 1 -
.../src/RpcLv1RawDataValAlg.cxx | 1 -
.../src/RpcRawDataValAlg.cxx | 1 -
.../src/TgcLv1RawDataValAlg.cxx | 1 -
.../TgcLv1RawDataValAlg_CoincidenceWindow.cxx | 1 -
.../src/TgcLv1RawDataValAlg_Efficiency.cxx | 1 -
.../src/TgcLv1RawDataValAlg_Functions.cxx | 1 -
.../TgcLv1RawDataValAlg_NumberOfTrigger.cxx | 1 -
.../src/TgcLv1RawDataValAlg_ReadContainer.cxx | 1 -
.../TgcLv1RawDataValAlg_Summary_LowStat.cxx | 1 -
.../src/TgcLv1RawDataValAlg_TriggerTiming.cxx | 1 -
.../src/TgcRawDataValAlg.cxx | 1 -
.../src/TgcRawDataValAlg_Efficiency.cxx | 1 -
.../src/TgcRawDataValAlg_Functions.cxx | 1 -
.../src/TgcRawDataValAlg_NumberOfHits.cxx | 1 -
.../src/TgcRawDataValAlg_Profile.cxx | 1 -
.../src/TgcRawDataValAlg_ReadContainer.cxx | 1 -
.../src/TgcRawDataValAlg_SetOffset.cxx | 1 -
.../src/TgcRawDataValAlg_Summary_LowStat.cxx | 1 -
.../src/TgcRawDataValAlg_XYView.cxx | 1 -
Offloading/OffloadSvc/src/OffloadSvc.cxx | 1 -
.../AnalysisExamples/src/JetTagAna.cxx | 1 -
.../src/MiscellaneousExamples.cxx | 1 -
.../src/ReadTruthParticles.cxx | 1 -
.../AnalysisExamples/src/VFitZmmOnAOD.cxx | 1 -
.../AnalysisExamples/src/ZeeOnESD.cxx | 1 -
.../AnalysisTools/src/AANTEventSelector.cxx | 1 -
.../AnalysisTools/src/AANTupleStream.cxx | 1 -
.../src/CompositeParticleContainerCnv.h | 2 +
.../src/INav4MomToTrackParticleAssocsCnv.h | 8 +-
.../src/NeutrinoContainerCnv.h | 2 +
.../src/ParticleShallowCloneContainerCnv.h | 2 +
.../src/SelectedParticlesCnv.h | 2 +
.../src/TrackParticleAssocsCnv.h | 2 +
.../UserAnalysis/src/AnalysisSkeleton.cxx | 1 -
.../src/TrackParticleRetriever.cxx | 1 -
.../src/CTP_DecisionCnv.h | 2 +
.../src/LVL1_ROICnv.h | 2 +
.../src/MuonTriggerAnalysisTool.cxx | 1 -
PhysicsAnalysis/D2PDMaker/src/CheckD2PD.cxx | 1 -
.../src/D2PDINavigable4MomentumSelector.cxx | 1 -
.../D2PDMaker/src/D2PDJetSelector.cxx | 1 -
.../D2PDMaker/src/D2PDMuonSelector.cxx | 1 -
.../D2PDMaker/src/D2PDTauSelector.cxx | 1 -
.../src/D2PDTrackParticleSelector.cxx | 1 -
.../D2PDMaker/src/D2PDVertexSelector.cxx | 1 -
PhysicsAnalysis/D2PDMaker/src/FilterTool.cxx | 1 -
.../TileD3PDMaker/src/TileEventFillerTool.h | 1 -
.../JetTagInfoAthenaPool/src/JetTagInfoCnv.h | 2 +
.../src/JpsiEEFinder.cxx_noCompile | 3 +-
.../JpsiUpsilonTools/src/JpsiFinder.cxx | 1 -
.../JpsiUpsilonTools/src/JpsiPlus1Track.cxx | 1 -
.../JpsiUpsilonTools/src/JpsiPlus2Tracks.cxx | 1 -
.../src/PrimaryVertexRefitter.cxx | 3 +-
.../src/PrimaryDPDPrescaler.cxx | 1 -
.../PrimaryDPDMaker/src/ThinContainers.cxx | 1 -
.../src/TruthEtIsolationsContainerCnv.h | 2 +
.../src/TruthParticleContainerCnv.h | 2 +
Projects/AthSimulation/externals.txt | 4 +-
Projects/Athena/externals.txt | 6 +-
.../src/EventShapeStoreCnv.h | 2 +
.../JetEventAthenaPool/src/JetCollectionCnv.h | 2 +
.../src/JetKeyDescriptorCnv.h | 2 +
.../JetEventAthenaPool/src/JetMomentMapCnv.h | 2 +
.../src/JetSamplingCollectionCnv.h | 2 +
.../src/JetGoodiesFiller.cxx | 1 -
.../src/MuonGoodiesFiller.cxx | 1 -
.../src/BasicPlotsTool.cxx | 1 -
.../src/ContainerComparatorTool.cxx | 1 -
.../MissingETPerformance/src/EtaRingsTool.cxx | 1 -
.../src/FakeMissingETTool.cxx | 1 -
.../src/LinearityTool.cxx | 1 -
.../src/MissingETCompositionTool.cxx | 1 -
.../src/MissingETPerformance.cxx | 1 -
.../src/MissingETScaleTool.cxx | 1 -
.../MissingETPerformance/src/MuonTool.cxx | 1 -
.../src/ResolutionTool.cxx | 1 -
.../MissingETPerformance/src/ZMuMuTool.cxx | 1 -
.../MissingETPerformance/src/ZeeSequencer.cxx | 1 -
.../MissingETPerformance/src/ZeeTool.cxx | 1 -
.../src/MuTagAmbiguitySolverTool.cxx | 1 -
.../src/MuTagMatchingTool.cxx | 1 -
.../RecAthenaPool/src/MissingETCnv.h | 2 +
.../src/MissingETCompositionCnv.h | 4 +-
.../RecAthenaPool/src/MissingEtCaloCnv.h | 2 +
.../RecAthenaPool/src/MissingEtTruthCnv.h | 2 +
.../RecAthenaPool/src/MuonCaloEnergiesCnv.h | 2 +
.../src/MuonCaloEnergyContainerCnv.h | 2 +
.../RecAthenaPool/src/MuonContainerCnv.h | 2 +
.../src/MuonSpShowerContainerCnv.h | 2 +
.../RecEventAthenaPool/src/RecoTimingObjCnv.h | 2 +
.../src/TrackParticleContainerCnv.h | 2 +
.../src/TrackParticleTruthCollectionCnv.h | 2 +
...TrackParticleTruthCollectionContainerCnv.h | 2 +
.../src/eflowObjectContainerCnv.h | 2 +
.../src/CaloRingsContainerCnv.h | 2 +
.../src/ElectronContainerCnv.h | 2 +
.../egammaAthenaPool/src/PhotonContainerCnv.h | 2 +
.../src/egDetailContainerCnv.h | 2 +
.../egammaAthenaPool/src/egammaContainerCnv.h | 2 +
.../components/egammaValidation_entries.cxx | 2 -
.../src/TauDetailsContainerCnv.h | 2 +
.../src/TauJetContainerCnv.h | 2 +
.../src/TrackRecordCollectionCnv.h | 3 +-
.../ISF_Services/test/InputConverter_test.cxx | 2 +-
.../ISF_Services/test/TruthSvc_test.cxx | 3 +-
.../src/ISF_HitAnalysis.cxx | 1 -
.../src/PlanarClusterContainerCnv.h | 2 +
.../src/PlanarClusterContainerCnv_p1.cxx | 1 -
.../src/PlanarClusterContainerCnv_p2.cxx | 1 -
TestBeam/TBCnv/TBCnv/TBDataCnv.h | 6 +-
TestBeam/TBCnv/TBCnv/TBDataCnv.icc | 1 -
TestBeam/TBCnv/src/ReadTBLArCalibDigits.cxx | 1 -
TestBeam/TBCnv/src/ReadTBLArDigits.cxx | 1 -
TestBeam/TBCnv/src/TBCheckBCIDs.cxx | 1 -
.../TBCnv/src/components/TBCnv_entries.cxx | 22 +--
.../src/TBCaloCoolPosTool.cxx | 1 -
.../TBCaloConditions/src/TBCaloPosTool.cxx | 1 -
.../TBCondRunPar/src/TBCondRunParTool.cxx | 1 -
.../TBDetDescrCnv/TBDetDescrCnv.h | 3 -
TestBeam/TBDetDescrCnv/src/TBDetDescrCnv.cxx | 1 -
.../src/TBDetDescrCnv_entries.cxx | 2 +-
.../TBEventAthenaPool/src/TBADCRawContCnv.h | 2 +
TestBeam/TBEventAthenaPool/src/TBBPCContCnv.h | 2 +
.../TBEventAthenaPool/src/TBEventInfoCnv.h | 2 +
.../src/TBLArDigitContainerCnv.h | 2 +
.../TBEventAthenaPool/src/TBMWPCContCnv.h | 2 +
TestBeam/TBEventAthenaPool/src/TBPhaseCnv.h | 2 +
.../src/TBScintillatorContCnv.h | 2 +
TestBeam/TBEventAthenaPool/src/TBTDCCnv.h | 2 +
.../TBEventAthenaPool/src/TBTDCRawContCnv.h | 2 +
.../TBEventAthenaPool/src/TBTailCatcherCnv.h | 2 +
TestBeam/TBEventAthenaPool/src/TBTrackCnv.h | 2 +
.../TBEventAthenaPool/src/TBTrackInfoCnv.h | 2 +
.../src/TBTriggerPatternUnitCnv.h | 2 +
.../TBRec/src/CBNTAA_BeamInstrumentation.cxx | 1 -
TestBeam/TBRec/src/CBNTAA_TBADCRaw.cxx | 1 -
TestBeam/TBRec/src/CBNTAA_TBScint.cxx | 1 -
TestBeam/TBRec/src/CBNTAA_TBTDCRaw.cxx | 1 -
TestBeam/TBRec/src/CBNTAA_TBTPValidation.cxx | 1 -
TestBeam/TBRec/src/CBNTAA_TBTrack.cxx | 1 -
.../TBRec/src/CBNT_BeamInstrumentation.cxx | 1 -
TestBeam/TBRec/src/CBNT_Timing.cxx | 1 -
TestBeam/TBRec/src/TBBPCRec.cxx | 1 -
TestBeam/TBRec/src/TBBeamQualityMC.cxx | 1 -
TestBeam/TBRec/src/TBMWPCRec.cxx | 1 -
TestBeam/TBRec/src/TBScintillatorRec.cxx | 1 -
TestBeam/TBRec/src/TBTailCatcherRec.cxx | 1 -
TestBeam/TBRec/src/TBTrackToCaloAlg.cxx | 1 -
TestPolicy/include/ctest_athena_service.h | 1 -
.../test/TileCablingService_common_test.cxx | 2 +-
.../test/TileCondToolDspThreshold_test.cxx | 2 +-
.../test/TileCondToolOfcCool_test.cxx | 2 +-
.../test/TileCondToolTMDB_test.cxx | 2 +-
.../test/TileDigitsThresholdFilter_test.cxx | 2 +-
.../TileBeamElemContByteStreamCnv.h | 6 +-
.../TileDigitsContByteStreamCnv.h | 5 +-
.../TileByteStream/TileL2ContByteStreamCnv.h | 6 +-
.../TileLaserObjByteStreamCnv.h | 7 +-
.../TileMuRcvContByteStreamCnv.h | 6 +-
.../TileRawChannelContByteStreamCnv.h | 7 +-
.../src/TileBeamElemContByteStreamCnv.cxx | 1 -
.../src/TileDigitsContByteStreamCnv.cxx | 1 -
.../src/TileDigitsContByteStreamTool.cxx | 1 -
.../src/TileL2ContByteStreamCnv.cxx | 1 -
.../src/TileL2ContByteStreamTool.cxx | 1 -
.../src/TileLaserObjByteStreamCnv.cxx | 1 -
.../src/TileLaserObjByteStreamTool.cxx | 1 -
.../src/TileMuRcvContByteStreamCnv.cxx | 1 -
.../src/TileMuRcvContByteStreamTool.cxx | 1 -
.../src/TileRawChannelContByteStreamCnv.cxx | 1 -
.../src/components/TileByteStream_entries.cxx | 12 +-
.../src/TileBeamElemContainerCnv.h | 3 +-
.../src/TileCellContainerCnv.cxx | 1 -
.../src/TileCosmicMuonContainerCnv.h | 2 +
.../src/TileDigitsContainerCnv.h | 3 +-
.../src/TileHitContainerCnv.h | 3 +-
.../src/TileL2ContainerCnv.h | 2 +
.../src/TileMuContainerCnv.h | 2 +
.../src/TileMuonReceiverContainerCnv.h | 2 +
.../src/TileRawChannelContainerCnv.h | 3 +-
.../src/TileTTL1ContainerCnv.h | 2 +
.../TileIdCnv/TileIdCnv/TileHWIDDetDescrCnv.h | 2 -
.../TileIdCnv/src/TileHWIDDetDescrCnv.cxx | 1 -
.../TileIdCnv/src/TileIdCnv_entries.cxx | 2 +-
.../src/TileHitVectorCnv.h | 2 +
.../src/ElementTableCnv.h | 2 +
.../src/LayerMaterialMapCnv.h | 2 +
.../src/MaterialStepCollectionCnv.h | 2 +
.../src/MVFVxContainerCnv.h | 2 +
.../src/SegmentCollectionCnv.h | 4 +-
.../src/TrackCollectionCnv.h | 4 +-
.../TrkEventAthenaPool/src/V0ContainerCnv.h | 2 +
.../TrkEventAthenaPool/src/VxContainerCnv.h | 2 +
.../TrkJiveXML/src/TrackRetriever.cxx | 1 -
.../src/DetailedTrackTruthCollectionCnv.h | 2 +
.../src/PRD_MultiTruthCollectionCnv.h | 2 +
.../src/TrackTruthCollectionCnv.h | 2 +
.../src/DeterministicAnnealingFilter.cxx | 1 -
.../src/GaussianSumFitter.cxx | 1 -
.../TrkV0Fitter/src/TrkV0VertexFitter.cxx | 1 -
.../src/FastVertexFitter.cxx | 1 -
.../src/FullVertexFitter.cxx | 1 -
.../src/IParticleSelectorAll.cxx | 1 -
.../src/IParticleSelectorEtaPt.cxx | 1 -
.../src/PseudoJetSelectorAll.cxx | 1 -
.../src/PseudoJetSelectorEtaPt.cxx | 1 -
.../src/TriggerPseudoJetGetter.cxx | 3 -
.../TrigL2MuonSA/src/CscDataPreparator.cxx | 1 -
.../TrigL2MuonSA/src/MdtDataPreparator.cxx | 1 -
.../TrigL2MuonSA/src/MuCalStreamerTool.cxx | 1 -
.../TrigL2MuonSA/src/MuFastDataPreparator.cxx | 1 -
.../TrigL2MuonSA/src/MuFastPatternFinder.cxx | 1 -
.../TrigL2MuonSA/src/MuFastStationFitter.cxx | 1 -
.../src/MuFastTrackExtrapolator.cxx | 1 -
.../TrigL2MuonSA/src/MuFastTrackFitter.cxx | 1 -
.../TrigL2MuonSA/src/RpcDataPreparator.cxx | 1 -
.../TrigL2MuonSA/src/TgcDataPreparator.cxx | 1 -
.../TrigT2CaloCommon/src/T2CaloInitSvc.cxx | 3 -
.../TrigInDetAnalysisUtils/T_AnalysisConfig.h | 1 -
.../TrigSerializeConverter.h | 5 +-
.../src/CombinedMuonFeatureCnv.h | 2 +
.../src/CombinedMuonFeatureContainerCnv.h | 2 +
.../src/ElectronMuonTopoInfoContainerCnv.h | 2 +
.../src/FTK_RawTrackContainerCnv.h | 2 +
.../src/IsoMuonFeatureCnv.h | 2 +
.../src/IsoMuonFeatureContainerCnv.h | 2 +
.../TrigEventAthenaPool/src/MuonFeatureCnv.h | 2 +
.../src/MuonFeatureContainerCnv.h | 2 +
.../src/MuonFeatureDetailsCnv.h | 2 +
.../src/MuonFeatureDetailsContainerCnv.h | 2 +
.../TrigEventAthenaPool/src/RingerRingsCnv.h | 2 +
.../src/RingerRingsContainerCnv.h | 2 +
.../src/TileMuFeatureCnv.h | 2 +
.../src/TileMuFeatureContainerCnv.h | 2 +
.../src/TileTrackMuFeatureContainerCnv.h | 2 +
.../src/TrigCaloClusterContainerCnv.h | 2 +
.../src/TrigCompositeCnv.h | 2 +
.../src/TrigCompositeContainerCnv.h | 2 +
.../TrigEventAthenaPool/src/TrigDecisionCnv.h | 2 +
.../src/TrigEFBjetContainerCnv.h | 2 +
.../src/TrigEFBphysContainerCnv.h | 2 +
.../src/TrigEMClusterCnv.h | 2 +
.../src/TrigEMClusterContainerCnv.h | 2 +
.../src/TrigElectronContainerCnv.h | 2 +
.../TrigEventAthenaPool/src/TrigHisto1DCnv.h | 2 +
.../TrigEventAthenaPool/src/TrigHisto2DCnv.h | 2 +
.../src/TrigInDetTrackCollectionCnv.h | 2 +
.../src/TrigL2BjetContainerCnv.h | 2 +
.../src/TrigL2BphysContainerCnv.h | 2 +
.../src/TrigMissingETCnv.h | 2 +
.../src/TrigMissingETContainerCnv.h | 2 +
.../src/TrigMonConfigCnv.h | 2 +
.../src/TrigMonConfigCollectionCnv.h | 5 +-
.../TrigEventAthenaPool/src/TrigMonEventCnv.h | 2 +
.../src/TrigMonEventCollectionCnv.h | 5 +-
.../src/TrigMuonClusterFeatureCnv.h | 2 +
.../src/TrigMuonClusterFeatureContainerCnv.h | 2 +
.../src/TrigMuonEFContainerCnv.h | 2 +
.../src/TrigMuonEFInfoContainerCnv.h | 2 +
.../src/TrigMuonEFIsolationContainerCnv.h | 2 +
.../src/TrigPhotonContainerCnv.h | 2 +
.../src/TrigRNNOutputCnv.h | 2 +
.../src/TrigRNNOutputContainerCnv.h | 2 +
.../src/TrigSpacePointCountsCnv.h | 2 +
.../src/TrigSpacePointCountsCollectionCnv.h | 2 +
.../TrigEventAthenaPool/src/TrigT2JetCnv.h | 2 +
.../src/TrigT2JetContainerCnv.h | 2 +
.../src/TrigT2MbtsBitsCnv.h | 2 +
.../src/TrigT2MbtsBitsContainerCnv.h | 2 +
.../src/TrigTauClusterCnv.h | 2 +
.../src/TrigTauClusterContainerCnv.h | 2 +
.../src/TrigTauClusterDetailsCnv.h | 2 +
.../src/TrigTauClusterDetailsContainerCnv.h | 2 +
.../TrigEventAthenaPool/src/TrigTauCnv.h | 2 +
.../src/TrigTauContainerCnv.h | 2 +
.../src/TrigTauTracksInfoCollectionCnv.h | 2 +
.../src/TrigTrackCountsCnv.h | 2 +
.../src/TrigTrackCountsCollectionCnv.h | 2 +
.../src/TrigTrtHitCountsCnv.h | 2 +
.../src/TrigTrtHitCountsCollectionCnv.h | 2 +
.../src/TrigVertexCollectionCnv.h | 2 +
.../src/TrigVertexCountsCnv.h | 2 +
.../src/TrigVertexCountsCollectionCnv.h | 2 +
.../TrigNavigation/test/Holder_test.cxx | 4 +-
.../src/HLTResultCnv.h | 2 +
.../src/Lvl1ResultCnv.h | 2 +
.../src/TrigOperationalInfoCnv.h | 2 +
.../src/TrigOperationalInfoCollectionCnv.h | 2 +
.../src/TrigPassBitsCnv.h | 2 +
.../src/TrigPassBitsCollectionCnv.h | 2 +
.../src/TrigPassFlagsCnv.h | 2 +
.../src/TrigPassFlagsCollectionCnv.h | 2 +
.../src/TrigRoiDescriptorCnv.h | 2 +
.../src/TrigRoiDescriptorCollectionCnv.h | 2 +
.../src/FTK_DataProviderSvc.cxx | 1 -
.../TrigFTKByteStream/TrigFTKByteStreamCnv.h | 3 -
.../src/TrigFTKByteStreamCnv.cxx | 1 -
.../src/TrigFTKByteStreamTool.cxx | 1 -
.../TrigTrigFTKByteStream_entries.cxx | 2 +-
.../HLTResultByteStreamCnv.h | 5 +-
.../HLTResultByteStreamCnv.icc | 1 -
.../src/HLTResultByteStreamCnv.cxx | 1 -
.../TrigHLTResultByteStream_entries.cxx | 2 +-
.../src/L1TopoByteStreamAuxCnv.cxx | 1 -
.../src/L1TopoByteStreamAuxCnv.h | 3 +-
.../src/L1TopoByteStreamCnv.h | 4 +-
.../src/L1TopoByteStreamxAODCnv.cxx | 1 -
.../src/L1TopoByteStreamxAODCnv.h | 3 +-
.../components/L1TopoByteStream_entries.cxx | 6 +-
.../src/CpByteStreamCnv.cxx | 1 -
.../src/CpByteStreamV1Cnv.cxx | 1 -
.../src/CpByteStreamV1Cnv.h | 8 +-
.../src/CpByteStreamV2Cnv.cxx | 1 -
.../src/CpByteStreamV2Cnv.h | 8 +-
.../src/CpReadByteStreamCnv.icc | 1 -
.../src/CpReadByteStreamV1Cnv.h | 8 +-
.../src/CpReadByteStreamV1Cnv.icc | 1 -
.../src/CpReadByteStreamV1V2Cnv.cxx | 1 -
.../src/CpReadByteStreamV1V2Cnv.h | 7 +-
.../src/CpReadByteStreamV2Cnv.h | 8 +-
.../src/CpReadByteStreamV2Cnv.icc | 1 -
.../src/CpmRoiByteStreamCnv.cxx | 1 -
.../src/CpmRoiByteStreamV1Cnv.cxx | 1 -
.../src/CpmRoiByteStreamV1Cnv.h | 8 +-
.../src/CpmRoiByteStreamV2Cnv.cxx | 1 -
.../src/CpmRoiByteStreamV2Cnv.h | 8 +-
.../src/JepByteStreamCnv.cxx | 1 -
.../src/JepByteStreamV1Cnv.cxx | 1 -
.../src/JepByteStreamV1Cnv.h | 8 +-
.../src/JepByteStreamV2Cnv.cxx | 1 -
.../src/JepByteStreamV2Cnv.h | 8 +-
.../src/JepReadByteStreamCnv.icc | 1 -
.../src/JepReadByteStreamV1Cnv.h | 7 +-
.../src/JepReadByteStreamV1Cnv.icc | 1 -
.../src/JepReadByteStreamV1V2Cnv.h | 7 +-
.../src/JepReadByteStreamV1V2Cnv.icc | 1 -
.../src/JepReadByteStreamV2Cnv.h | 8 +-
.../src/JepReadByteStreamV2Cnv.icc | 1 -
.../src/JepRoiByteStreamCnv.cxx | 1 -
.../src/JepRoiByteStreamV1Cnv.cxx | 1 -
.../src/JepRoiByteStreamV1Cnv.h | 7 +-
.../src/JepRoiByteStreamV2Cnv.cxx | 1 -
.../src/JepRoiByteStreamV2Cnv.h | 8 +-
.../src/JepRoiReadByteStreamCnv.icc | 1 -
.../src/JepRoiReadByteStreamV1Cnv.h | 7 +-
.../src/JepRoiReadByteStreamV1Cnv.icc | 1 -
.../src/JepRoiReadByteStreamV2Cnv.h | 8 +-
.../src/JepRoiReadByteStreamV2Cnv.icc | 1 -
.../src/L1CaloErrorByteStreamCnv.cxx | 1 -
.../src/L1CaloErrorByteStreamCnv.h | 7 +-
.../src/PpmByteStreamV1Cnv.cxx | 1 -
.../src/PpmByteStreamV1Cnv.h | 7 +-
.../src/RodHeaderByteStreamCnv.cxx | 1 -
.../src/RodHeaderByteStreamCnv.h | 7 +-
.../TrigT1CaloByteStream_entries.cxx | 90 +++++-----
.../src/xaod/CmxCpHitsByteStreamAuxCnv.cxx | 1 -
.../src/xaod/CmxCpHitsByteStreamAuxCnv.h | 7 +-
.../src/xaod/CmxCpHitsByteStreamxAODCnv.cxx | 1 -
.../src/xaod/CmxCpHitsByteStreamxAODCnv.h | 7 +-
.../src/xaod/CmxCpTobByteStreamAuxCnv.cxx | 1 -
.../src/xaod/CmxCpTobByteStreamAuxCnv.h | 7 +-
.../src/xaod/CmxCpTobByteStreamxAODCnv.cxx | 1 -
.../src/xaod/CmxCpTobByteStreamxAODCnv.h | 7 +-
.../src/xaod/CmxEtSumsByteStreamAuxCnv.cxx | 1 -
.../src/xaod/CmxEtSumsByteStreamAuxCnv.h | 7 +-
.../src/xaod/CmxEtSumsByteStreamxAODCnv.cxx | 1 -
.../src/xaod/CmxEtSumsByteStreamxAODCnv.h | 7 +-
.../src/xaod/CmxJetHitsByteStreamAuxCnv.cxx | 1 -
.../src/xaod/CmxJetHitsByteStreamAuxCnv.h | 7 +-
.../src/xaod/CmxJetHitsByteStreamxAODCnv.cxx | 1 -
.../src/xaod/CmxJetHitsByteStreamxAODCnv.h | 7 +-
.../src/xaod/CmxJetTobByteStreamAuxCnv.cxx | 1 -
.../src/xaod/CmxJetTobByteStreamAuxCnv.h | 7 +-
.../src/xaod/CmxJetTobByteStreamxAODCnv.cxx | 1 -
.../src/xaod/CmxJetTobByteStreamxAODCnv.h | 7 +-
.../src/xaod/CmxRoIByteStreamAuxCnv.cxx | 1 -
.../src/xaod/CmxRoIByteStreamAuxCnv.h | 7 +-
.../src/xaod/CmxRoIByteStreamxAODCnv.cxx | 1 -
.../src/xaod/CmxRoIByteStreamxAODCnv.h | 7 +-
.../src/xaod/CpmTobRoiByteStreamAuxCnv.cxx | 1 -
.../src/xaod/CpmTobRoiByteStreamAuxCnv.h | 7 +-
.../src/xaod/CpmTobRoiByteStreamxAODCnv.cxx | 1 -
.../src/xaod/CpmTobRoiByteStreamxAODCnv.h | 7 +-
.../src/xaod/CpmTowerByteStreamAuxCnv.cxx | 1 -
.../src/xaod/CpmTowerByteStreamAuxCnv.h | 7 +-
.../src/xaod/CpmTowerByteStreamxAODCnv.cxx | 1 -
.../src/xaod/CpmTowerByteStreamxAODCnv.h | 7 +-
.../src/xaod/JemEtSumsByteStreamAuxCnv.cxx | 1 -
.../src/xaod/JemEtSumsByteStreamAuxCnv.h | 7 +-
.../src/xaod/JemEtSumsByteStreamxAODCnv.cxx | 1 -
.../src/xaod/JemEtSumsByteStreamxAODCnv.h | 7 +-
.../src/xaod/JemTobRoiByteStreamAuxCnv.cxx | 1 -
.../src/xaod/JemTobRoiByteStreamAuxCnv.h | 7 +-
.../src/xaod/JemTobRoiByteStreamxAODCnv.cxx | 1 -
.../src/xaod/JemTobRoiByteStreamxAODCnv.h | 7 +-
.../src/xaod/JetElementByteStreamAuxCnv.cxx | 1 -
.../src/xaod/JetElementByteStreamAuxCnv.h | 7 +-
.../src/xaod/JetElementByteStreamxAODCnv.cxx | 1 -
.../src/xaod/JetElementByteStreamxAODCnv.h | 7 +-
.../src/xaod/L1CaloByteStreamAuxCnv.h | 7 +-
.../src/xaod/L1CaloByteStreamAuxCnv.icc | 1 -
.../src/xaod/PpmByteStreamAuxCnv.cxx | 1 -
.../src/xaod/PpmByteStreamAuxCnv.h | 7 +-
.../src/xaod/PpmByteStreamxAODCnv.cxx | 1 -
.../src/xaod/PpmByteStreamxAODCnv.h | 7 +-
.../src/xaod/RodHeaderByteStreamAuxCnv.cxx | 1 -
.../src/xaod/RodHeaderByteStreamAuxCnv.h | 7 +-
.../src/xaod/RodHeaderByteStreamxAODCnv.cxx | 1 -
.../src/xaod/RodHeaderByteStreamxAODCnv.h | 7 +-
.../test/TrigT1CaloByteStream_entries.cxx | 56 +++----
.../src/CMMCPHitsCollectionCnv.h | 4 +-
.../src/CMMEtSumsCollectionCnv.h | 5 +-
.../src/CMMJetHitsCollectionCnv.h | 5 +-
.../TrigT1EventAthenaPool/src/CMMRoICnv.h | 4 +-
.../src/CMXCPHitsCollectionCnv.h | 4 +-
.../src/CMXCPTobCollectionCnv.h | 4 +-
.../src/CMXEtSumsCollectionCnv.h | 4 +-
.../src/CMXJetHitsCollectionCnv.h | 4 +-
.../src/CMXJetTobCollectionCnv.h | 4 +-
.../TrigT1EventAthenaPool/src/CMXRoICnv.h | 5 +-
.../src/CPMHitsCollectionCnv.h | 4 +-
.../src/CPMRoICollectionCnv.h | 4 +-
.../src/CPMTobRoICollectionCnv.h | 4 +-
.../src/CPMTowerCollectionCnv.h | 4 +-
.../TrigT1EventAthenaPool/src/CTP_RDOCnv.h | 2 +
.../src/JEMEtSumsCollectionCnv.h | 4 +-
.../src/JEMHitsCollectionCnv.h | 4 +-
.../src/JEMRoICollectionCnv.h | 4 +-
.../src/JEMTobRoICollectionCnv.h | 4 +-
.../src/JetElementCollectionCnv.h | 4 +-
.../TrigT1EventAthenaPool/src/MuCTPI_RDOCnv.h | 2 +
.../src/RODHeaderCollectionCnv.h | 4 +-
.../TrigT1EventAthenaPool/src/RoIBResultCnv.h | 2 +
.../src/TriggerTowerCollectionCnv.h | 4 +-
.../TrigT1ResultByteStream/CTPByteStreamCnv.h | 6 +-
.../MuCTPIByteStreamCnv.h | 6 +-
.../RecCTPByteStreamCnv.h | 6 +-
.../RecMuCTPIByteStreamCnv.h | 6 +-
.../RecRoIBResultByteStreamCnv.h | 6 +-
.../RoIBResultByteStreamCnv.h | 7 +-
.../TrigT1ResultByteStream_entries.cxx | 12 +-
.../src/TrigInDetRoadMakerTool.cxx | 1 -
.../src/TrigL2PattRecoStrategyA.cxx | 1 -
.../src/TrigL2PattRecoStrategyB.cxx | 1 -
.../src/TrigL2PattRecoStrategyC.cxx | 1 -
.../src/TrigL2PattRecoStrategyF.cxx | 1 -
.../src/TrigL2PattRecoStrategyT.cxx | 1 -
.../src/TrigInDetTrackExtrapolator.cxx | 1 -
.../src/TrigL2HighPtTrackFitter.cxx | 1 -
.../src/TrigL2LowPtTrackFitter.cxx | 1 -
.../src/TrigL2ResidualCalculator.cxx | 1 -
.../src/TrigInDetVxInJetTool.cxx | 1 -
.../src/TrigMuonBackExtrapolator.cxx | 1 -
.../TrigMuonRoITools/src/TrigMuonRoITool.cxx | 1 -
.../src/PixelSpacePointTool.cxx | 1 -
.../src/SCT_ClusterCacheTool.cxx | 1 -
.../src/SCT_SpacePointTool.cxx | 1 -
.../src/TrigMagneticFieldTool.cxx | 1 -
.../src/TrigTRT_CombinedExtensionTool.cxx | 1 -
.../src/TrigTRT_DetElementRoadTool.cxx | 1 -
.../src/TrigTRT_TrackExtensionTool.cxx | 1 -
.../TrigVKalFitter/src/TVKalFitter.cxx | 1 -
.../src/TrigInDetTrackTruthMapCnv.h | 2 +
.../TrigValAlgs/src/TrigEDMAuxChecker.cxx | 1 -
.../TrigValAlgs/src/TrigEDMChecker.cxx | 1 -
.../VP1TriggerSystems/VP1TriggerSystem.h | 1 -
988 files changed, 1068 insertions(+), 1512 deletions(-)
mode change 100755 => 100644 Event/EventAthenaPool/src/EventInfoCnv.h
mode change 100755 => 100644 Event/EventAthenaPool/src/EventStreamInfoCnv.h
mode change 100755 => 100644 Event/EventAthenaPool/src/MergedEventInfoCnv.h
mode change 100755 => 100644 Event/EventAthenaPool/src/PileUpEventInfoCnv.h
mode change 100755 => 100644 Event/EventCommonAthenaPool/src/INav4MomAssocsCnv.h
mode change 100755 => 100644 ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/ALFA_RawDataContainerCnv.h
mode change 100755 => 100644 ForwardDetectors/ZDC/ZdcCnv/ZdcEventAthenaPool/src/ZdcDigitsCollectionCnv.h
mode change 100755 => 100644 Generators/GeneratorObjectsAthenaPool/src/McEventCollectionCnv.h
mode change 100755 => 100644 InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/PixelIDDetDescrCnv.cxx
mode change 100755 => 100644 InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/PixelIDDetDescrCnv.h
mode change 100755 => 100644 InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/SCT_IDDetDescrCnv.cxx
mode change 100755 => 100644 InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/SCT_IDDetDescrCnv.h
mode change 100755 => 100644 InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/SiliconIDDetDescrCnv.cxx
mode change 100755 => 100644 InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/SiliconIDDetDescrCnv.h
mode change 100755 => 100644 InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/TRT_IDDetDescrCnv.cxx
mode change 100755 => 100644 InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/TRT_IDDetDescrCnv.h
mode change 100755 => 100644 LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArAutoCorrCompleteCnv.h
mode change 100755 => 100644 LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArAutoCorrMCCnv.h
mode change 100755 => 100644 LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArDAC2uACompleteCnv.h
mode change 100755 => 100644 LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArDAC2uAMCCnv.h
mode change 100755 => 100644 LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArOFCCompleteCnv.h
mode change 100755 => 100644 LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArPedestalCompleteCnv.h
mode change 100755 => 100644 LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArRampCompleteCnv.h
mode change 100755 => 100644 LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArRampMCCnv.h
mode change 100755 => 100644 LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArShape32MCCnv.h
mode change 100755 => 100644 LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArShapeCompleteCnv.h
mode change 100755 => 100644 LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArShapeMCCnv.h
mode change 100755 => 100644 LArCalorimeter/LArCnv/LArCondAthenaPool/src/LAruA2MeVCompleteCnv.h
mode change 100755 => 100644 LArCalorimeter/LArCnv/LArCondAthenaPool/src/LAruA2MeVMCCnv.h
mode change 100755 => 100644 LArCalorimeter/LArCnv/LArSimEventAthenaPool/src/LArHitContainerCnv.h
mode change 100755 => 100644 LArCalorimeter/LArCnv/LArSimEventAthenaPool/src/LArHitFloatContainerCnv.h
mode change 100755 => 100644 LumiBlock/LumiBlockPers/LumiBlockAthenaPool/src/LumiBlockCollectionCnv.h
mode change 100755 => 100644 PhysicsAnalysis/AnalysisCommon/ParticleEventAthenaPool/src/CompositeParticleContainerCnv.h
mode change 100755 => 100644 PhysicsAnalysis/AnalysisCommon/ParticleEventAthenaPool/src/NeutrinoContainerCnv.h
mode change 100755 => 100644 PhysicsAnalysis/AnalysisCommon/ParticleEventAthenaPool/src/ParticleShallowCloneContainerCnv.h
mode change 100755 => 100644 PhysicsAnalysis/AnalysisCommon/ParticleEventAthenaPool/src/TrackParticleAssocsCnv.h
mode change 100755 => 100644 PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEventAthenaPool/src/CTP_DecisionCnv.h
mode change 100755 => 100644 PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEventAthenaPool/src/LVL1_ROICnv.h
mode change 100755 => 100644 PhysicsAnalysis/TruthParticleID/McParticleEventAthenaPool/src/TruthEtIsolationsContainerCnv.h
mode change 100755 => 100644 PhysicsAnalysis/TruthParticleID/McParticleEventAthenaPool/src/TruthParticleContainerCnv.h
mode change 100755 => 100644 Reconstruction/Jet/JetEventAthenaPool/src/JetCollectionCnv.h
mode change 100755 => 100644 Reconstruction/RecAthenaPool/src/MissingETCnv.h
mode change 100755 => 100644 Reconstruction/RecAthenaPool/src/MissingEtCaloCnv.h
mode change 100755 => 100644 Reconstruction/RecAthenaPool/src/MissingEtTruthCnv.h
mode change 100755 => 100644 Reconstruction/RecAthenaPool/src/MuonCaloEnergyContainerCnv.h
mode change 100755 => 100644 Reconstruction/RecAthenaPool/src/MuonContainerCnv.h
mode change 100755 => 100644 Reconstruction/RecEventAthenaPool/src/RecoTimingObjCnv.h
mode change 100755 => 100644 Reconstruction/TrackParticleTruthAthenaPool/src/TrackParticleTruthCollectionCnv.h
mode change 100755 => 100644 Reconstruction/egamma/egammaAthenaPool/src/CaloRingsContainerCnv.h
mode change 100755 => 100644 Reconstruction/egamma/egammaAthenaPool/src/ElectronContainerCnv.h
mode change 100755 => 100644 Reconstruction/egamma/egammaAthenaPool/src/PhotonContainerCnv.h
mode change 100755 => 100644 Reconstruction/egamma/egammaAthenaPool/src/egammaContainerCnv.h
mode change 100755 => 100644 TestBeam/TBEventAthenaPool/src/TBADCRawContCnv.h
mode change 100755 => 100644 TestBeam/TBEventAthenaPool/src/TBBPCContCnv.h
mode change 100755 => 100644 TestBeam/TBEventAthenaPool/src/TBEventInfoCnv.h
mode change 100755 => 100644 TestBeam/TBEventAthenaPool/src/TBLArDigitContainerCnv.h
mode change 100755 => 100644 TestBeam/TBEventAthenaPool/src/TBMWPCContCnv.h
mode change 100755 => 100644 TestBeam/TBEventAthenaPool/src/TBPhaseCnv.h
mode change 100755 => 100644 TestBeam/TBEventAthenaPool/src/TBScintillatorContCnv.h
mode change 100755 => 100644 TestBeam/TBEventAthenaPool/src/TBTDCCnv.h
mode change 100755 => 100644 TestBeam/TBEventAthenaPool/src/TBTDCRawContCnv.h
mode change 100755 => 100644 TestBeam/TBEventAthenaPool/src/TBTailCatcherCnv.h
mode change 100755 => 100644 TestBeam/TBEventAthenaPool/src/TBTrackCnv.h
mode change 100755 => 100644 TestBeam/TBEventAthenaPool/src/TBTrackInfoCnv.h
mode change 100755 => 100644 TestBeam/TBEventAthenaPool/src/TBTriggerPatternUnitCnv.h
mode change 100755 => 100644 TileCalorimeter/TileSvc/TileEventAthenaPool/src/TileL2ContainerCnv.h
mode change 100755 => 100644 TileCalorimeter/TileSvc/TileEventAthenaPool/src/TileMuContainerCnv.h
mode change 100755 => 100644 TileCalorimeter/TileSvc/TileEventAthenaPool/src/TileMuonReceiverContainerCnv.h
mode change 100755 => 100644 TileCalorimeter/TileSvc/TileEventAthenaPool/src/TileTTL1ContainerCnv.h
mode change 100755 => 100644 TileCalorimeter/TileSvc/TileSimEventAthenaPool/src/TileHitVectorCnv.h
mode change 100755 => 100644 Tracking/TrkEventCnv/TrkEventAthenaPool/src/MVFVxContainerCnv.h
mode change 100755 => 100644 Tracking/TrkEventCnv/TrkEventAthenaPool/src/V0ContainerCnv.h
mode change 100755 => 100644 Tracking/TrkEventCnv/TrkEventAthenaPool/src/VxContainerCnv.h
mode change 100755 => 100644 Tracking/TrkEventCnv/TrkTruthAthenaPool/src/DetailedTrackTruthCollectionCnv.h
mode change 100755 => 100644 Tracking/TrkEventCnv/TrkTruthAthenaPool/src/PRD_MultiTruthCollectionCnv.h
mode change 100755 => 100644 Tracking/TrkEventCnv/TrkTruthAthenaPool/src/TrackTruthCollectionCnv.h
mode change 100755 => 100644 Trigger/TrigEvent/TrigEventAthenaPool/src/TrigDecisionCnv.h
mode change 100755 => 100644 Trigger/TrigT1/TrigT1EventAthenaPool/src/RoIBResultCnv.h
diff --git a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/EventSplit.cxx b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/EventSplit.cxx
index a29c02f9586..d2b16fd2438 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/EventSplit.cxx
+++ b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/EventSplit.cxx
@@ -18,7 +18,6 @@
//#include "AthenaPoolTestData/FauxTriggerMap.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/AlgFactory.h"
//#include "EventInfo/EventInfo.h"
#include "EventInfo/EventID.h"
diff --git a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/EventTagReader.h b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/EventTagReader.h
index 7aac11767ce..44ff061aa29 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/EventTagReader.h
+++ b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/EventTagReader.h
@@ -14,7 +14,6 @@
//#include "GaudiKernel/Algorithm.h"
#include "AthenaBaseComps/AthAlgorithm.h"
-#include "GaudiKernel/AlgFactory.h"
#include <map>
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/src/CaloClusterFakeReader.cxx b/AtlasTest/DatabaseTest/AthenaPoolTest/src/CaloClusterFakeReader.cxx
index 5a2c16c7078..ef7665326a1 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolTest/src/CaloClusterFakeReader.cxx
+++ b/AtlasTest/DatabaseTest/AthenaPoolTest/src/CaloClusterFakeReader.cxx
@@ -28,7 +28,6 @@
// Gaudi includes
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/AlgFactory.h"
#include "GaudiKernel/SmartDataPtr.h"
// test includes
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/src/LArCellContFakeWriter.cxx b/AtlasTest/DatabaseTest/AthenaPoolTest/src/LArCellContFakeWriter.cxx
index 9249276259e..5aa31386e09 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolTest/src/LArCellContFakeWriter.cxx
+++ b/AtlasTest/DatabaseTest/AthenaPoolTest/src/LArCellContFakeWriter.cxx
@@ -28,7 +28,6 @@
// Gaudi includes
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/AlgFactory.h"
#include "GaudiKernel/SmartDataPtr.h"
// test includes
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/src/TrkTrackFakeWriter.cxx b/AtlasTest/DatabaseTest/AthenaPoolTest/src/TrkTrackFakeWriter.cxx
index 12432898156..bad9879bbbb 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolTest/src/TrkTrackFakeWriter.cxx
+++ b/AtlasTest/DatabaseTest/AthenaPoolTest/src/TrkTrackFakeWriter.cxx
@@ -23,7 +23,6 @@
// Gaudi includes
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/AlgFactory.h"
#include "GaudiKernel/SmartDataPtr.h"
// include Tracking EDM
diff --git a/Calorimeter/CaloCnv/CaloAthenaPool/src/CaloCellLinkContainerCnv.h b/Calorimeter/CaloCnv/CaloAthenaPool/src/CaloCellLinkContainerCnv.h
index a48e516c0b0..4a49fe71806 100644
--- a/Calorimeter/CaloCnv/CaloAthenaPool/src/CaloCellLinkContainerCnv.h
+++ b/Calorimeter/CaloCnv/CaloAthenaPool/src/CaloCellLinkContainerCnv.h
@@ -29,7 +29,9 @@ class CaloCellLinkContainerCnv : public CaloCellLinkContainerCnvBase
{
friend class CnvFactory<CaloCellLinkContainerCnv>;
protected:
+public:
CaloCellLinkContainerCnv(ISvcLocator*);
+protected:
virtual CaloCellLinkContainer* createTransient();
virtual CaloCellLinkContainerPERS* createPersistent(CaloCellLinkContainer*);
private:
diff --git a/Calorimeter/CaloCnv/CaloAthenaPool/src/CaloClusterContainerCnv.h b/Calorimeter/CaloCnv/CaloAthenaPool/src/CaloClusterContainerCnv.h
index d0d6b7e3b18..7379758b92d 100644
--- a/Calorimeter/CaloCnv/CaloAthenaPool/src/CaloClusterContainerCnv.h
+++ b/Calorimeter/CaloCnv/CaloAthenaPool/src/CaloClusterContainerCnv.h
@@ -37,7 +37,9 @@ class CaloClusterContainerCnv : public CaloClusterContainerCnvBase
{
friend class CnvFactory<CaloClusterContainerCnv>;
protected:
+public:
CaloClusterContainerCnv(ISvcLocator*);
+protected:
virtual CaloClusterContainer* createTransient();
virtual CaloClusterContainerPERS* createPersistent(CaloClusterContainer*);
private:
diff --git a/Calorimeter/CaloCnv/CaloAthenaPool/src/CaloShowerContainerCnv.h b/Calorimeter/CaloCnv/CaloAthenaPool/src/CaloShowerContainerCnv.h
index ec76acbdaa2..de0045a7979 100644
--- a/Calorimeter/CaloCnv/CaloAthenaPool/src/CaloShowerContainerCnv.h
+++ b/Calorimeter/CaloCnv/CaloAthenaPool/src/CaloShowerContainerCnv.h
@@ -25,7 +25,9 @@ class CaloShowerContainerCnv : public CaloShowerContainerCnvBase
{
friend class CnvFactory<CaloShowerContainerCnv>;
protected:
+public:
CaloShowerContainerCnv(ISvcLocator*);
+protected:
virtual CaloShowerContainer* createTransient();
virtual CaloShowerContainerPERS* createPersistent(CaloShowerContainer*);
private:
diff --git a/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/CaloDetMgrDetDescrCnv/CaloMgrDetDescrCnv.h b/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/CaloDetMgrDetDescrCnv/CaloMgrDetDescrCnv.h
index da91f247c49..91589792f8c 100755
--- a/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/CaloDetMgrDetDescrCnv/CaloMgrDetDescrCnv.h
+++ b/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/CaloDetMgrDetDescrCnv/CaloMgrDetDescrCnv.h
@@ -8,7 +8,6 @@
#include "DetDescrCnvSvc/DetDescrConverter.h"
class CaloMgrDetDescrCnv: public DetDescrConverter {
- friend class CnvFactory<CaloMgrDetDescrCnv>;
public:
virtual long int repSvcType() const;
@@ -20,7 +19,6 @@ public:
static long storageType();
static const CLID& classID();
-protected:
CaloMgrDetDescrCnv(ISvcLocator* svcloc);
private:
diff --git a/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/CaloDetMgrDetDescrCnv/CaloSuperCellMgrDetDescrCnv.h b/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/CaloDetMgrDetDescrCnv/CaloSuperCellMgrDetDescrCnv.h
index 4c756547df9..858cc4fae99 100755
--- a/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/CaloDetMgrDetDescrCnv/CaloSuperCellMgrDetDescrCnv.h
+++ b/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/CaloDetMgrDetDescrCnv/CaloSuperCellMgrDetDescrCnv.h
@@ -45,8 +45,6 @@ class ICaloSuperCellAlignTool;
class CaloSuperCellMgrDetDescrCnv
: public DetDescrConverter
{
- friend class CnvFactory<CaloSuperCellMgrDetDescrCnv>;
-
public:
/// Standard Gaudi initialize method.
virtual StatusCode initialize();
@@ -78,8 +76,6 @@ public:
*/
static const CLID& classID();
-
-protected:
/**
* @brief Constructor.
* @param clid The CLID if the class we're constructing.
diff --git a/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/src/CaloDetMgrDetDescrCnv_entries.cxx b/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/src/CaloDetMgrDetDescrCnv_entries.cxx
index 6a103c504b7..e77254dd942 100644
--- a/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/src/CaloDetMgrDetDescrCnv_entries.cxx
+++ b/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/src/CaloDetMgrDetDescrCnv_entries.cxx
@@ -1,6 +1,6 @@
#include "CaloDetMgrDetDescrCnv/CaloMgrDetDescrCnv.h"
#include "CaloDetMgrDetDescrCnv/CaloSuperCellMgrDetDescrCnv.h"
-DECLARE_CONVERTER_FACTORY( CaloMgrDetDescrCnv )
-DECLARE_CONVERTER_FACTORY( CaloSuperCellMgrDetDescrCnv )
+DECLARE_CONVERTER( CaloMgrDetDescrCnv )
+DECLARE_CONVERTER( CaloSuperCellMgrDetDescrCnv )
diff --git a/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/src/CaloMgrDetDescrCnv.cxx b/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/src/CaloMgrDetDescrCnv.cxx
index 8572cdb6665..d556ce6f2e1 100755
--- a/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/src/CaloMgrDetDescrCnv.cxx
+++ b/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/src/CaloMgrDetDescrCnv.cxx
@@ -8,7 +8,6 @@
#include "DetDescrCnvSvc/DetDescrConverter.h"
#include "DetDescrCnvSvc/DetDescrAddress.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/CnvFactory.h"
#include "StoreGate/StoreGate.h"
#include "CaloDetDescr/CaloDetDescrManager.h"
diff --git a/Calorimeter/CaloCnv/CaloIdCnv/CaloIdCnv/CaloIDHelper_IDDetDescrCnv.h b/Calorimeter/CaloCnv/CaloIdCnv/CaloIdCnv/CaloIDHelper_IDDetDescrCnv.h
index b94f9f2ba50..34d8b381c86 100644
--- a/Calorimeter/CaloCnv/CaloIdCnv/CaloIdCnv/CaloIDHelper_IDDetDescrCnv.h
+++ b/Calorimeter/CaloCnv/CaloIdCnv/CaloIdCnv/CaloIDHelper_IDDetDescrCnv.h
@@ -70,7 +70,6 @@ public:
virtual long int repSvcType() const;
-protected:
/**
* @brief Constructor.
* @param clid The CLID if the class we're constructing.
@@ -118,9 +117,6 @@ template <class T>
class CaloIDHelper_IDDetDescrCnv_T
: public CaloIDHelper_IDDetDescrCnv
{
- /// This creates us, so it needs access to the constructor.
- friend class CnvFactory<CaloIDHelper_IDDetDescrCnv_T>;
-
public:
/**
@@ -130,7 +126,6 @@ public:
static const CLID& classID();
-protected:
/**
* @brief Constructor.
* @param svcloc Gaudi service locator.
diff --git a/Calorimeter/CaloCnv/CaloIdCnv/CaloIdCnv/CaloIdMgrDetDescrCnv.h b/Calorimeter/CaloCnv/CaloIdCnv/CaloIdCnv/CaloIdMgrDetDescrCnv.h
index bce4fec90b5..62f1e24bef2 100755
--- a/Calorimeter/CaloCnv/CaloIdCnv/CaloIdCnv/CaloIdMgrDetDescrCnv.h
+++ b/Calorimeter/CaloCnv/CaloIdCnv/CaloIdCnv/CaloIdMgrDetDescrCnv.h
@@ -33,7 +33,6 @@
*/
class CaloIdMgrDetDescrCnv: public DetDescrConverter {
- friend class CnvFactory<CaloIdMgrDetDescrCnv>;
public:
virtual long int repSvcType() const;
@@ -46,7 +45,6 @@ public:
/** class ID (used by CnvFactory) */
static const CLID& classID();
-protected:
CaloIdMgrDetDescrCnv(ISvcLocator* svcloc);
private:
diff --git a/Calorimeter/CaloCnv/CaloIdCnv/src/CaloIdCnv_entries.cxx b/Calorimeter/CaloCnv/CaloIdCnv/src/CaloIdCnv_entries.cxx
index 10ef73586c6..d1124919316 100644
--- a/Calorimeter/CaloCnv/CaloIdCnv/src/CaloIdCnv_entries.cxx
+++ b/Calorimeter/CaloCnv/CaloIdCnv/src/CaloIdCnv_entries.cxx
@@ -15,20 +15,20 @@
#include "CaloIdCnv/TileTBIDDetDescrCnv.h"
#include "CaloIdCnv/TTOnlineIDDetDescrCnv.h"
-DECLARE_CONVERTER_FACTORY( CaloCell_IDDetDescrCnv )
-DECLARE_CONVERTER_FACTORY( CaloCell_SuperCell_IDDetDescrCnv )
-DECLARE_CONVERTER_FACTORY( CaloDM_IDDetDescrCnv )
-DECLARE_CONVERTER_FACTORY( CaloIdMgrDetDescrCnv )
-DECLARE_CONVERTER_FACTORY( CaloLVL1_IDDetDescrCnv )
-DECLARE_CONVERTER_FACTORY( LArEM_IDDetDescrCnv )
-DECLARE_CONVERTER_FACTORY( LArEM_SuperCell_IDDetDescrCnv )
-DECLARE_CONVERTER_FACTORY( LArFCAL_IDDetDescrCnv )
-DECLARE_CONVERTER_FACTORY( LArFCAL_SuperCell_IDDetDescrCnv )
-DECLARE_CONVERTER_FACTORY( LArMiniFCAL_IDDetDescrCnv )
-DECLARE_CONVERTER_FACTORY( LArHEC_IDDetDescrCnv )
-DECLARE_CONVERTER_FACTORY( LArHEC_SuperCell_IDDetDescrCnv )
-DECLARE_CONVERTER_FACTORY( TileIDDetDescrCnv )
-DECLARE_CONVERTER_FACTORY( Tile_SuperCell_IDDetDescrCnv )
-DECLARE_CONVERTER_FACTORY( TileTBIDDetDescrCnv )
-DECLARE_CONVERTER_FACTORY( TTOnlineIDDetDescrCnv )
+DECLARE_CONVERTER( CaloCell_IDDetDescrCnv )
+DECLARE_CONVERTER( CaloCell_SuperCell_IDDetDescrCnv )
+DECLARE_CONVERTER( CaloDM_IDDetDescrCnv )
+DECLARE_CONVERTER( CaloIdMgrDetDescrCnv )
+DECLARE_CONVERTER( CaloLVL1_IDDetDescrCnv )
+DECLARE_CONVERTER( LArEM_IDDetDescrCnv )
+DECLARE_CONVERTER( LArEM_SuperCell_IDDetDescrCnv )
+DECLARE_CONVERTER( LArFCAL_IDDetDescrCnv )
+DECLARE_CONVERTER( LArFCAL_SuperCell_IDDetDescrCnv )
+DECLARE_CONVERTER( LArMiniFCAL_IDDetDescrCnv )
+DECLARE_CONVERTER( LArHEC_IDDetDescrCnv )
+DECLARE_CONVERTER( LArHEC_SuperCell_IDDetDescrCnv )
+DECLARE_CONVERTER( TileIDDetDescrCnv )
+DECLARE_CONVERTER( Tile_SuperCell_IDDetDescrCnv )
+DECLARE_CONVERTER( TileTBIDDetDescrCnv )
+DECLARE_CONVERTER( TTOnlineIDDetDescrCnv )
diff --git a/Calorimeter/CaloCnv/CaloIdCnv/src/CaloIdMgrDetDescrCnv.cxx b/Calorimeter/CaloCnv/CaloIdCnv/src/CaloIdMgrDetDescrCnv.cxx
index 7a6a5381f90..c16a67a290d 100755
--- a/Calorimeter/CaloCnv/CaloIdCnv/src/CaloIdMgrDetDescrCnv.cxx
+++ b/Calorimeter/CaloCnv/CaloIdCnv/src/CaloIdMgrDetDescrCnv.cxx
@@ -19,7 +19,6 @@
#include "DetDescrCnvSvc/DetDescrConverter.h"
#include "DetDescrCnvSvc/DetDescrAddress.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/CnvFactory.h"
#include "StoreGate/StoreGate.h"
#include "AthenaKernel/errorcheck.h"
diff --git a/Calorimeter/CaloCnv/CaloSimEventAthenaPool/src/CaloCalibrationHitContainerCnv.h b/Calorimeter/CaloCnv/CaloSimEventAthenaPool/src/CaloCalibrationHitContainerCnv.h
index 29dbc0b0b72..01fa70a3d83 100644
--- a/Calorimeter/CaloCnv/CaloSimEventAthenaPool/src/CaloCalibrationHitContainerCnv.h
+++ b/Calorimeter/CaloCnv/CaloSimEventAthenaPool/src/CaloCalibrationHitContainerCnv.h
@@ -17,9 +17,10 @@ typedef CaloCalibrationHitContainer_p3 CaloCalibrationHitContainer_PERS;
class CaloCalibrationHitContainerCnv : public T_AthenaPoolCustomCnv<CaloCalibrationHitContainer, CaloCalibrationHitContainer_PERS > {
friend class CnvFactory<CaloCalibrationHitContainerCnv>;
-protected:
+public:
CaloCalibrationHitContainerCnv(ISvcLocator* svcloc) :
T_AthenaPoolCustomCnv<CaloCalibrationHitContainer, CaloCalibrationHitContainer_PERS >( svcloc) {}
+protected:
CaloCalibrationHitContainer_PERS* createPersistent(CaloCalibrationHitContainer* transCont);
CaloCalibrationHitContainer* createTransient ();
};
diff --git a/Calorimeter/CaloCnv/CaloTTDetDescrCnv/src/CaloTTDetDescrCnv_entries.cxx b/Calorimeter/CaloCnv/CaloTTDetDescrCnv/src/CaloTTDetDescrCnv_entries.cxx
index 1067f962f0e..bc8dffb13d3 100644
--- a/Calorimeter/CaloCnv/CaloTTDetDescrCnv/src/CaloTTDetDescrCnv_entries.cxx
+++ b/Calorimeter/CaloCnv/CaloTTDetDescrCnv/src/CaloTTDetDescrCnv_entries.cxx
@@ -1,4 +1,4 @@
#include "CaloTTMgrDetDescrCnv.h"
-DECLARE_CONVERTER_FACTORY( CaloTTMgrDetDescrCnv )
+DECLARE_CONVERTER( CaloTTMgrDetDescrCnv )
diff --git a/Calorimeter/CaloCnv/CaloTTDetDescrCnv/src/CaloTTMgrDetDescrCnv.cxx b/Calorimeter/CaloCnv/CaloTTDetDescrCnv/src/CaloTTMgrDetDescrCnv.cxx
index 624c3d77d4e..095073b9966 100755
--- a/Calorimeter/CaloCnv/CaloTTDetDescrCnv/src/CaloTTMgrDetDescrCnv.cxx
+++ b/Calorimeter/CaloCnv/CaloTTDetDescrCnv/src/CaloTTMgrDetDescrCnv.cxx
@@ -17,7 +17,6 @@
#include "DetDescrCnvSvc/DetDescrConverter.h"
#include "DetDescrCnvSvc/DetDescrAddress.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/CnvFactory.h"
#include "StoreGate/StoreGate.h"
#include "StoreGate/StoreGateSvc.h"
diff --git a/Calorimeter/CaloCnv/CaloTTDetDescrCnv/src/CaloTTMgrDetDescrCnv.h b/Calorimeter/CaloCnv/CaloTTDetDescrCnv/src/CaloTTMgrDetDescrCnv.h
index 64a7adf0e68..e2f652b5e8f 100755
--- a/Calorimeter/CaloCnv/CaloTTDetDescrCnv/src/CaloTTMgrDetDescrCnv.h
+++ b/Calorimeter/CaloCnv/CaloTTDetDescrCnv/src/CaloTTMgrDetDescrCnv.h
@@ -32,7 +32,6 @@
*/
class CaloTTMgrDetDescrCnv: public DetDescrConverter {
- friend class CnvFactory<CaloTTMgrDetDescrCnv>;
public:
virtual long int repSvcType() const;
@@ -44,7 +43,6 @@ public:
static long storageType();
static const CLID& classID();
-protected:
CaloTTMgrDetDescrCnv(ISvcLocator* svcloc);
private:
diff --git a/Control/AthenaAuditors/src/AthMemoryAuditor.cxx b/Control/AthenaAuditors/src/AthMemoryAuditor.cxx
index c77057e3673..62b249123da 100644
--- a/Control/AthenaAuditors/src/AthMemoryAuditor.cxx
+++ b/Control/AthenaAuditors/src/AthMemoryAuditor.cxx
@@ -6,7 +6,6 @@
// AthMemoryAuditor.cxx
// Author: Rolf Seuster
-#include "GaudiKernel/AudFactory.h"
#include "GaudiKernel/INamedInterface.h"
#include "AthMemoryAuditor.h"
diff --git a/Control/AthenaAuditors/src/CoWAuditor.cxx b/Control/AthenaAuditors/src/CoWAuditor.cxx
index a1774aef4d5..fcd9846f0ac 100644
--- a/Control/AthenaAuditors/src/CoWAuditor.cxx
+++ b/Control/AthenaAuditors/src/CoWAuditor.cxx
@@ -3,7 +3,6 @@
*/
#include "CoWAuditor.h"
-#include "GaudiKernel/AudFactory.h"
#include "GaudiKernel/INamedInterface.h"
#include <algorithm>
#include "GaudiKernel/IIncidentSvc.h"
diff --git a/Control/AthenaAuditors/src/FPEAuditor.cxx b/Control/AthenaAuditors/src/FPEAuditor.cxx
index b5236be20dc..df31f0033f2 100644
--- a/Control/AthenaAuditors/src/FPEAuditor.cxx
+++ b/Control/AthenaAuditors/src/FPEAuditor.cxx
@@ -13,7 +13,6 @@
#include <stdexcept>
// FrameWork includes
-#include "GaudiKernel/AudFactory.h"
#include "GaudiKernel/INamedInterface.h"
#include "FPEAuditor.h"
diff --git a/Control/AthenaBaseComps/src/AthCnvSvc.cxx b/Control/AthenaBaseComps/src/AthCnvSvc.cxx
index 5cf8c3b2c93..7de1cd9b323 100644
--- a/Control/AthenaBaseComps/src/AthCnvSvc.cxx
+++ b/Control/AthenaBaseComps/src/AthCnvSvc.cxx
@@ -13,8 +13,6 @@
// Framework includes
#include "GaudiKernel/Property.h"
-#include "GaudiKernel/SvcFactory.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/System.h"
#include "GaudiKernel/IConverter.h"
diff --git a/Control/AthenaBaseComps/src/FilteredAlgorithm.cxx b/Control/AthenaBaseComps/src/FilteredAlgorithm.cxx
index dbcf80b3675..4dfde74fa13 100644
--- a/Control/AthenaBaseComps/src/FilteredAlgorithm.cxx
+++ b/Control/AthenaBaseComps/src/FilteredAlgorithm.cxx
@@ -4,7 +4,6 @@
// Framework include files
#include "GaudiKernel/GaudiException.h"
-#include "GaudiKernel/AlgFactory.h"
#include "GaudiKernel/IAlgManager.h"
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/IProperty.h"
diff --git a/Control/AthenaConfiguration/python/bootstrap.pkl b/Control/AthenaConfiguration/python/bootstrap.pkl
index ee9a1a2234f..5d4b0c15f5b 100644
--- a/Control/AthenaConfiguration/python/bootstrap.pkl
+++ b/Control/AthenaConfiguration/python/bootstrap.pkl
@@ -786,7 +786,7 @@ p122
g7
sS'SEARCHPATH'
p123
-S'.:/cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2017-12-17T2303/Athena/22.0.0/InstallArea/x86_64-slc6-gcc62-opt/jobOptions:/cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2017-12-17T2303/AthenaExternals/22.0.0/InstallArea/x86_64-slc6-gcc62-opt/jobOptions:/cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2017-12-17T2303/GAUDI/22.0.0/InstallArea/x86_64-slc6-gcc62-opt/jobOptions'
+S'.:/home/leggett/work/v30r2/bld/x86_64-centos7-gcc62-dbg/jobOptions:/home/leggett/work/v30r2/gaudi/inst/InstallArea/x86_64-centos7-gcc62-dbg/jobOptions:/home/leggett/work/v30r2:/bld2/build/v30r2/build/install/Athena/22.0.1/InstallArea/x86_64-centos7-gcc62-dbg/jobOptions:/bld2/build/v30r2/build/install/AthenaExternals/22.0.1/InstallArea/x86_64-centos7-gcc62-dbg/jobOptions'
p124
sS'AuditInitialize'
p125
@@ -874,190 +874,183 @@ p157
sS'ExtSvcCreates'
p158
g7
-sS'NoOfThreads'
-p159
-S'0'
sS'Environment'
-p160
+p159
S'{}'
-p161
+p160
sS'JobOptionsPath'
-p162
+p161
S''
-sS'SvcMapping'
+sS'Dlls'
+p162
+S"['AthenaServices']"
p163
-S"['EvtDataSvc/EventDataSvc', 'DetDataSvc/DetectorDataSvc', 'HistogramSvc/HistogramDataSvc', 'HbookCnv::PersSvc/HbookHistSvc', 'RootHistCnv::PersSvc/RootHistSvc', 'EvtPersistencySvc/EventPersistencySvc', 'DetPersistencySvc/DetectorPersistencySvc', 'HistogramPersistencySvc/HistogramPersistencySvc']"
+sS'SvcMapping'
p164
-sS'MultiThreadExtSvc'
+S"['EvtDataSvc/EventDataSvc', 'DetDataSvc/DetectorDataSvc', 'HistogramSvc/HistogramDataSvc', 'HbookCnv::PersSvc/HbookHistSvc', 'RootHistCnv::PersSvc/RootHistSvc', 'EvtPersistencySvc/EventPersistencySvc', 'DetPersistencySvc/DetectorPersistencySvc', 'HistogramPersistencySvc/HistogramPersistencySvc']"
p165
-S'[]'
+sS'AppName'
p166
-sS'HistogramPersistency'
+S'ApplicationMgr'
p167
-S'NONE'
-p168
sS'AuditServices'
-p169
+p168
g7
sS'OutStream'
-p170
+p169
S'[]'
-p171
+p170
sS'ActivateHistory'
-p172
+p171
g7
sS'StalledEventMonitoring'
-p173
+p172
g7
sS'InitializationLoopCheck'
-p174
+p173
g7
sS'JobOptionsSvcType'
-p175
+p174
S'JobOptionsSvc'
-p176
+p175
sS'JobOptionsPreAction'
-p177
+p176
S''
sS'StatusCodeCheck'
-p178
+p177
g12
sS'AuditTools'
-p179
+p178
g7
sS'AlgTypeAliases'
-p180
+p179
S'{}'
-p181
+p180
sS'EvtSel'
-p182
+p181
S''
sS'PluginDebugLevel'
-p183
+p182
S'0'
sS'OutputLevel'
-p184
+p183
S'3'
sS'AppVersion'
-p185
+p184
S''
sS'EvtMax'
-p186
+p185
S'-1'
-p187
+p186
sS'SvcOptMapping'
-p188
+p187
S'[]'
-p189
+p188
sS'CreateSvc'
-p190
+p189
S"['ToolSvc/ToolSvc', 'AthDictLoaderSvc/AthDictLoaderSvc', 'AthenaSealSvc/AthenaSealSvc', 'CoreDumpSvc/CoreDumpSvc']"
-p191
+p190
sS'PropertiesPrint'
-p192
+p191
g7
sS'JobOptionsType'
-p193
+p192
S'NONE'
-p194
+p193
sS'OutStreamType'
-p195
+p194
S'AthenaOutputStream'
-p196
+p195
sS'StopOnSignal'
-p197
+p196
g7
sS'ExtSvc'
-p198
+p197
S"['ToolSvc/ToolSvc', 'AuditorSvc/AuditorSvc', 'MessageSvc/MessageSvc', 'IncidentSvc/IncidentSvc', 'EvtPersistencySvc/EventPersistencySvc', 'HistogramSvc/HistogramDataSvc', 'NTupleSvc/NTupleSvc', 'RndmGenSvc/RndmGenSvc', 'ChronoStatSvc/ChronoStatSvc', 'StatusCodeSvc/StatusCodeSvc', 'StoreGateSvc/StoreGateSvc', 'StoreGateSvc/DetectorStore', 'StoreGateSvc/HistoryStore', 'ClassIDSvc/ClassIDSvc', 'AthDictLoaderSvc/AthDictLoaderSvc', 'AthenaSealSvc/AthenaSealSvc', 'CoreDumpSvc/CoreDumpSvc', 'JobOptionsSvc/JobOptionsSvc']"
+p198
+sS'AuditAlgorithms'
p199
-sS'AppName'
+g7
+sS'HistogramPersistency'
p200
-S'ApplicationMgr'
+S'NONE'
p201
-sS'AuditAlgorithms'
-p202
-g7
-sS'Dlls'
-p203
-S"['AthenaServices']"
-p204
sS'MessageSvcType'
-p205
+p202
S'MessageSvc'
-p206
+p203
sS'JobOptionsPostAction'
-p207
+p204
S''
ssS'StatusCodeSvc'
-p208
-(dp209
+p205
+(dp206
S'AuditRestart'
-p210
+p207
g7
sS'AuditInitialize'
-p211
+p208
g7
sS'OutputLevel'
-p212
+p209
S'3'
sS'AuditServices'
-p213
+p210
g7
sS'AuditStart'
-p214
+p211
g7
sS'AbortOnError'
-p215
+p212
g12
sS'Filter'
-p216
+p213
S"['Reflex::NewDelFunctionsT<StatusCode>::delete_T(void*)', 'ROOT::Reflex::NewDelFunctionsT<StatusCode>::delete_T(void*)']"
-p217
+p214
sS'AuditFinalize'
-p218
+p215
g7
sS'AuditStop'
-p219
+p216
g7
sS'AuditReinitialize'
-p220
+p217
g7
sS'SuppressCheck'
-p221
+p218
g7
sS'IgnoreDicts'
-p222
+p219
g12
ssS'AthDictLoaderSvc'
-p223
-(dp224
+p220
+(dp221
S'AuditInitialize'
-p225
+p222
g7
sS'OutputLevel'
-p226
+p223
S'0'
sS'AuditServices'
-p227
+p224
g7
sS'AuditStart'
-p228
+p225
g7
sS'DoRecursiveLoad'
-p229
+p226
g12
sS'AuditFinalize'
-p230
+p227
g7
sS'AuditStop'
-p231
+p228
g7
sS'AuditReinitialize'
-p232
+p229
g7
sS'AuditRestart'
-p233
+p230
g7
ss.(lp1
.
\ No newline at end of file
diff --git a/Control/AthenaExamples/AthExHive/src/ASCIICondDbSvc.cxx b/Control/AthenaExamples/AthExHive/src/ASCIICondDbSvc.cxx
index 2804f468938..114b319de88 100644
--- a/Control/AthenaExamples/AthExHive/src/ASCIICondDbSvc.cxx
+++ b/Control/AthenaExamples/AthExHive/src/ASCIICondDbSvc.cxx
@@ -4,7 +4,6 @@
#include "ASCIICondDbSvc.h"
#include "AthenaKernel/CondCont.h"
-#include "GaudiKernel/SvcFactory.h"
#include <boost/tokenizer.hpp>
#include <boost/algorithm/string.hpp>
diff --git a/Control/AthenaExamples/AthExHive/src/HiveExSvc.cxx b/Control/AthenaExamples/AthExHive/src/HiveExSvc.cxx
index e94a2cd91b6..83cfbd6ee18 100644
--- a/Control/AthenaExamples/AthExHive/src/HiveExSvc.cxx
+++ b/Control/AthenaExamples/AthExHive/src/HiveExSvc.cxx
@@ -5,7 +5,6 @@
#include "HiveExSvc.h"
-#include "GaudiKernel/SvcFactory.h"
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/IJobOptionsSvc.h"
diff --git a/Control/AthenaExamples/AthExHive/src/HiveTool.cxx b/Control/AthenaExamples/AthExHive/src/HiveTool.cxx
index dca8aa6c211..1de1fbc8ea7 100644
--- a/Control/AthenaExamples/AthExHive/src/HiveTool.cxx
+++ b/Control/AthenaExamples/AthExHive/src/HiveTool.cxx
@@ -4,7 +4,6 @@
#include "HiveTool.h"
-#include "GaudiKernel/SvcFactory.h"
#include "StoreGate/ReadHandle.h"
#include "StoreGate/WriteHandle.h"
diff --git a/Control/AthenaExamples/AthExJobOptions/CMakeLists.txt b/Control/AthenaExamples/AthExJobOptions/CMakeLists.txt
index 52c36308bd9..5a363fe5946 100644
--- a/Control/AthenaExamples/AthExJobOptions/CMakeLists.txt
+++ b/Control/AthenaExamples/AthExJobOptions/CMakeLists.txt
@@ -35,6 +35,7 @@ function (athexjoboptions_run_test testName)
@ONLY )
atlas_add_test( ${testName}
SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/athexjoboptions_${testName}.sh
+ EXTRA_PATTERNS "AutoRetrieveTools"
PROPERTIES TIMEOUT 300
)
if( ARG_DEPENDS )
diff --git a/Control/AthenaExamples/AthExJobOptions/src/AnotherConcreteSvc.cxx b/Control/AthenaExamples/AthExJobOptions/src/AnotherConcreteSvc.cxx
index b886ef35ec7..4052cc453ac 100644
--- a/Control/AthenaExamples/AthExJobOptions/src/AnotherConcreteSvc.cxx
+++ b/Control/AthenaExamples/AthExJobOptions/src/AnotherConcreteSvc.cxx
@@ -13,7 +13,6 @@
// FrameWork includes
#include "GaudiKernel/Property.h"
-#include "GaudiKernel/SvcFactory.h"
// AthExJobOptions includes
#include "AthExJobOptions/AnotherConcreteSvc.h"
diff --git a/Control/AthenaExamples/AthExJobOptions/src/ConcreteSvc.cxx b/Control/AthenaExamples/AthExJobOptions/src/ConcreteSvc.cxx
index 28d61cbd5a8..a02419ad0e6 100755
--- a/Control/AthenaExamples/AthExJobOptions/src/ConcreteSvc.cxx
+++ b/Control/AthenaExamples/AthExJobOptions/src/ConcreteSvc.cxx
@@ -13,7 +13,6 @@
// FrameWork includes
#include "GaudiKernel/Property.h"
-#include "GaudiKernel/SvcFactory.h"
// AthExJobOptions includes
#include "AthExJobOptions/ConcreteSvc.h"
diff --git a/Control/AthenaExamples/AthExStoreGateExample/Tutorial/SGRead.cxx_solution b/Control/AthenaExamples/AthExStoreGateExample/Tutorial/SGRead.cxx_solution
index f916415aa50..ba8e3f1fdfb 100755
--- a/Control/AthenaExamples/AthExStoreGateExample/Tutorial/SGRead.cxx_solution
+++ b/Control/AthenaExamples/AthExStoreGateExample/Tutorial/SGRead.cxx_solution
@@ -4,7 +4,6 @@
#include "LinkObj.h"
#include "Tutorial_ClassDEF.h"
-#include "GaudiKernel/AlgFactory.h"
#include "GaudiKernel/ISvcLocator.h"
#include "StoreGate/DataLink.h"
diff --git a/Control/AthenaExamples/AthExStoreGateExample/Tutorial/SGWrite.cxx_solution b/Control/AthenaExamples/AthExStoreGateExample/Tutorial/SGWrite.cxx_solution
index 1aa7cf51937..14bb966c6f4 100755
--- a/Control/AthenaExamples/AthExStoreGateExample/Tutorial/SGWrite.cxx_solution
+++ b/Control/AthenaExamples/AthExStoreGateExample/Tutorial/SGWrite.cxx_solution
@@ -4,7 +4,6 @@
#include "LinkObj.h"
#include "Tutorial_ClassDEF.h"
-#include "GaudiKernel/AlgFactory.h"
#include "GaudiKernel/ISvcLocator.h"
#include "StoreGate/DataLink.h"
diff --git a/Control/AthenaExamples/AthExThinning/src/AthExDecayCnv.h b/Control/AthenaExamples/AthExThinning/src/AthExDecayCnv.h
index 4e73f909b45..ed3312422d4 100644
--- a/Control/AthenaExamples/AthExThinning/src/AthExDecayCnv.h
+++ b/Control/AthenaExamples/AthExThinning/src/AthExDecayCnv.h
@@ -43,7 +43,9 @@ class AthExDecayCnv: public T_AthenaPoolCustomCnv<
/** Create the converter from the service locator
*/
+public:
AthExDecayCnv(ISvcLocator* svcloc);
+protected:
/** Build the persistent representation from the transient one.
*/
diff --git a/Control/AthenaExamples/AthExThinning/src/AthExElephantinoCnv.h b/Control/AthenaExamples/AthExThinning/src/AthExElephantinoCnv.h
index ff7661b2ebf..0633d183180 100644
--- a/Control/AthenaExamples/AthExThinning/src/AthExElephantinoCnv.h
+++ b/Control/AthenaExamples/AthExThinning/src/AthExElephantinoCnv.h
@@ -43,7 +43,9 @@ class AthExElephantinoCnv: public T_AthenaPoolCustomCnv<
/** Create the converter from the service locator
*/
+public:
AthExElephantinoCnv(ISvcLocator* svcloc);
+protected:
/** Build the persistent representation from the transient one.
*/
diff --git a/Control/AthenaExamples/AthExThinning/src/AthExFatObjectCnv.h b/Control/AthenaExamples/AthExThinning/src/AthExFatObjectCnv.h
index acaefde10dc..89147beec0b 100644
--- a/Control/AthenaExamples/AthExThinning/src/AthExFatObjectCnv.h
+++ b/Control/AthenaExamples/AthExThinning/src/AthExFatObjectCnv.h
@@ -43,7 +43,9 @@ class AthExFatObjectCnv: public T_AthenaPoolCustomCnv<
/** Create the converter from the service locator
*/
+public:
AthExFatObjectCnv(ISvcLocator* svcloc);
+protected:
/** Build the persistent representation from the transient one.
*/
diff --git a/Control/AthenaExamples/AthExThinning/src/AthExParticlesCnv.h b/Control/AthenaExamples/AthExThinning/src/AthExParticlesCnv.h
index c97532b3055..7130ce1ec38 100644
--- a/Control/AthenaExamples/AthExThinning/src/AthExParticlesCnv.h
+++ b/Control/AthenaExamples/AthExThinning/src/AthExParticlesCnv.h
@@ -43,7 +43,9 @@ class AthExParticlesCnv: public T_AthenaPoolCustomCnv<
/** Create the converter from the service locator
*/
+public:
AthExParticlesCnv(ISvcLocator* svcloc);
+protected:
/** Build the persistent representation from the transient one.
*/
diff --git a/Control/AthenaExamples/ToyConversion/ToyConversion/ToyConverter.h b/Control/AthenaExamples/ToyConversion/ToyConversion/ToyConverter.h
index d0707efaefa..d71327f40d7 100755
--- a/Control/AthenaExamples/ToyConversion/ToyConversion/ToyConverter.h
+++ b/Control/AthenaExamples/ToyConversion/ToyConversion/ToyConverter.h
@@ -44,8 +44,8 @@ public:
virtual long int repSvcType() const;
static long int storageType();
-protected:
- friend class CnvFactory< ToyConverter<DATA> >;
+// protected:
+// friend class CnvFactory< ToyConverter<DATA> >;
ToyConverter(ISvcLocator* svcloc) :
Converter(storageType(), classID(), svcloc) {}
};
diff --git a/Control/AthenaExamples/ToyConversion/src/components/ToyConversion_entries.cxx b/Control/AthenaExamples/ToyConversion/src/components/ToyConversion_entries.cxx
index 5df5f529903..d4890e074e1 100644
--- a/Control/AthenaExamples/ToyConversion/src/components/ToyConversion_entries.cxx
+++ b/Control/AthenaExamples/ToyConversion/src/components/ToyConversion_entries.cxx
@@ -6,6 +6,6 @@ typedef ToyConverter<Foo> ToyCnvFoo;
typedef ToyConverter<Bar> ToyCnvBar;
DECLARE_COMPONENT( ToyConversionSvc )
-DECLARE_CONVERTER_FACTORY( ToyCnvFoo )
-DECLARE_CONVERTER_FACTORY( ToyCnvBar )
+DECLARE_CONVERTER( ToyCnvFoo )
+DECLARE_CONVERTER( ToyCnvBar )
diff --git a/Control/AthenaPython/src/PyComponentMgr.cxx b/Control/AthenaPython/src/PyComponentMgr.cxx
index 57e0d3752ec..6ffb829c5d7 100755
--- a/Control/AthenaPython/src/PyComponentMgr.cxx
+++ b/Control/AthenaPython/src/PyComponentMgr.cxx
@@ -26,7 +26,6 @@ SG_BASES1(PyObject, SG::NoBase);
// FrameWork includes
#include "GaudiKernel/Property.h"
-#include "GaudiKernel/SvcFactory.h"
#include "AthenaPython/IPyComponent.h"
// PyROOT includes
diff --git a/Control/AthenaServices/src/AthenaOutputStream.cxx b/Control/AthenaServices/src/AthenaOutputStream.cxx
index 1088df667af..d251b41b1fd 100644
--- a/Control/AthenaServices/src/AthenaOutputStream.cxx
+++ b/Control/AthenaServices/src/AthenaOutputStream.cxx
@@ -6,7 +6,6 @@
// Framework include files
#include "GaudiKernel/GaudiException.h"
-#include "GaudiKernel/AlgFactory.h"
#include "GaudiKernel/IAlgManager.h"
#include "GaudiKernel/IIoComponentMgr.h"
#include "GaudiKernel/ISvcLocator.h"
diff --git a/Control/AthenaServices/src/AthenaSealSvc.cxx b/Control/AthenaServices/src/AthenaSealSvc.cxx
index 22f5b79c401..dc82fcd47dd 100644
--- a/Control/AthenaServices/src/AthenaSealSvc.cxx
+++ b/Control/AthenaServices/src/AthenaSealSvc.cxx
@@ -31,7 +31,6 @@ PURPOSE: Verify dictionary completeness by attempting to load all
#include "GaudiKernel/IChronoStatSvc.h"
#include "GaudiKernel/Bootstrap.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/SvcFactory.h"
#include "GaudiKernel/IAlgManager.h"
#include "GaudiKernel/IAlgorithm.h"
#include "GaudiKernel/SmartIF.h"
diff --git a/Control/AthenaServices/src/DecisionSvc.h b/Control/AthenaServices/src/DecisionSvc.h
index 5cd8eca113e..68d51f74326 100644
--- a/Control/AthenaServices/src/DecisionSvc.h
+++ b/Control/AthenaServices/src/DecisionSvc.h
@@ -28,7 +28,6 @@
#include <map>
// FrameWork includes
-#include "GaudiKernel/AlgFactory.h"
#include "GaudiKernel/IAlgManager.h"
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/IProperty.h"
diff --git a/Control/AthenaServices/src/ItemListSvc.h b/Control/AthenaServices/src/ItemListSvc.h
index ef9d4bfdac7..4dface36083 100644
--- a/Control/AthenaServices/src/ItemListSvc.h
+++ b/Control/AthenaServices/src/ItemListSvc.h
@@ -28,7 +28,6 @@
#include <map>
// FrameWork includes
-#include "GaudiKernel/AlgFactory.h"
#include "GaudiKernel/IAlgManager.h"
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/IProperty.h"
diff --git a/Control/AthenaServices/src/LoggedMessageSvc.cxx b/Control/AthenaServices/src/LoggedMessageSvc.cxx
index 7647b55df1a..ddce0756263 100644
--- a/Control/AthenaServices/src/LoggedMessageSvc.cxx
+++ b/Control/AthenaServices/src/LoggedMessageSvc.cxx
@@ -6,7 +6,6 @@
#include "GaudiKernel/Kernel.h"
#include "GaudiKernel/StatusCode.h"
-#include "GaudiKernel/SvcFactory.h"
#include "GaudiKernel/Message.h"
#include "GaudiKernel/xtoa.h"
#include "LoggedMessageSvc.h"
diff --git a/Control/AthenaServices/src/ThinningSvc.cxx b/Control/AthenaServices/src/ThinningSvc.cxx
index 9140eef8da6..d1c3ef0ff6e 100644
--- a/Control/AthenaServices/src/ThinningSvc.cxx
+++ b/Control/AthenaServices/src/ThinningSvc.cxx
@@ -15,7 +15,6 @@
// FrameWork includes
#include "GaudiKernel/Property.h"
-#include "GaudiKernel/SvcFactory.h"
#include "GaudiKernel/IIncidentSvc.h"
#include "GaudiKernel/Incident.h"
#include "GaudiKernel/System.h"
diff --git a/Control/AthenaServices/src/ToyNextPassFilterAlg.cxx b/Control/AthenaServices/src/ToyNextPassFilterAlg.cxx
index f26619d5d2d..69e9a3b5561 100644
--- a/Control/AthenaServices/src/ToyNextPassFilterAlg.cxx
+++ b/Control/AthenaServices/src/ToyNextPassFilterAlg.cxx
@@ -3,7 +3,6 @@
*/
// $Id: ToyNextPassFilterAlg.cxx,v 1.4 2008-09-23 22:00:47 binet Exp $
-#include "GaudiKernel/AlgFactory.h"
#include "ToyNextPassFilterAlg.h"
ToyNextPassFilterAlg::ToyNextPassFilterAlg( const std::string& name,
diff --git a/Control/AthenaServices/src/ToyNextPassFilterTool.cxx b/Control/AthenaServices/src/ToyNextPassFilterTool.cxx
index a4cb9caacb6..4bd84ce047c 100644
--- a/Control/AthenaServices/src/ToyNextPassFilterTool.cxx
+++ b/Control/AthenaServices/src/ToyNextPassFilterTool.cxx
@@ -3,7 +3,6 @@
*/
// $Id: ToyNextPassFilterTool.cxx,v 1.4 2008-09-23 22:00:47 binet Exp $
-#include "GaudiKernel/ToolFactory.h"
#include "ToyNextPassFilterTool.h"
ToyNextPassFilterTool::ToyNextPassFilterTool( const std::string& type,
diff --git a/Control/AthenaServices/test/AthenaEventLoopMgr_test.cxx b/Control/AthenaServices/test/AthenaEventLoopMgr_test.cxx
index cc7fe401ecc..e3e959b72e8 100644
--- a/Control/AthenaServices/test/AthenaEventLoopMgr_test.cxx
+++ b/Control/AthenaServices/test/AthenaEventLoopMgr_test.cxx
@@ -30,7 +30,7 @@
#include "GaudiKernel/IEvtSelector.h"
#include "GaudiKernel/IEventProcessor.h"
#include "GaudiKernel/Service.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
+// //#include "GaudiKernel/DeclareFactoryEntries.h"
#include "GaudiKernel/Converter.h"
#include "GaudiKernel/ConversionSvc.h"
#include <iostream>
@@ -305,7 +305,7 @@ DECLARE_COMPONENT( TestEvtSelector )
DECLARE_COMPONENT( TestEvtSelector2 )
DECLARE_COMPONENT( TestConversionSvc )
DECLARE_COMPONENT( TestAlgorithm )
-DECLARE_CONVERTER_FACTORY( TestConverter )
+DECLARE_CONVERTER( TestConverter )
class swallowsemicolon;
void testit (IService* mgr)
diff --git a/Control/AthenaServices/test/RCUSvc_test.cxx b/Control/AthenaServices/test/RCUSvc_test.cxx
index 94bfbada71a..d8cc59137cf 100644
--- a/Control/AthenaServices/test/RCUSvc_test.cxx
+++ b/Control/AthenaServices/test/RCUSvc_test.cxx
@@ -18,7 +18,7 @@
#include "TestTools/initGaudi.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/IHiveWhiteBoard.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
+////#include "GaudiKernel/DeclareFactoryEntries.h"
#include "boost/thread/shared_mutex.hpp"
#include "boost/thread/shared_lock_guard.hpp"
#include <iostream>
diff --git a/Control/DataModelTest/DataModelRunTests/share/CondReaderMT.ref b/Control/DataModelTest/DataModelRunTests/share/CondReaderMT.ref
index 8c75261ccc1..027688ce4cf 100644
--- a/Control/DataModelTest/DataModelRunTests/share/CondReaderMT.ref
+++ b/Control/DataModelTest/DataModelRunTests/share/CondReaderMT.ref
@@ -75,8 +75,6 @@ CondInputLoader INFO Will create WriteCondHan
+ ( 'DMTest::S2' , 'ConditionStore+/DMTest/S2' )
ThreadPoolSvc INFO no thread init tools attached
AvalancheSchedulerSvc INFO Activating scheduler in a separate thread
-AvalancheSchedulerSvc INFO Waiting for AvalancheSchedulerSvc to activate
-AvalancheSchedulerSvc INFO Start checking the actionsQueue
AvalancheSchedulerSvc INFO Found 8 algorithms
AvalancheSchedulerSvc INFO Data Dependencies for Algorithms:
BeginIncFiringAlg
diff --git a/Control/DataModelTest/DataModelRunTests/share/xAODTestDecorHandle1MT.ref b/Control/DataModelTest/DataModelRunTests/share/xAODTestDecorHandle1MT.ref
index 4291eee45aa..4f943338d07 100644
--- a/Control/DataModelTest/DataModelRunTests/share/xAODTestDecorHandle1MT.ref
+++ b/Control/DataModelTest/DataModelRunTests/share/xAODTestDecorHandle1MT.ref
@@ -34,8 +34,6 @@ ClassIDSvc INFO getRegistryEntries: rea
ClassIDSvc INFO getRegistryEntries: read 65 CLIDRegistry entries for module ALL
ThreadPoolSvc INFO no thread init tools attached
AvalancheSchedulerSvc INFO Activating scheduler in a separate thread
-AvalancheSchedulerSvc INFO Waiting for AvalancheSchedulerSvc to activate
-AvalancheSchedulerSvc INFO Start checking the actionsQueue
AvalancheSchedulerSvc INFO Found 10 algorithms
AvalancheSchedulerSvc INFO Data Dependencies for Algorithms:
BeginIncFiringAlg
@@ -80,9 +78,9 @@ AvalancheSchedulerSvc INFO Data Dependencies for Al
none
AvalancheSchedulerSvc INFO Will attribute the following unmet INPUT dependencies to "SGInputLoader/SGInputLoader" Algorithm
o ( 'EventInfo' , 'StoreGateSvc+McEventInfo' ) required by Algorithm:
+ * xAODTestDecor
* xAODTestWrite
* xAODTestWriteCInfo
- * xAODTestDecor
* xAODTestWriteCVec
PrecedenceSvc INFO Assembling CF and DF task precedence rules
PrecedenceSvc INFO PrecedenceSvc initialized successfully
diff --git a/Control/DataModelTest/DataModelRunTests/share/xAODTestDecorHandle2MT.ref b/Control/DataModelTest/DataModelRunTests/share/xAODTestDecorHandle2MT.ref
index 5f3185b09f4..16d12898ada 100644
--- a/Control/DataModelTest/DataModelRunTests/share/xAODTestDecorHandle2MT.ref
+++ b/Control/DataModelTest/DataModelRunTests/share/xAODTestDecorHandle2MT.ref
@@ -80,8 +80,6 @@ ClassIDSvc INFO getRegistryEntries: rea
ClassIDSvc INFO getRegistryEntries: read 383 CLIDRegistry entries for module ALL
ThreadPoolSvc INFO no thread init tools attached
AvalancheSchedulerSvc INFO Activating scheduler in a separate thread
-AvalancheSchedulerSvc INFO Waiting for AvalancheSchedulerSvc to activate
-AvalancheSchedulerSvc INFO Start checking the actionsQueue
AvalancheSchedulerSvc INFO Found 6 algorithms
AvalancheSchedulerSvc INFO Data Dependencies for Algorithms:
BeginIncFiringAlg
diff --git a/Control/DataModelTest/DataModelRunTests/share/xAODTestSymlinks1MT.ref b/Control/DataModelTest/DataModelRunTests/share/xAODTestSymlinks1MT.ref
index 46c1e6e0beb..40648bbb526 100644
--- a/Control/DataModelTest/DataModelRunTests/share/xAODTestSymlinks1MT.ref
+++ b/Control/DataModelTest/DataModelRunTests/share/xAODTestSymlinks1MT.ref
@@ -49,8 +49,6 @@ ClassIDSvc INFO getRegistryEntries: rea
xAODTestAlg WARNING Implicit circular data dependency detected for id ( 'SG::AuxElement' , 'StoreGateSvc+cinfo2' )
ThreadPoolSvc INFO no thread init tools attached
AvalancheSchedulerSvc INFO Activating scheduler in a separate thread
-AvalancheSchedulerSvc INFO Waiting for AvalancheSchedulerSvc to activate
-AvalancheSchedulerSvc INFO Start checking the actionsQueue
AvalancheSchedulerSvc INFO Found 10 algorithms
AvalancheSchedulerSvc INFO Data Dependencies for Algorithms:
BeginIncFiringAlg
@@ -94,9 +92,9 @@ AvalancheSchedulerSvc INFO Data Dependencies for Al
AvalancheSchedulerSvc INFO Will attribute the following unmet INPUT dependencies to "SGInputLoader/SGInputLoader" Algorithm
o ( 'EventInfo' , 'StoreGateSvc+McEventInfo' ) required by Algorithm:
* xAODTestAlg
- * xAODTestWriteSymlinks
* xAODTestWriteCInfo
* xAODTestWriteCVec
+ * xAODTestWriteSymlinks
PrecedenceSvc INFO Assembling CF and DF task precedence rules
PrecedenceSvc INFO PrecedenceSvc initialized successfully
AvalancheSchedulerSvc INFO Concurrency level information:
diff --git a/Control/DataModelTest/DataModelRunTests/share/xAODTestSymlinks2MT.ref b/Control/DataModelTest/DataModelRunTests/share/xAODTestSymlinks2MT.ref
index 455203a123d..ad7b48efa43 100644
--- a/Control/DataModelTest/DataModelRunTests/share/xAODTestSymlinks2MT.ref
+++ b/Control/DataModelTest/DataModelRunTests/share/xAODTestSymlinks2MT.ref
@@ -80,8 +80,6 @@ ClassIDSvc INFO getRegistryEntries: rea
ClassIDSvc INFO getRegistryEntries: read 383 CLIDRegistry entries for module ALL
ThreadPoolSvc INFO no thread init tools attached
AvalancheSchedulerSvc INFO Activating scheduler in a separate thread
-AvalancheSchedulerSvc INFO Waiting for AvalancheSchedulerSvc to activate
-AvalancheSchedulerSvc INFO Start checking the actionsQueue
AvalancheSchedulerSvc INFO Found 6 algorithms
AvalancheSchedulerSvc INFO Data Dependencies for Algorithms:
BeginIncFiringAlg
diff --git a/Control/IOVSvc/src/CondSvc.cxx b/Control/IOVSvc/src/CondSvc.cxx
index 10e48b8a6b1..2d82a83be45 100644
--- a/Control/IOVSvc/src/CondSvc.cxx
+++ b/Control/IOVSvc/src/CondSvc.cxx
@@ -4,7 +4,6 @@
#include "IOVSvc/CondSvc.h"
#include "AthenaKernel/CondCont.h"
#include "GaudiKernel/EventIDBase.h"
-#include "GaudiKernel/SvcFactory.h"
#include "AthenaKernel/StoreID.h"
#include "SGTools/BaseInfo.h"
diff --git a/Control/IOVSvc/src/IOVSvc.cxx b/Control/IOVSvc/src/IOVSvc.cxx
index dc0edabd826..e96997320a0 100755
--- a/Control/IOVSvc/src/IOVSvc.cxx
+++ b/Control/IOVSvc/src/IOVSvc.cxx
@@ -16,7 +16,6 @@
#include "IOVSvc/IOVSvc.h"
-#include "GaudiKernel/ToolFactory.h"
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/IAlgTool.h"
#include "GaudiKernel/IToolSvc.h"
diff --git a/Control/PerformanceMonitoring/PerfMonComps/src/CallGraphAuditor.cxx b/Control/PerformanceMonitoring/PerfMonComps/src/CallGraphAuditor.cxx
index 76f3781eb9a..df53a3351f7 100644
--- a/Control/PerformanceMonitoring/PerfMonComps/src/CallGraphAuditor.cxx
+++ b/Control/PerformanceMonitoring/PerfMonComps/src/CallGraphAuditor.cxx
@@ -13,7 +13,6 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/AudFactory.h"
#include "GaudiKernel/INamedInterface.h"
// PerfMonKernel includes
diff --git a/Control/PerformanceMonitoring/PerfMonComps/src/CallGraphBuilderSvc.cxx b/Control/PerformanceMonitoring/PerfMonComps/src/CallGraphBuilderSvc.cxx
index 4e39b06a60b..067e3a34a80 100644
--- a/Control/PerformanceMonitoring/PerfMonComps/src/CallGraphBuilderSvc.cxx
+++ b/Control/PerformanceMonitoring/PerfMonComps/src/CallGraphBuilderSvc.cxx
@@ -14,7 +14,6 @@
// FrameWork includes
#include "GaudiKernel/Property.h"
-#include "GaudiKernel/SvcFactory.h"
// PerfMonComps includes
#include "CallGraphBuilderSvc.h"
diff --git a/Control/PerformanceMonitoring/PerfMonComps/src/PerfMonAuditor.cxx b/Control/PerformanceMonitoring/PerfMonComps/src/PerfMonAuditor.cxx
index 0a49469ffd1..02d7ef4a374 100644
--- a/Control/PerformanceMonitoring/PerfMonComps/src/PerfMonAuditor.cxx
+++ b/Control/PerformanceMonitoring/PerfMonComps/src/PerfMonAuditor.cxx
@@ -13,7 +13,6 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/AudFactory.h"
#include "GaudiKernel/INamedInterface.h"
#include "GaudiKernel/MsgStream.h"
diff --git a/Control/PerformanceMonitoring/PerfMonComps/src/PerfMonSvc.cxx b/Control/PerformanceMonitoring/PerfMonComps/src/PerfMonSvc.cxx
index 109f4ffe7f7..5e1d9b02972 100644
--- a/Control/PerformanceMonitoring/PerfMonComps/src/PerfMonSvc.cxx
+++ b/Control/PerformanceMonitoring/PerfMonComps/src/PerfMonSvc.cxx
@@ -34,7 +34,6 @@
// FrameWork includes
#include "GaudiKernel/Property.h"
-#include "GaudiKernel/SvcFactory.h"
#include "GaudiKernel/IIncidentSvc.h"
#include "GaudiKernel/Incident.h"
#include "GaudiKernel/IChronoStatSvc.h"
diff --git a/Control/SGMon/SGAudSvc/src/SGAudSvc.cxx b/Control/SGMon/SGAudSvc/src/SGAudSvc.cxx
index 5232b5a953c..133f4c8b63c 100644
--- a/Control/SGMon/SGAudSvc/src/SGAudSvc.cxx
+++ b/Control/SGMon/SGAudSvc/src/SGAudSvc.cxx
@@ -19,7 +19,6 @@
// FrameWork includes
#include "GaudiKernel/Property.h"
-#include "GaudiKernel/SvcFactory.h"
#include "GaudiKernel/IIncidentSvc.h"
#include "GaudiKernel/Incident.h"
#include "GaudiKernel/IAlgContextSvc.h"
diff --git a/Control/Valkyrie/src/ValgrindSvc.cxx b/Control/Valkyrie/src/ValgrindSvc.cxx
index fa4c6323bc5..f531004e7f9 100755
--- a/Control/Valkyrie/src/ValgrindSvc.cxx
+++ b/Control/Valkyrie/src/ValgrindSvc.cxx
@@ -17,7 +17,6 @@
// FrameWork includes
#include "GaudiKernel/Property.h"
-#include "GaudiKernel/SvcFactory.h"
#include "GaudiKernel/IIncidentSvc.h"
#include "GaudiKernel/Incident.h"
#include "GaudiKernel/ServiceHandle.h"
diff --git a/Database/AthenaPOOL/AthenaPoolCnvSvc/AthenaPoolCnvSvc/T_AthenaPoolCnv.h b/Database/AthenaPOOL/AthenaPoolCnvSvc/AthenaPoolCnvSvc/T_AthenaPoolCnv.h
index ab49ff44310..be2dd7b01a6 100644
--- a/Database/AthenaPOOL/AthenaPoolCnvSvc/AthenaPoolCnvSvc/T_AthenaPoolCnv.h
+++ b/Database/AthenaPOOL/AthenaPoolCnvSvc/AthenaPoolCnvSvc/T_AthenaPoolCnv.h
@@ -22,9 +22,8 @@ template <class TYPE> class CnvFactory;
**/
template <class T>
class T_AthenaPoolCnv : public T_AthenaPoolCnvBase<T> {
- friend class CnvFactory<T_AthenaPoolCnv<T> >;
-protected:
+public:
using T_AthenaPoolCnvBase<T>::T_AthenaPoolCnvBase;
};
@@ -32,9 +31,8 @@ protected:
template <class DV>
class T_AthenaPoolCnv<ViewVector<DV> > : public T_AthenaPoolViewVectorCnv<DV>
{
- friend class CnvFactory<T_AthenaPoolCnv<ViewVector<DV> > >;
-protected:
+public:
using T_AthenaPoolViewVectorCnv<DV>::T_AthenaPoolViewVectorCnv;
};
diff --git a/Database/AthenaPOOL/AthenaPoolCnvSvc/AthenaPoolCnvSvc/T_AthenaPoolCnvBase.h b/Database/AthenaPOOL/AthenaPoolCnvSvc/AthenaPoolCnvSvc/T_AthenaPoolCnvBase.h
index 89dbcb5435a..6349a795b1a 100644
--- a/Database/AthenaPOOL/AthenaPoolCnvSvc/AthenaPoolCnvSvc/T_AthenaPoolCnvBase.h
+++ b/Database/AthenaPOOL/AthenaPoolCnvSvc/AthenaPoolCnvSvc/T_AthenaPoolCnvBase.h
@@ -22,12 +22,13 @@ class StatusCode;
**/
template <class T>
class T_AthenaPoolCnvBase : public AthenaPoolConverter {
-
-protected:
+public:
/// Constructor
T_AthenaPoolCnvBase(ISvcLocator* svcloc,
const char* name = nullptr);
+protected:
+
/// Gaudi Service Interface method implementations:
virtual StatusCode initialize();
diff --git a/Database/AthenaPOOL/AthenaPoolCnvSvc/AthenaPoolCnvSvc/T_AthenaPoolCoolMultChanCnv.h b/Database/AthenaPOOL/AthenaPoolCnvSvc/AthenaPoolCnvSvc/T_AthenaPoolCoolMultChanCnv.h
index 6371919bd66..bbe8fe8f60f 100644
--- a/Database/AthenaPOOL/AthenaPoolCnvSvc/AthenaPoolCnvSvc/T_AthenaPoolCoolMultChanCnv.h
+++ b/Database/AthenaPOOL/AthenaPoolCnvSvc/AthenaPoolCnvSvc/T_AthenaPoolCoolMultChanCnv.h
@@ -33,12 +33,12 @@ template <class TYPE> class CnvFactory;
**/
template <class COLL_T, class ELEM_T, class ELEM_P = ELEM_T>
class T_AthenaPoolCoolMultChanCnv : public T_AthenaPoolCustCnv<COLL_T, ELEM_T> {
- friend class CnvFactory<T_AthenaPoolCoolMultChanCnv<COLL_T, ELEM_T> >;
-protected:
+public:
/// Constructor
T_AthenaPoolCoolMultChanCnv(ISvcLocator* svcloc);
+protected:
/// Create a transient object from a POOL persistent representation.
/// @param pAddr [IN] IOpaqueAddress of POOL persistent representation.
/// @param pObj [OUT] pointer to the transient object.
diff --git a/Database/AthenaPOOL/AthenaPoolCnvSvc/AthenaPoolCnvSvc/T_AthenaPoolCustomCnv.h b/Database/AthenaPOOL/AthenaPoolCnvSvc/AthenaPoolCnvSvc/T_AthenaPoolCustomCnv.h
index 9587a9d9b16..8acf2077efd 100644
--- a/Database/AthenaPOOL/AthenaPoolCnvSvc/AthenaPoolCnvSvc/T_AthenaPoolCustomCnv.h
+++ b/Database/AthenaPOOL/AthenaPoolCnvSvc/AthenaPoolCnvSvc/T_AthenaPoolCustomCnv.h
@@ -27,7 +27,6 @@ template <class T, class P> class T_AthenaPoolExtendingCnv;
template <class TRANS, class PERS>
class T_AthenaPoolCustomCnv : public T_AthenaPoolCustCnv<TRANS, PERS> {
-friend class CnvFactory<T_AthenaPoolCustomCnv<TRANS, PERS> >;
/// need the extending converter class as friend,
/// so clones can access the original converter methods
friend class T_AthenaPoolExtendingCnv<TRANS,PERS>;
@@ -35,13 +34,14 @@ friend class T_AthenaPoolExtendingCnv<TRANS,PERS>;
public:
typedef T_AthenaPoolCustCnv<TRANS, PERS> BaseType;
-protected:
/// Constructor
/// @param svcloc [IN] Gaudi service locator
/// @param name [IN] Optional name, for error reporting.
T_AthenaPoolCustomCnv(ISvcLocator* pSvcLocator,
const char* name = nullptr);
+protected:
+
// the 2 following methods are allowed to throw std::runtime_error
/** method to be implemented by the developer.
diff --git a/Database/AthenaPOOL/AthenaPoolCnvSvc/AthenaPoolCnvSvc/T_AthenaPoolExtendingCnv.h b/Database/AthenaPOOL/AthenaPoolCnvSvc/AthenaPoolCnvSvc/T_AthenaPoolExtendingCnv.h
index 0009eb0e7a2..ff58489dbef 100644
--- a/Database/AthenaPOOL/AthenaPoolCnvSvc/AthenaPoolCnvSvc/T_AthenaPoolExtendingCnv.h
+++ b/Database/AthenaPOOL/AthenaPoolCnvSvc/AthenaPoolCnvSvc/T_AthenaPoolExtendingCnv.h
@@ -28,11 +28,12 @@ friend class CnvFactory<T_AthenaPoolExtendingCnv<TRANS, PERS> >;
public:
typedef T_AthenaPoolCustomCnv<TRANS, PERS> BaseType;
-protected:
- // -------------------------------------------------------------
+public:
+ // -------------------------------------------------------------
/// Constructor
T_AthenaPoolExtendingCnv(ISvcLocator* svcloc);
+protected:
// Methods to be implemented in the derived converter class
// ##########################################################
diff --git a/Database/AthenaPOOL/AthenaPoolCnvSvc/src/AthenaAttributeListCnv.h b/Database/AthenaPOOL/AthenaPoolCnvSvc/src/AthenaAttributeListCnv.h
index dfc5e73d2fa..992a00f4f1f 100644
--- a/Database/AthenaPOOL/AthenaPoolCnvSvc/src/AthenaAttributeListCnv.h
+++ b/Database/AthenaPOOL/AthenaPoolCnvSvc/src/AthenaAttributeListCnv.h
@@ -26,8 +26,6 @@ template <class TYPE> class CnvFactory;
*
**/
class AthenaAttributeListCnv : public Converter {
- friend class CnvFactory<AthenaAttributeListCnv>;
-
public:
/// Destructor
virtual ~AthenaAttributeListCnv();
@@ -53,7 +51,6 @@ public:
/// @return class ID.
static const CLID& classID();
-protected:
/// Constructor
AthenaAttributeListCnv(ISvcLocator* svcloc);
};
diff --git a/Database/AthenaPOOL/AthenaPoolCnvSvc/src/CondAttrListCollCnv.h b/Database/AthenaPOOL/AthenaPoolCnvSvc/src/CondAttrListCollCnv.h
index d91d61fd8a2..d94b3c31891 100644
--- a/Database/AthenaPOOL/AthenaPoolCnvSvc/src/CondAttrListCollCnv.h
+++ b/Database/AthenaPOOL/AthenaPoolCnvSvc/src/CondAttrListCollCnv.h
@@ -26,8 +26,6 @@ template <class TYPE> class CnvFactory;
*
**/
class CondAttrListCollCnv : public Converter {
- friend class CnvFactory<CondAttrListCollCnv>;
-
public:
/// Destructor
virtual ~CondAttrListCollCnv();
@@ -53,7 +51,6 @@ public:
/// @return class ID.
static const CLID& classID();
-protected:
/// Constructor
CondAttrListCollCnv(ISvcLocator* svcloc);
};
diff --git a/Database/AthenaPOOL/AthenaPoolCnvSvc/src/CondAttrListVecCnv.h b/Database/AthenaPOOL/AthenaPoolCnvSvc/src/CondAttrListVecCnv.h
index 34b7596626f..ffd583db117 100644
--- a/Database/AthenaPOOL/AthenaPoolCnvSvc/src/CondAttrListVecCnv.h
+++ b/Database/AthenaPOOL/AthenaPoolCnvSvc/src/CondAttrListVecCnv.h
@@ -26,8 +26,6 @@ template <class TYPE> class CnvFactory;
*
**/
class CondAttrListVecCnv : public Converter {
- friend class CnvFactory<CondAttrListVecCnv>;
-
public:
/// Destructor
virtual ~CondAttrListVecCnv();
@@ -53,7 +51,6 @@ public:
/// @return class ID.
static const CLID& classID();
-protected:
/// Constructor
CondAttrListVecCnv(ISvcLocator* svcloc);
};
diff --git a/Database/AthenaPOOL/AthenaPoolCnvSvc/src/components/AthenaPoolCnvSvc_entries.cxx b/Database/AthenaPOOL/AthenaPoolCnvSvc/src/components/AthenaPoolCnvSvc_entries.cxx
index 0a5c71facf9..686eb0acc99 100644
--- a/Database/AthenaPOOL/AthenaPoolCnvSvc/src/components/AthenaPoolCnvSvc_entries.cxx
+++ b/Database/AthenaPOOL/AthenaPoolCnvSvc/src/components/AthenaPoolCnvSvc_entries.cxx
@@ -6,7 +6,7 @@
DECLARE_COMPONENT( AthenaPoolCnvSvc )
DECLARE_COMPONENT( AthenaRootSerializeSvc )
-DECLARE_CONVERTER_FACTORY( AthenaAttributeListCnv )
-DECLARE_CONVERTER_FACTORY( CondAttrListCollCnv )
-DECLARE_CONVERTER_FACTORY( CondAttrListVecCnv )
+DECLARE_CONVERTER( AthenaAttributeListCnv )
+DECLARE_CONVERTER( CondAttrListCollCnv )
+DECLARE_CONVERTER( CondAttrListVecCnv )
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/ReadMeta.cxx b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/ReadMeta.cxx
index d153057f3dd..871fe8a4aa0 100755
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/ReadMeta.cxx
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/ReadMeta.cxx
@@ -13,7 +13,6 @@
// the user data-class defintions
#include "AthenaPoolExampleData/ExampleHitContainer.h"
-#include "GaudiKernel/ToolFactory.h"
#include "GaudiKernel/IIncidentSvc.h"
#include "GaudiKernel/FileIncident.h"
diff --git a/Database/AthenaPOOL/AthenaPoolTools/src/BookkeeperDumper.cxx b/Database/AthenaPOOL/AthenaPoolTools/src/BookkeeperDumper.cxx
index 0cf9dd52a4a..659c80a08ec 100755
--- a/Database/AthenaPOOL/AthenaPoolTools/src/BookkeeperDumper.cxx
+++ b/Database/AthenaPOOL/AthenaPoolTools/src/BookkeeperDumper.cxx
@@ -10,7 +10,6 @@
#include "BookkeeperDumper.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/AlgFactory.h"
#include "PersistentDataModel/Token.h"
#include "PersistentDataModel/DataHeader.h"
diff --git a/Database/AthenaPOOL/AthenaPoolTools/src/EventCount.cxx b/Database/AthenaPOOL/AthenaPoolTools/src/EventCount.cxx
index c1a19f873ab..22154fe0c1e 100755
--- a/Database/AthenaPOOL/AthenaPoolTools/src/EventCount.cxx
+++ b/Database/AthenaPOOL/AthenaPoolTools/src/EventCount.cxx
@@ -10,7 +10,6 @@
#include "EventCount.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/AlgFactory.h"
#include "PersistentDataModel/Token.h"
#include "PersistentDataModel/DataHeader.h"
diff --git a/Database/AthenaPOOL/AthenaPoolTools/src/MetadataTest.cxx b/Database/AthenaPOOL/AthenaPoolTools/src/MetadataTest.cxx
index ed2d85dd3e9..85ed9f1c73e 100755
--- a/Database/AthenaPOOL/AthenaPoolTools/src/MetadataTest.cxx
+++ b/Database/AthenaPOOL/AthenaPoolTools/src/MetadataTest.cxx
@@ -10,7 +10,6 @@
#include "MetadataTest.h"
//#include "GaudiKernel/MsgStream.h"
-//#include "GaudiKernel/AlgFactory.h"
#include "StoreGate/ReadMetaHandle.h"
#include "xAODCutFlow/CutBookkeeperContainer.h"
diff --git a/Database/AthenaPOOL/AthenaPoolTools/src/RequireUniqueEvent.cxx b/Database/AthenaPOOL/AthenaPoolTools/src/RequireUniqueEvent.cxx
index c683a057dbe..dd26f31b26d 100755
--- a/Database/AthenaPOOL/AthenaPoolTools/src/RequireUniqueEvent.cxx
+++ b/Database/AthenaPOOL/AthenaPoolTools/src/RequireUniqueEvent.cxx
@@ -12,7 +12,6 @@
// the user data-class defintions
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/Property.h"
-#include "GaudiKernel/AlgFactory.h"
#include "StoreGate/StoreGateSvc.h"
diff --git a/Database/AthenaPOOL/StlAthenaPoolCnv/src/StlAthenaPoolCnv.cxx b/Database/AthenaPOOL/StlAthenaPoolCnv/src/StlAthenaPoolCnv.cxx
index fbad3d5bcdb..41cd2686a4b 100644
--- a/Database/AthenaPOOL/StlAthenaPoolCnv/src/StlAthenaPoolCnv.cxx
+++ b/Database/AthenaPOOL/StlAthenaPoolCnv/src/StlAthenaPoolCnv.cxx
@@ -3,7 +3,7 @@
*/
#include "AthenaPoolCnvSvc/T_AthenaPoolCnv.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
+//#include "GaudiKernel/DeclareFactoryEntries.h"
// explicit instantiations
@@ -47,12 +47,12 @@ public:
#define DECL_CNV(NAME, TDEF) \
typedef StlAthenaPoolCnv< NAME > TDEF; \
template class StlAthenaPoolCnv< NAME >; \
- DECLARE_CONVERTER_FACTORY(TDEF)
+ DECLARE_CONVERTER(TDEF)
#define DECL2_CNV(N1, N2, TDEF) \
typedef StlAthenaPoolCnv< N1, N2 > TDEF; \
template class StlAthenaPoolCnv< N1, N2 >; \
- DECLARE_CONVERTER_FACTORY(TDEF)
+ DECLARE_CONVERTER(TDEF)
#include "SGTools/BuiltinsClids.h"
DECL_CNV(int, AthenaPoolIntCnv)
diff --git a/Database/AthenaRoot/AthenaRootComps/src/RootNtupleOutputStream.cxx b/Database/AthenaRoot/AthenaRootComps/src/RootNtupleOutputStream.cxx
index 9365c573586..5a63d1c9be3 100755
--- a/Database/AthenaRoot/AthenaRootComps/src/RootNtupleOutputStream.cxx
+++ b/Database/AthenaRoot/AthenaRootComps/src/RootNtupleOutputStream.cxx
@@ -9,7 +9,6 @@
// Framework include files
#include "GaudiKernel/GaudiException.h"
-#include "GaudiKernel/AlgFactory.h"
#include "GaudiKernel/IAlgManager.h"
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/IOpaqueAddress.h"
diff --git a/Database/ConnectionManagement/DBReplicaSvc/src/DBReplicaSvc.cxx b/Database/ConnectionManagement/DBReplicaSvc/src/DBReplicaSvc.cxx
index 7a69f594ce1..f4d15b21d75 100755
--- a/Database/ConnectionManagement/DBReplicaSvc/src/DBReplicaSvc.cxx
+++ b/Database/ConnectionManagement/DBReplicaSvc/src/DBReplicaSvc.cxx
@@ -7,7 +7,6 @@
#include <fstream>
#include <cstring>
-#include "GaudiKernel/SvcFactory.h"
#include "GaudiKernel/MsgStream.h"
#include "PathResolver/PathResolver.h"
#include "DBReplicaSvc.h"
diff --git a/Database/IOVDbMetaDataTools/src/IOVDbMetaDataTool.cxx b/Database/IOVDbMetaDataTools/src/IOVDbMetaDataTool.cxx
index e380109f2c5..b2aba401d15 100755
--- a/Database/IOVDbMetaDataTools/src/IOVDbMetaDataTool.cxx
+++ b/Database/IOVDbMetaDataTools/src/IOVDbMetaDataTool.cxx
@@ -20,7 +20,6 @@
// Gaudi includes
#include "GaudiKernel/IIncidentSvc.h"
#include "GaudiKernel/FileIncident.h"
-#include "GaudiKernel/ToolFactory.h"
// Athena includes
#include "StoreGate/StoreGate.h"
diff --git a/Database/RegistrationServices/src/IOVRegistrationSvc.cxx b/Database/RegistrationServices/src/IOVRegistrationSvc.cxx
index 7382c2bec5f..716c39baec9 100644
--- a/Database/RegistrationServices/src/IOVRegistrationSvc.cxx
+++ b/Database/RegistrationServices/src/IOVRegistrationSvc.cxx
@@ -17,7 +17,7 @@
#include "IOVRegistrationSvc.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
+//#include "GaudiKernel/DeclareFactoryEntries.h"
// Athena includes
#include "StoreGate/StoreGate.h"
diff --git a/Database/RegistrationServices/src/OutputConditionsAlg.cxx b/Database/RegistrationServices/src/OutputConditionsAlg.cxx
index 847aa8f3d17..1a8019011c4 100755
--- a/Database/RegistrationServices/src/OutputConditionsAlg.cxx
+++ b/Database/RegistrationServices/src/OutputConditionsAlg.cxx
@@ -11,7 +11,6 @@
#include "AthenaKernel/IAthenaOutputStreamTool.h"
#include "AthenaKernel/IClassIDSvc.h"
#include "AthenaKernel/IOVTime.h"
-#include "GaudiKernel/AlgFactory.h"
#include "RegistrationServices/IIOVRegistrationSvc.h"
#include "OutputConditionsAlg.h"
diff --git a/Database/RegistrationServices/src/RegistrationStream.cxx b/Database/RegistrationServices/src/RegistrationStream.cxx
index 034addbde34..5875df464e0 100755
--- a/Database/RegistrationServices/src/RegistrationStream.cxx
+++ b/Database/RegistrationServices/src/RegistrationStream.cxx
@@ -26,7 +26,6 @@
#include "StoreGate/DataHandle.h"
// Framework include files
-#include "GaudiKernel/AlgFactory.h"
#include "GaudiKernel/IAlgManager.h"
#include "GaudiKernel/IIoComponentMgr.h"
#include "GaudiKernel/ISvcLocator.h"
diff --git a/DetectorDescription/AGDD/AGDD2GeoSvc/src/AGDD2GeoSvc.cxx b/DetectorDescription/AGDD/AGDD2GeoSvc/src/AGDD2GeoSvc.cxx
index 44c32749b74..884cb81ee86 100644
--- a/DetectorDescription/AGDD/AGDD2GeoSvc/src/AGDD2GeoSvc.cxx
+++ b/DetectorDescription/AGDD/AGDD2GeoSvc/src/AGDD2GeoSvc.cxx
@@ -5,7 +5,6 @@
#include "AGDD2GeoSvc/AGDD2GeoSvc.h"
#include "AGDD2GeoSvc/IAGDD2GeoSvc.h"
#include "GaudiKernel/IToolSvc.h"
-#include "GaudiKernel/SvcFactory.h"
#include "AGDDControl/IAGDDToolBase.h"
#include "AGDDControl/AGDDTokenizer.h"
diff --git a/DetectorDescription/DetDescrCnvSvc/src/DetDescrCnvSvc.cxx b/DetectorDescription/DetDescrCnvSvc/src/DetDescrCnvSvc.cxx
index 17d626fb742..823392ead40 100755
--- a/DetectorDescription/DetDescrCnvSvc/src/DetDescrCnvSvc.cxx
+++ b/DetectorDescription/DetDescrCnvSvc/src/DetDescrCnvSvc.cxx
@@ -9,8 +9,6 @@
#include "DetDescrCnvSvc/DetDescrAddress.h"
-#include "GaudiKernel/SvcFactory.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/IConversionSvc.h"
diff --git a/DetectorDescription/DetDescrCnvSvc/src/DetDescrConverter.cxx b/DetectorDescription/DetDescrCnvSvc/src/DetDescrConverter.cxx
index 69f2f71e982..f4427802a1c 100755
--- a/DetectorDescription/DetDescrCnvSvc/src/DetDescrConverter.cxx
+++ b/DetectorDescription/DetDescrCnvSvc/src/DetDescrConverter.cxx
@@ -16,9 +16,6 @@
#include "DetDescrCnvSvc/DetDescrAddress.h"
#include "DetDescrCnvSvc/DetDescrCnvSvc.h"
#include "GaudiKernel/MsgStream.h"
-// #include "GaudiKernel/CnvFactory.h"
-// #include "GaudiKernel/ContainedObject.h"
-// #include "GaudiKernel/DataObject.h"
//<<<<<< PRIVATE DEFINES >>>>>>
//<<<<<< PRIVATE CONSTANTS >>>>>>
diff --git a/DetectorDescription/DetDescrCond/DetDescrCondAthenaPool/src/AlignableTransformContainerCnv.h b/DetectorDescription/DetDescrCond/DetDescrCondAthenaPool/src/AlignableTransformContainerCnv.h
index f5e44648f75..2c3681bf4f4 100644
--- a/DetectorDescription/DetDescrCond/DetDescrCondAthenaPool/src/AlignableTransformContainerCnv.h
+++ b/DetectorDescription/DetDescrCond/DetDescrCondAthenaPool/src/AlignableTransformContainerCnv.h
@@ -27,7 +27,9 @@ friend class CnvFactory<AlignableTransformContainerCnv >;
virtual StatusCode initialize();
protected:
+public:
AlignableTransformContainerCnv (ISvcLocator* svcloc) : AlignableTransformContainerCnvBase(svcloc) {}
+protected:
virtual AlignableTransform_PERS* createPersistent (AlignableTransform_TRANS* transObj);
virtual AlignableTransform_TRANS* createTransient ();
};
diff --git a/DetectorDescription/DetDescrCond/DetDescrCondTools/src/AlignTransTool.cxx b/DetectorDescription/DetDescrCond/DetDescrCondTools/src/AlignTransTool.cxx
index a2882908dc4..1dca7facd9f 100755
--- a/DetectorDescription/DetDescrCond/DetDescrCondTools/src/AlignTransTool.cxx
+++ b/DetectorDescription/DetDescrCond/DetDescrCondTools/src/AlignTransTool.cxx
@@ -7,7 +7,6 @@
// Richard Hawkings, started 25/9/03
#include <algorithm>
-#include "GaudiKernel/ToolFactory.h"
#include "StoreGate/StoreGateSvc.h"
#include "Identifier/Identifier.h"
#include "CLHEP/Geometry/Transform3D.h"
diff --git a/DetectorDescription/DetDescrCond/DetDescrCondTools/src/CoolStrFileSvc.cxx b/DetectorDescription/DetDescrCond/DetDescrCondTools/src/CoolStrFileSvc.cxx
index 1742ce62db6..268bba0cc9d 100755
--- a/DetectorDescription/DetDescrCond/DetDescrCondTools/src/CoolStrFileSvc.cxx
+++ b/DetectorDescription/DetDescrCond/DetDescrCondTools/src/CoolStrFileSvc.cxx
@@ -5,7 +5,6 @@
// CoolStrFile.cxx
// Richard Hawkings, started 14/11/05
-#include "GaudiKernel/SvcFactory.h"
#include "AthenaPoolUtilities/AthenaAttributeList.h"
#include "AthenaPoolUtilities/CondAttrListCollection.h"
diff --git a/DetectorDescription/DetDescrCond/DetectorStatus/src/DetStatusSvc.cxx b/DetectorDescription/DetDescrCond/DetectorStatus/src/DetStatusSvc.cxx
index 47b5b456b5b..10e372b9258 100755
--- a/DetectorDescription/DetDescrCond/DetectorStatus/src/DetStatusSvc.cxx
+++ b/DetectorDescription/DetDescrCond/DetectorStatus/src/DetStatusSvc.cxx
@@ -5,7 +5,6 @@
// DetStatusSvc.cxx
// Richard Hawkings, started 13/12/06
-#include "GaudiKernel/SvcFactory.h"
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/MsgStream.h"
#include "StoreGate/StoreGateSvc.h"
diff --git a/DetectorDescription/IdDictDetDescrCnv/src/AtlasIDDetDescrCnv.cxx b/DetectorDescription/IdDictDetDescrCnv/src/AtlasIDDetDescrCnv.cxx
index a563cefbc9c..b4018679a99 100755
--- a/DetectorDescription/IdDictDetDescrCnv/src/AtlasIDDetDescrCnv.cxx
+++ b/DetectorDescription/IdDictDetDescrCnv/src/AtlasIDDetDescrCnv.cxx
@@ -17,7 +17,6 @@
#include "DetDescrCnvSvc/DetDescrConverter.h"
#include "DetDescrCnvSvc/DetDescrAddress.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/CnvFactory.h"
#include "StoreGate/StoreGate.h"
#include "SGTools/StorableConversions.h"
diff --git a/DetectorDescription/IdDictDetDescrCnv/src/AtlasIDDetDescrCnv.h b/DetectorDescription/IdDictDetDescrCnv/src/AtlasIDDetDescrCnv.h
index 415dfd0055b..16719e30a08 100755
--- a/DetectorDescription/IdDictDetDescrCnv/src/AtlasIDDetDescrCnv.h
+++ b/DetectorDescription/IdDictDetDescrCnv/src/AtlasIDDetDescrCnv.h
@@ -32,7 +32,6 @@
**/
class AtlasIDDetDescrCnv: public DetDescrConverter {
- friend class CnvFactory<AtlasIDDetDescrCnv>;
public:
virtual long int repSvcType() const;
@@ -44,7 +43,6 @@ public:
static long int storageType();
static const CLID& classID();
-protected:
AtlasIDDetDescrCnv(ISvcLocator* svcloc);
};
diff --git a/DetectorDescription/IdDictDetDescrCnv/src/IdDictDetDescrCnv.cxx b/DetectorDescription/IdDictDetDescrCnv/src/IdDictDetDescrCnv.cxx
index cfd6ebd04c6..9c989beac36 100755
--- a/DetectorDescription/IdDictDetDescrCnv/src/IdDictDetDescrCnv.cxx
+++ b/DetectorDescription/IdDictDetDescrCnv/src/IdDictDetDescrCnv.cxx
@@ -27,7 +27,6 @@
#include "RDBAccessSvc/IRDBRecordset.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/CnvFactory.h"
#include "StoreGate/StoreGate.h"
#include "SGTools/StorableConversions.h"
diff --git a/DetectorDescription/IdDictDetDescrCnv/src/IdDictDetDescrCnv.h b/DetectorDescription/IdDictDetDescrCnv/src/IdDictDetDescrCnv.h
index 547dc6f9cce..4d49a3b6d93 100755
--- a/DetectorDescription/IdDictDetDescrCnv/src/IdDictDetDescrCnv.h
+++ b/DetectorDescription/IdDictDetDescrCnv/src/IdDictDetDescrCnv.h
@@ -40,7 +40,6 @@ class IdDictManager;
*/
class IdDictDetDescrCnv: public DetDescrConverter {
- friend class CnvFactory<IdDictDetDescrCnv>;
public:
virtual long int repSvcType() const;
@@ -52,7 +51,6 @@ public:
static long int storageType();
static const CLID& classID();
-protected:
IdDictDetDescrCnv(ISvcLocator* svcloc);
private:
diff --git a/DetectorDescription/IdDictDetDescrCnv/src/IdDictDetDescrCnv_entries.cxx b/DetectorDescription/IdDictDetDescrCnv/src/IdDictDetDescrCnv_entries.cxx
index 641832c3c32..4e6cda010de 100644
--- a/DetectorDescription/IdDictDetDescrCnv/src/IdDictDetDescrCnv_entries.cxx
+++ b/DetectorDescription/IdDictDetDescrCnv/src/IdDictDetDescrCnv_entries.cxx
@@ -2,7 +2,7 @@
#include "AtlasIDDetDescrCnv.h"
#include "IdDictCnvTest.h"
-DECLARE_CONVERTER_FACTORY( AtlasIDDetDescrCnv )
-DECLARE_CONVERTER_FACTORY( IdDictDetDescrCnv )
+DECLARE_CONVERTER( AtlasIDDetDescrCnv )
+DECLARE_CONVERTER( IdDictDetDescrCnv )
DECLARE_COMPONENT( IdDictCnvTest )
diff --git a/Event/ByteStreamCnvSvc/src/ByteStreamMergeOutputSvc.cxx b/Event/ByteStreamCnvSvc/src/ByteStreamMergeOutputSvc.cxx
index 5e1696b8176..0a24e50e40c 100644
--- a/Event/ByteStreamCnvSvc/src/ByteStreamMergeOutputSvc.cxx
+++ b/Event/ByteStreamCnvSvc/src/ByteStreamMergeOutputSvc.cxx
@@ -7,7 +7,6 @@
#include "StoreGate/StoreGate.h"
-#include "GaudiKernel/SvcFactory.h"
#include "GaudiKernel/GenericAddress.h"
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/ISvcLocator.h"
diff --git a/Event/ByteStreamCnvSvc/src/ByteStreamSingleEventInputSvc.cxx b/Event/ByteStreamCnvSvc/src/ByteStreamSingleEventInputSvc.cxx
index 9417a8efe6c..4a8c9a0db5d 100644
--- a/Event/ByteStreamCnvSvc/src/ByteStreamSingleEventInputSvc.cxx
+++ b/Event/ByteStreamCnvSvc/src/ByteStreamSingleEventInputSvc.cxx
@@ -13,7 +13,6 @@
#include "EventStorage/pickDataReader.h"
#include "EventStorage/EventStorageRecords.h"
-#include "GaudiKernel/SvcFactory.h"
#include "GaudiKernel/GenericAddress.h"
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/ISvcLocator.h"
diff --git a/Event/ByteStreamCnvSvc/src/EventInfoByteStreamCnv.cxx b/Event/ByteStreamCnvSvc/src/EventInfoByteStreamCnv.cxx
index e58d0379485..221a2a0d700 100644
--- a/Event/ByteStreamCnvSvc/src/EventInfoByteStreamCnv.cxx
+++ b/Event/ByteStreamCnvSvc/src/EventInfoByteStreamCnv.cxx
@@ -12,7 +12,6 @@
#include "ByteStreamData/ByteStreamMetadata.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IRegistry.h"
diff --git a/Event/ByteStreamCnvSvc/src/EventInfoByteStreamCnv.h b/Event/ByteStreamCnvSvc/src/EventInfoByteStreamCnv.h
index 65a5259c5d8..edd6117e761 100644
--- a/Event/ByteStreamCnvSvc/src/EventInfoByteStreamCnv.h
+++ b/Event/ByteStreamCnvSvc/src/EventInfoByteStreamCnv.h
@@ -36,13 +36,10 @@ extern long ByteStream_StorageType;
* EventInfo is built from RawEvent when reading and does nothing when writing ByteStream
**/
class EventInfoByteStreamCnv : public Converter {
- friend class CnvFactory<EventInfoByteStreamCnv>;
-protected:
- /// Constructor
+public:
EventInfoByteStreamCnv(ISvcLocator* svcloc);
-public:
virtual StatusCode initialize();
virtual StatusCode finalize();
diff --git a/Event/ByteStreamCnvSvc/src/components/ByteStreamCnvSvc_entries.cxx b/Event/ByteStreamCnvSvc/src/components/ByteStreamCnvSvc_entries.cxx
index 09e925a1dd1..df2aafb192d 100644
--- a/Event/ByteStreamCnvSvc/src/components/ByteStreamCnvSvc_entries.cxx
+++ b/Event/ByteStreamCnvSvc/src/components/ByteStreamCnvSvc_entries.cxx
@@ -11,7 +11,7 @@
#include "../ByteStreamMetadataTool.h"
#include "../ByteStreamAttListMetadataSvc.h"
-DECLARE_CONVERTER_FACTORY( EventInfoByteStreamCnv )
+DECLARE_CONVERTER( EventInfoByteStreamCnv )
DECLARE_COMPONENT( ByteStreamCnvSvc )
DECLARE_COMPONENT( EventSelectorByteStream )
DECLARE_COMPONENT( ByteStreamMergeOutputSvc )
diff --git a/Event/ByteStreamCnvSvcBase/ByteStreamCnvSvcBase/CollectionByteStreamCnv.icc b/Event/ByteStreamCnvSvcBase/ByteStreamCnvSvcBase/CollectionByteStreamCnv.icc
index 240f47d8728..a647bb807aa 100755
--- a/Event/ByteStreamCnvSvcBase/ByteStreamCnvSvcBase/CollectionByteStreamCnv.icc
+++ b/Event/ByteStreamCnvSvcBase/ByteStreamCnvSvcBase/CollectionByteStreamCnv.icc
@@ -7,7 +7,6 @@
#include "ByteStreamCnvSvcBase/IROBDataProviderSvc.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IRegistry.h"
diff --git a/Event/EventAthenaPool/src/EventInfoCnv.h b/Event/EventAthenaPool/src/EventInfoCnv.h
old mode 100755
new mode 100644
index 1d1b0603f24..ed75f874217
--- a/Event/EventAthenaPool/src/EventInfoCnv.h
+++ b/Event/EventAthenaPool/src/EventInfoCnv.h
@@ -28,7 +28,9 @@ class EventInfoCnv : public EventInfoCnvBase {
friend class CnvFactory<EventInfoCnv >;
protected:
+public:
EventInfoCnv (ISvcLocator* svcloc);
+protected:
virtual EventInfo_PERS* createPersistent (EventInfo* transObj);
virtual EventInfo* createTransient ();
EventInfo* massageEventInfo (EventInfo* ei);
diff --git a/Event/EventAthenaPool/src/EventStreamInfoCnv.h b/Event/EventAthenaPool/src/EventStreamInfoCnv.h
old mode 100755
new mode 100644
index f632988b7c0..4bbdf192c5c
--- a/Event/EventAthenaPool/src/EventStreamInfoCnv.h
+++ b/Event/EventAthenaPool/src/EventStreamInfoCnv.h
@@ -27,7 +27,9 @@ class EventStreamInfoCnv : public EventStreamInfoCnvBase {
friend class CnvFactory<EventStreamInfoCnv>;
protected:
+public:
EventStreamInfoCnv(ISvcLocator* svcloc) : EventStreamInfoCnvBase(svcloc) {}
+protected:
virtual EventStreamInfo_PERS* createPersistent(EventStreamInfo* transObj);
virtual EventStreamInfo* createTransient();
diff --git a/Event/EventAthenaPool/src/MergedEventInfoCnv.h b/Event/EventAthenaPool/src/MergedEventInfoCnv.h
old mode 100755
new mode 100644
index e460fb40d90..2ca49a1ea56
--- a/Event/EventAthenaPool/src/MergedEventInfoCnv.h
+++ b/Event/EventAthenaPool/src/MergedEventInfoCnv.h
@@ -27,7 +27,9 @@ typedef T_AthenaPoolCustomCnv<MergedEventInfo, MergedEventInfo_PERS > MergedE
class MergedEventInfoCnv : public MergedEventInfoCnvBase {
friend class CnvFactory<MergedEventInfoCnv >;
protected:
+public:
MergedEventInfoCnv (ISvcLocator* svcloc) : MergedEventInfoCnvBase(svcloc) {}
+protected:
virtual MergedEventInfo_PERS* createPersistent (MergedEventInfo* transObj);
virtual MergedEventInfo* createTransient ();
};
diff --git a/Event/EventAthenaPool/src/PileUpEventInfoCnv.h b/Event/EventAthenaPool/src/PileUpEventInfoCnv.h
old mode 100755
new mode 100644
index 6736b80ef8b..dd2266d69b6
--- a/Event/EventAthenaPool/src/PileUpEventInfoCnv.h
+++ b/Event/EventAthenaPool/src/PileUpEventInfoCnv.h
@@ -35,7 +35,9 @@ typedef T_AthenaPoolCustomCnv<PileUpEventInfo, PileUpEventInfo_PERS > PileUpE
class PileUpEventInfoCnv : public PileUpEventInfoCnvBase {
friend class CnvFactory<PileUpEventInfoCnv >;
protected:
+public:
PileUpEventInfoCnv (ISvcLocator* svcloc) : PileUpEventInfoCnvBase(svcloc) {}
+protected:
virtual PileUpEventInfo_PERS* createPersistent (PileUpEventInfo* transObj);
virtual PileUpEventInfo* createTransient ();
};
diff --git a/Event/EventBookkeeperAthenaPool/src/EventBookkeeperCnv.h b/Event/EventBookkeeperAthenaPool/src/EventBookkeeperCnv.h
index 6d62dc8668f..db71e517caf 100644
--- a/Event/EventBookkeeperAthenaPool/src/EventBookkeeperCnv.h
+++ b/Event/EventBookkeeperAthenaPool/src/EventBookkeeperCnv.h
@@ -25,7 +25,9 @@ class EventBookkeeperCnv : public EventBookkeeperCnvBase
{
friend class CnvFactory<EventBookkeeperCnv >;
protected:
+public:
EventBookkeeperCnv (ISvcLocator* svcloc) : EventBookkeeperCnvBase(svcloc) {}
+protected:
virtual EventBookkeeper_PERS* createPersistent (EventBookkeeper* transCont);
virtual EventBookkeeper* createTransient ();
diff --git a/Event/EventBookkeeperAthenaPool/src/EventBookkeeperCollectionCnv.h b/Event/EventBookkeeperAthenaPool/src/EventBookkeeperCollectionCnv.h
index ccc94610514..64309a5164f 100644
--- a/Event/EventBookkeeperAthenaPool/src/EventBookkeeperCollectionCnv.h
+++ b/Event/EventBookkeeperAthenaPool/src/EventBookkeeperCollectionCnv.h
@@ -25,7 +25,9 @@ class EventBookkeeperCollectionCnv : public EventBookkeeperCollectionCnvBase
{
friend class CnvFactory<EventBookkeeperCollectionCnv >;
protected:
+public:
EventBookkeeperCollectionCnv (ISvcLocator* svcloc) : EventBookkeeperCollectionCnvBase(svcloc) {}
+protected:
virtual EventBookkeeperCollection_PERS* createPersistent (EventBookkeeperCollection* transCont);
virtual EventBookkeeperCollection* createTransient ();
diff --git a/Event/EventBookkeeperAthenaPool/src/SkimDecisionCnv.h b/Event/EventBookkeeperAthenaPool/src/SkimDecisionCnv.h
index e23331e8cbe..b2ac5e8aae7 100644
--- a/Event/EventBookkeeperAthenaPool/src/SkimDecisionCnv.h
+++ b/Event/EventBookkeeperAthenaPool/src/SkimDecisionCnv.h
@@ -24,7 +24,9 @@ class SkimDecisionCnv : public SkimDecisionCnvBase
{
friend class CnvFactory<SkimDecisionCnv >;
protected:
+public:
SkimDecisionCnv (ISvcLocator* svcloc) : SkimDecisionCnvBase(svcloc) {}
+protected:
virtual SkimDecision_PERS* createPersistent (SkimDecision* transCont);
virtual SkimDecision* createTransient ();
diff --git a/Event/EventBookkeeperAthenaPool/src/SkimDecisionCollectionCnv.h b/Event/EventBookkeeperAthenaPool/src/SkimDecisionCollectionCnv.h
index a5149124bf8..f983879de4c 100644
--- a/Event/EventBookkeeperAthenaPool/src/SkimDecisionCollectionCnv.h
+++ b/Event/EventBookkeeperAthenaPool/src/SkimDecisionCollectionCnv.h
@@ -24,7 +24,9 @@ class SkimDecisionCollectionCnv : public SkimDecisionCollectionCnvBase
{
friend class CnvFactory<SkimDecisionCollectionCnv >;
protected:
+public:
SkimDecisionCollectionCnv (ISvcLocator* svcloc) : SkimDecisionCollectionCnvBase(svcloc) {}
+protected:
virtual SkimDecisionCollection_PERS* createPersistent (SkimDecisionCollection* transCont);
virtual SkimDecisionCollection* createTransient ();
diff --git a/Event/EventCommonAthenaPool/src/INav4MomAssocsCnv.h b/Event/EventCommonAthenaPool/src/INav4MomAssocsCnv.h
old mode 100755
new mode 100644
index aae8d7d1e6e..ff18f35a937
--- a/Event/EventCommonAthenaPool/src/INav4MomAssocsCnv.h
+++ b/Event/EventCommonAthenaPool/src/INav4MomAssocsCnv.h
@@ -49,7 +49,9 @@ class INav4MomAssocsCnv: public T_AthenaPoolCustomCnv<
/** Create the converter from the service locator
*/
+public:
INav4MomAssocsCnv(ISvcLocator* svcloc);
+protected:
/** Build the persistent representation from the transient one.
*/
diff --git a/Event/EventCommonAthenaPool/src/INav4MomLinkContainerCnv.h b/Event/EventCommonAthenaPool/src/INav4MomLinkContainerCnv.h
index 4b33978f318..82446675bdf 100644
--- a/Event/EventCommonAthenaPool/src/INav4MomLinkContainerCnv.h
+++ b/Event/EventCommonAthenaPool/src/INav4MomLinkContainerCnv.h
@@ -43,7 +43,9 @@ class INav4MomLinkContainerCnv : public T_AthenaPoolCustomCnv< INav4MomLinkConta
protected:
/** The constructor */
+public:
INav4MomLinkContainerCnv( ISvcLocator* svcloc );
+protected:
/** Member method to create the persistent version */
virtual INav4MomLinkContainer_PERS* createPersistent ( INav4MomLinkContainer* transCont );
diff --git a/Event/EventCommonAthenaPool/src/IParticleLinkContainerCnv.h b/Event/EventCommonAthenaPool/src/IParticleLinkContainerCnv.h
index 657ca1e0f02..1aa689bac64 100644
--- a/Event/EventCommonAthenaPool/src/IParticleLinkContainerCnv.h
+++ b/Event/EventCommonAthenaPool/src/IParticleLinkContainerCnv.h
@@ -43,7 +43,9 @@ class IParticleLinkContainerCnv : public T_AthenaPoolCustomCnv< IParticleLinkCon
protected:
/** The constructor */
+public:
IParticleLinkContainerCnv( ISvcLocator* svcloc );
+protected:
/** Member method to create the persistent version */
virtual IParticleLinkContainer_PERS* createPersistent ( IParticleLinkContainer* transCont );
diff --git a/Event/EventInfoMgt/src/TagInfoMgr.cxx b/Event/EventInfoMgt/src/TagInfoMgr.cxx
index b0c28d5aa14..3f24e54c47d 100755
--- a/Event/EventInfoMgt/src/TagInfoMgr.cxx
+++ b/Event/EventInfoMgt/src/TagInfoMgr.cxx
@@ -38,7 +38,6 @@
#include "CxxUtils/make_unique.h"
// Gaudi includes
-#include "GaudiKernel/SvcFactory.h"
#include "GaudiKernel/IIncidentSvc.h"
#include "GaudiKernel/IOpaqueAddress.h"
#include "GaudiKernel/GenericAddress.h"
diff --git a/Event/xAOD/xAODBTaggingAthenaPool/src/xAODBTagVertexAuxContainerCnv.h b/Event/xAOD/xAODBTaggingAthenaPool/src/xAODBTagVertexAuxContainerCnv.h
index 2af23de22bd..454f3f96577 100644
--- a/Event/xAOD/xAODBTaggingAthenaPool/src/xAODBTagVertexAuxContainerCnv.h
+++ b/Event/xAOD/xAODBTaggingAthenaPool/src/xAODBTagVertexAuxContainerCnv.h
@@ -36,13 +36,11 @@ typedef T_AthenaPoolCustomCnv< xAOD::BTagVertexAuxContainer,
class xAODBTagVertexAuxContainerCnv :
public xAODBTagVertexAuxContainerCnvBase {
- // Declare the factory as our friend:
- friend class CnvFactory< xAODBTagVertexAuxContainerCnv >;
-
-protected:
- /// Converter constructor
+public:
+ /// Converter constructor
xAODBTagVertexAuxContainerCnv( ISvcLocator* svcLoc );
+protected:
/// Function preparing the container to be written out
virtual xAOD::BTagVertexAuxContainer*
createPersistent( xAOD::BTagVertexAuxContainer* trans );
diff --git a/Event/xAOD/xAODBTaggingAthenaPool/src/xAODBTaggingAuxContainerCnv.h b/Event/xAOD/xAODBTaggingAthenaPool/src/xAODBTaggingAuxContainerCnv.h
index 47f9e79bf62..8caf3be74e3 100644
--- a/Event/xAOD/xAODBTaggingAthenaPool/src/xAODBTaggingAuxContainerCnv.h
+++ b/Event/xAOD/xAODBTaggingAthenaPool/src/xAODBTaggingAuxContainerCnv.h
@@ -36,13 +36,11 @@ typedef T_AthenaPoolCustomCnv< xAOD::BTaggingAuxContainer,
class xAODBTaggingAuxContainerCnv :
public xAODBTaggingAuxContainerCnvBase {
- // Declare the factory as our friend:
- friend class CnvFactory< xAODBTaggingAuxContainerCnv >;
-
-protected:
- /// Converter constructor
+public:
+ /// Converter constructor
xAODBTaggingAuxContainerCnv( ISvcLocator* svcLoc );
+protected:
/// Function preparing the container to be written out
virtual xAOD::BTaggingAuxContainer*
createPersistent( xAOD::BTaggingAuxContainer* trans );
diff --git a/Event/xAOD/xAODBTaggingAthenaPool/src/xAODBTaggingTrigAuxContainerCnv.h b/Event/xAOD/xAODBTaggingAthenaPool/src/xAODBTaggingTrigAuxContainerCnv.h
index 5a3a19ec43f..bfbc1e2ab0d 100644
--- a/Event/xAOD/xAODBTaggingAthenaPool/src/xAODBTaggingTrigAuxContainerCnv.h
+++ b/Event/xAOD/xAODBTaggingAthenaPool/src/xAODBTaggingTrigAuxContainerCnv.h
@@ -41,7 +41,9 @@ class xAODBTaggingTrigAuxContainerCnv :
protected:
/// Converter constructor
+public:
xAODBTaggingTrigAuxContainerCnv( ISvcLocator* svcLoc );
+protected:
/// Function preparing the container to be written out
virtual xAOD::BTaggingTrigAuxContainer*
diff --git a/Event/xAOD/xAODCaloEventAthenaPool/src/xAODCaloClusterAuxContainerCnv.h b/Event/xAOD/xAODCaloEventAthenaPool/src/xAODCaloClusterAuxContainerCnv.h
index 9322595544e..3159591f5b8 100644
--- a/Event/xAOD/xAODCaloEventAthenaPool/src/xAODCaloClusterAuxContainerCnv.h
+++ b/Event/xAOD/xAODCaloEventAthenaPool/src/xAODCaloClusterAuxContainerCnv.h
@@ -42,7 +42,9 @@ class xAODCaloClusterAuxContainerCnv : public xAODCaloClusterAuxContainerCnvBase
protected:
/// Converter constructor
+public:
xAODCaloClusterAuxContainerCnv( ISvcLocator* svcLoc );
+protected:
/// Function preparing the container to be written out
virtual xAOD::CaloClusterAuxContainer*
diff --git a/Event/xAOD/xAODCaloEventAthenaPool/src/xAODCaloTowerAuxContainerCnv.h b/Event/xAOD/xAODCaloEventAthenaPool/src/xAODCaloTowerAuxContainerCnv.h
index 46c1fc7c104..7a905e1c606 100644
--- a/Event/xAOD/xAODCaloEventAthenaPool/src/xAODCaloTowerAuxContainerCnv.h
+++ b/Event/xAOD/xAODCaloEventAthenaPool/src/xAODCaloTowerAuxContainerCnv.h
@@ -37,7 +37,9 @@ class xAODCaloTowerAuxContainerCnv : public xAODCaloTowerAuxContainerCnvBase {
protected:
/// Converter constructor
+public:
xAODCaloTowerAuxContainerCnv( ISvcLocator* svcLoc );
+protected:
/// Function preparing the container to be written out
virtual xAOD::CaloTowerAuxContainer*
diff --git a/Event/xAOD/xAODCaloRingsAthenaPool/src/xAODCaloRingsAuxContainerCnv.h b/Event/xAOD/xAODCaloRingsAthenaPool/src/xAODCaloRingsAuxContainerCnv.h
index 4173b2107fe..544e3d7dbba 100644
--- a/Event/xAOD/xAODCaloRingsAthenaPool/src/xAODCaloRingsAuxContainerCnv.h
+++ b/Event/xAOD/xAODCaloRingsAthenaPool/src/xAODCaloRingsAuxContainerCnv.h
@@ -30,13 +30,11 @@ typedef T_AthenaPoolCustomCnv< xAOD::CaloRingsAuxContainer,
*/
class xAODCaloRingsAuxContainerCnv : public xAODCaloRingsAuxContainerCnvBase {
- /// Declare the factory as our friend
- friend class CnvFactory< xAODCaloRingsAuxContainerCnv >;
-
-protected:
- /// Converter constructor
+public:
+ /// Converter constructor
xAODCaloRingsAuxContainerCnv( ISvcLocator* svcLoc );
+protected:
/// Function preparing the container to be written out
virtual xAOD::CaloRingsAuxContainer*
createPersistent( xAOD::CaloRingsAuxContainer* trans );
diff --git a/Event/xAOD/xAODCaloRingsAthenaPool/src/xAODRingSetAuxContainerCnv.h b/Event/xAOD/xAODCaloRingsAthenaPool/src/xAODRingSetAuxContainerCnv.h
index b0692b1b2df..b851f37c920 100644
--- a/Event/xAOD/xAODCaloRingsAthenaPool/src/xAODRingSetAuxContainerCnv.h
+++ b/Event/xAOD/xAODCaloRingsAthenaPool/src/xAODRingSetAuxContainerCnv.h
@@ -35,7 +35,9 @@ class xAODRingSetAuxContainerCnv : public xAODRingSetAuxContainerCnvBase {
protected:
/// Converter constructor
+public:
xAODRingSetAuxContainerCnv( ISvcLocator* svcLoc );
+protected:
/// Function preparing the container to be written out
virtual xAOD::RingSetAuxContainer*
diff --git a/Event/xAOD/xAODCaloRingsAthenaPool/src/xAODRingSetConfAuxContainerCnv.h b/Event/xAOD/xAODCaloRingsAthenaPool/src/xAODRingSetConfAuxContainerCnv.h
index ef3bbfddf20..c07f3805f3f 100644
--- a/Event/xAOD/xAODCaloRingsAthenaPool/src/xAODRingSetConfAuxContainerCnv.h
+++ b/Event/xAOD/xAODCaloRingsAthenaPool/src/xAODRingSetConfAuxContainerCnv.h
@@ -35,7 +35,9 @@ class xAODRingSetConfAuxContainerCnv : public xAODRingSetConfAuxContainerCnvBase
protected:
/// Converter constructor
+public:
xAODRingSetConfAuxContainerCnv( ISvcLocator* svcLoc );
+protected:
/// Function preparing the container to be written out
virtual xAOD::RingSetConfAuxContainer*
diff --git a/Event/xAOD/xAODCoreAthenaPool/src/xAODAuxContainerBaseCnv.h b/Event/xAOD/xAODCoreAthenaPool/src/xAODAuxContainerBaseCnv.h
index 24f60b16835..48dccb0aa60 100644
--- a/Event/xAOD/xAODCoreAthenaPool/src/xAODAuxContainerBaseCnv.h
+++ b/Event/xAOD/xAODCoreAthenaPool/src/xAODAuxContainerBaseCnv.h
@@ -36,13 +36,11 @@ typedef T_AthenaPoolCustomCnv< xAOD::AuxContainerBase,
*/
class xAODAuxContainerBaseCnv : public xAODAuxContainerBaseCnvBase {
- /// Declare the factory as this class's friend
- friend class CnvFactory< xAODAuxContainerBaseCnv >;
-
-protected:
+public:
/// Converter constructor
xAODAuxContainerBaseCnv( ISvcLocator* svcLoc );
+protected:
/// Function preparing the container to be written out
virtual xAOD::AuxContainerBase*
createPersistent( xAOD::AuxContainerBase* trans );
diff --git a/Event/xAOD/xAODCoreAthenaPool/src/xAODShallowAuxContainerCnv.h b/Event/xAOD/xAODCoreAthenaPool/src/xAODShallowAuxContainerCnv.h
index 1edb89f6370..1575c2bc5df 100644
--- a/Event/xAOD/xAODCoreAthenaPool/src/xAODShallowAuxContainerCnv.h
+++ b/Event/xAOD/xAODCoreAthenaPool/src/xAODShallowAuxContainerCnv.h
@@ -29,13 +29,11 @@ typedef T_AthenaPoolCustomCnv< xAOD::ShallowAuxContainer,
class xAODShallowAuxContainerCnv :
public xAODShallowAuxContainerCnvBase {
- // Declare the factory as our friend:
- friend class CnvFactory< xAODShallowAuxContainerCnv >;
-
-protected:
+public:
/// Converter constructor
xAODShallowAuxContainerCnv( ISvcLocator* svcLoc );
+protected:
/// Function preparing the container to be written out
virtual xAOD::ShallowAuxContainer* createPersistent( xAOD::ShallowAuxContainer* trans );
/// Function reading in the object from the input file
diff --git a/Event/xAOD/xAODCutFlowAthenaPool/src/xAODCutBookkeeperAuxContainerCnv.h b/Event/xAOD/xAODCutFlowAthenaPool/src/xAODCutBookkeeperAuxContainerCnv.h
index 4779763d96f..8a30a260d63 100644
--- a/Event/xAOD/xAODCutFlowAthenaPool/src/xAODCutBookkeeperAuxContainerCnv.h
+++ b/Event/xAOD/xAODCutFlowAthenaPool/src/xAODCutBookkeeperAuxContainerCnv.h
@@ -17,14 +17,12 @@ typedef T_AthenaPoolCustomCnv<xAOD::CutBookkeeperAuxContainer,
class xAODCutBookkeeperAuxContainerCnv : public xAODCutBookkeeperAuxContainerCnvBase {
- /** Other example classes do this */
- friend class CnvFactory < xAODCutBookkeeperAuxContainerCnv >;
-
- protected:
+public:
/** The constructor */
xAODCutBookkeeperAuxContainerCnv( ISvcLocator* svcLoc );
+ protected:
/** Create persistent container */
xAOD::CutBookkeeperAuxContainer* createPersistent( xAOD::CutBookkeeperAuxContainer* trans );
diff --git a/Event/xAOD/xAODEgammaAthenaPool/src/xAODElectronAuxContainerCnv.h b/Event/xAOD/xAODEgammaAthenaPool/src/xAODElectronAuxContainerCnv.h
index 564bf3bf394..4dc23c14c86 100644
--- a/Event/xAOD/xAODEgammaAthenaPool/src/xAODElectronAuxContainerCnv.h
+++ b/Event/xAOD/xAODEgammaAthenaPool/src/xAODElectronAuxContainerCnv.h
@@ -38,7 +38,9 @@ class xAODElectronAuxContainerCnv : public xAODElectronAuxContainerCnvBase {
protected:
/// Converter constructor
+public:
xAODElectronAuxContainerCnv( ISvcLocator* svcLoc );
+protected:
/// Function preparing the container to be written out
virtual xAOD::ElectronAuxContainer*
diff --git a/Event/xAOD/xAODEgammaAthenaPool/src/xAODPhotonAuxContainerCnv.h b/Event/xAOD/xAODEgammaAthenaPool/src/xAODPhotonAuxContainerCnv.h
index 2b690fcaa77..6baf31373a7 100644
--- a/Event/xAOD/xAODEgammaAthenaPool/src/xAODPhotonAuxContainerCnv.h
+++ b/Event/xAOD/xAODEgammaAthenaPool/src/xAODPhotonAuxContainerCnv.h
@@ -38,7 +38,9 @@ class xAODPhotonAuxContainerCnv : public xAODPhotonAuxContainerCnvBase {
protected:
/// Converter constructor
+public:
xAODPhotonAuxContainerCnv( ISvcLocator* svcLoc );
+protected:
/// Function preparing the container to be written out
virtual xAOD::PhotonAuxContainer*
diff --git a/Event/xAOD/xAODForwardAthenaPool/src/xAODAFPSiHitAuxContainerCnv.h b/Event/xAOD/xAODForwardAthenaPool/src/xAODAFPSiHitAuxContainerCnv.h
index 6a3ecda6450..96820b9bf08 100644
--- a/Event/xAOD/xAODForwardAthenaPool/src/xAODAFPSiHitAuxContainerCnv.h
+++ b/Event/xAOD/xAODForwardAthenaPool/src/xAODAFPSiHitAuxContainerCnv.h
@@ -14,13 +14,11 @@ typedef T_AthenaPoolCustomCnv<xAOD::AFPSiHitAuxContainer, xAOD::AFPSiHitAuxConta
class xAODAFPSiHitAuxContainerCnv :
public xAODAFPSiHitAuxContainerCnvBase {
- // Declare the factory as our friend:
- friend class CnvFactory< xAODAFPSiHitAuxContainerCnv >;
-
-protected:
+public:
/// Converter constructor
xAODAFPSiHitAuxContainerCnv( ISvcLocator* svcLoc );
+protected:
/// Function preparing the container to be written out
virtual xAOD::AFPSiHitAuxContainer*
createPersistent( xAOD::AFPSiHitAuxContainer* trans );
diff --git a/Event/xAOD/xAODForwardAthenaPool/src/xAODAFPSiHitsClusterAuxContainerCnv.h b/Event/xAOD/xAODForwardAthenaPool/src/xAODAFPSiHitsClusterAuxContainerCnv.h
index 64cc1d5cbd9..d27ecd974ac 100644
--- a/Event/xAOD/xAODForwardAthenaPool/src/xAODAFPSiHitsClusterAuxContainerCnv.h
+++ b/Event/xAOD/xAODForwardAthenaPool/src/xAODAFPSiHitsClusterAuxContainerCnv.h
@@ -24,13 +24,11 @@ typedef T_AthenaPoolCustomCnv<xAOD::AFPSiHitsClusterAuxContainer, xAOD::AFPSiHit
class xAODAFPSiHitsClusterAuxContainerCnv :
public xAODAFPSiHitsClusterAuxContainerCnvBase {
- // Declare the factory as our friend:
- friend class CnvFactory< xAODAFPSiHitsClusterAuxContainerCnv >;
-
-protected:
+public:
/// Converter constructor
xAODAFPSiHitsClusterAuxContainerCnv( ISvcLocator* svcLoc );
+protected:
/// Function preparing the container to be written out
virtual xAOD::AFPSiHitsClusterAuxContainer*
createPersistent( xAOD::AFPSiHitsClusterAuxContainer* trans );
diff --git a/Event/xAOD/xAODForwardAthenaPool/src/xAODAFPTrackAuxContainerCnv.h b/Event/xAOD/xAODForwardAthenaPool/src/xAODAFPTrackAuxContainerCnv.h
index a3e7ff59c9a..029d09114d8 100644
--- a/Event/xAOD/xAODForwardAthenaPool/src/xAODAFPTrackAuxContainerCnv.h
+++ b/Event/xAOD/xAODForwardAthenaPool/src/xAODAFPTrackAuxContainerCnv.h
@@ -14,13 +14,11 @@ typedef T_AthenaPoolCustomCnv<xAOD::AFPTrackAuxContainer, xAOD::AFPTrackAuxConta
class xAODAFPTrackAuxContainerCnv :
public xAODAFPTrackAuxContainerCnvBase {
- // Declare the factory as our friend:
- friend class CnvFactory< xAODAFPTrackAuxContainerCnv >;
-
-protected:
+public:
/// Converter constructor
xAODAFPTrackAuxContainerCnv( ISvcLocator* svcLoc );
+protected:
/// Function preparing the container to be written out
virtual xAOD::AFPTrackAuxContainer*
createPersistent( xAOD::AFPTrackAuxContainer* trans );
diff --git a/Event/xAOD/xAODJetAthenaPool/src/xAODJetAuxContainerCnv.h b/Event/xAOD/xAODJetAthenaPool/src/xAODJetAuxContainerCnv.h
index a162817462e..35b1aea0e1e 100644
--- a/Event/xAOD/xAODJetAthenaPool/src/xAODJetAuxContainerCnv.h
+++ b/Event/xAOD/xAODJetAthenaPool/src/xAODJetAuxContainerCnv.h
@@ -41,7 +41,9 @@ class xAODJetAuxContainerCnv :
protected:
/// Converter constructor
+public:
xAODJetAuxContainerCnv( ISvcLocator* svcLoc );
+protected:
/// Function preparing the container to be written out
virtual xAOD::JetAuxContainer*
diff --git a/Event/xAOD/xAODJetAthenaPool/src/xAODJetTrigAuxContainerCnv.h b/Event/xAOD/xAODJetAthenaPool/src/xAODJetTrigAuxContainerCnv.h
index a763dbb0718..93dd2a240a2 100644
--- a/Event/xAOD/xAODJetAthenaPool/src/xAODJetTrigAuxContainerCnv.h
+++ b/Event/xAOD/xAODJetAthenaPool/src/xAODJetTrigAuxContainerCnv.h
@@ -42,7 +42,9 @@ class xAODJetTrigAuxContainerCnv :
protected:
/// Converter constructor
+public:
xAODJetTrigAuxContainerCnv( ISvcLocator* svcLoc );
+protected:
/// Function preparing the container to be written out
virtual xAOD::JetTrigAuxContainer*
diff --git a/Event/xAOD/xAODMissingETAthenaPool/src/xAODMissingETAuxAssociationMapCnv.h b/Event/xAOD/xAODMissingETAthenaPool/src/xAODMissingETAuxAssociationMapCnv.h
index 23c3ca6e2b8..1b9bd89d2c3 100644
--- a/Event/xAOD/xAODMissingETAthenaPool/src/xAODMissingETAuxAssociationMapCnv.h
+++ b/Event/xAOD/xAODMissingETAthenaPool/src/xAODMissingETAuxAssociationMapCnv.h
@@ -42,7 +42,9 @@ class xAODMissingETAuxAssociationMapCnv :
protected:
/// Converter constructor
+public:
xAODMissingETAuxAssociationMapCnv( ISvcLocator* svcLoc );
+protected:
/// Function preparing the container to be written out
virtual xAOD::MissingETAuxAssociationMap*
diff --git a/Event/xAOD/xAODMissingETAthenaPool/src/xAODMissingETAuxComponentMapCnv.h b/Event/xAOD/xAODMissingETAthenaPool/src/xAODMissingETAuxComponentMapCnv.h
index d7c096e9084..e1bee6bd0ea 100644
--- a/Event/xAOD/xAODMissingETAthenaPool/src/xAODMissingETAuxComponentMapCnv.h
+++ b/Event/xAOD/xAODMissingETAthenaPool/src/xAODMissingETAuxComponentMapCnv.h
@@ -42,7 +42,9 @@ class xAODMissingETAuxComponentMapCnv :
protected:
/// Converter constructor
+public:
xAODMissingETAuxComponentMapCnv( ISvcLocator* svcLoc );
+protected:
/// Function preparing the container to be written out
virtual xAOD::MissingETAuxComponentMap*
diff --git a/Event/xAOD/xAODMissingETAthenaPool/src/xAODMissingETAuxContainerCnv.h b/Event/xAOD/xAODMissingETAthenaPool/src/xAODMissingETAuxContainerCnv.h
index 4c4bcace5ed..ca7886b9127 100644
--- a/Event/xAOD/xAODMissingETAthenaPool/src/xAODMissingETAuxContainerCnv.h
+++ b/Event/xAOD/xAODMissingETAthenaPool/src/xAODMissingETAuxContainerCnv.h
@@ -42,7 +42,9 @@ class xAODMissingETAuxContainerCnv :
protected:
/// Converter constructor
+public:
xAODMissingETAuxContainerCnv( ISvcLocator* svcLoc );
+protected:
/// Function preparing the container to be written out
virtual xAOD::MissingETAuxContainer*
diff --git a/Event/xAOD/xAODMuonAthenaPool/src/xAODMuonAuxContainerCnv.h b/Event/xAOD/xAODMuonAthenaPool/src/xAODMuonAuxContainerCnv.h
index 22a5b3e107e..66bc7220d58 100644
--- a/Event/xAOD/xAODMuonAthenaPool/src/xAODMuonAuxContainerCnv.h
+++ b/Event/xAOD/xAODMuonAthenaPool/src/xAODMuonAuxContainerCnv.h
@@ -39,7 +39,9 @@ class xAODMuonAuxContainerCnv :
protected:
/// Converter constructor
+public:
xAODMuonAuxContainerCnv( ISvcLocator* svcLoc );
+protected:
/// Function preparing the container to be written out
virtual xAOD::MuonAuxContainer*
diff --git a/Event/xAOD/xAODMuonAthenaPool/src/xAODMuonSegmentAuxContainerCnv.h b/Event/xAOD/xAODMuonAthenaPool/src/xAODMuonSegmentAuxContainerCnv.h
index 669dbcc41f7..17558f75ce1 100644
--- a/Event/xAOD/xAODMuonAthenaPool/src/xAODMuonSegmentAuxContainerCnv.h
+++ b/Event/xAOD/xAODMuonAthenaPool/src/xAODMuonSegmentAuxContainerCnv.h
@@ -35,7 +35,9 @@ class xAODMuonSegmentAuxContainerCnv :
protected:
/// Converter constructor
+public:
xAODMuonSegmentAuxContainerCnv( ISvcLocator* svcLoc );
+protected:
/// Function preparing the container to be written out
virtual xAOD::MuonSegmentAuxContainer*
diff --git a/Event/xAOD/xAODMuonAthenaPool/src/xAODSlowMuonAuxContainerCnv.h b/Event/xAOD/xAODMuonAthenaPool/src/xAODSlowMuonAuxContainerCnv.h
index 19fea431560..bed24c95153 100644
--- a/Event/xAOD/xAODMuonAthenaPool/src/xAODSlowMuonAuxContainerCnv.h
+++ b/Event/xAOD/xAODMuonAthenaPool/src/xAODSlowMuonAuxContainerCnv.h
@@ -41,7 +41,9 @@ class xAODSlowMuonAuxContainerCnv :
protected:
/// Converter constructor
+public:
xAODSlowMuonAuxContainerCnv( ISvcLocator* svcLoc );
+protected:
/// Function preparing the container to be written out
virtual xAOD::SlowMuonAuxContainer*
diff --git a/Event/xAOD/xAODPFlowAthenaPool/src/xAODPFOAuxContainerCnv.h b/Event/xAOD/xAODPFlowAthenaPool/src/xAODPFOAuxContainerCnv.h
index 95991685f44..7317ed737b1 100644
--- a/Event/xAOD/xAODPFlowAthenaPool/src/xAODPFOAuxContainerCnv.h
+++ b/Event/xAOD/xAODPFlowAthenaPool/src/xAODPFOAuxContainerCnv.h
@@ -21,7 +21,9 @@ class xAODPFOAuxContainerCnv : public xAODPFOAuxContainerCnvBase {
protected:
/** The constructor */
+public:
xAODPFOAuxContainerCnv( ISvcLocator* svcLoc );
+protected:
/** Create persistent container */
xAOD::PFOAuxContainer* createPersistent( xAOD::PFOAuxContainer* trans );
diff --git a/Event/xAOD/xAODPFlowAthenaPool/src/xAODTrackCaloClusterAuxContainerCnv.h b/Event/xAOD/xAODPFlowAthenaPool/src/xAODTrackCaloClusterAuxContainerCnv.h
index f4cfb61488d..5f3f0969c8c 100644
--- a/Event/xAOD/xAODPFlowAthenaPool/src/xAODTrackCaloClusterAuxContainerCnv.h
+++ b/Event/xAOD/xAODPFlowAthenaPool/src/xAODTrackCaloClusterAuxContainerCnv.h
@@ -37,7 +37,9 @@ class xAODTrackCaloClusterAuxContainerCnv :
protected:
/// Converter constructor
+public:
xAODTrackCaloClusterAuxContainerCnv( ISvcLocator* svcLoc );
+protected:
/// Function preparing the container to be written out
virtual xAOD::TrackCaloClusterAuxContainer*
diff --git a/Event/xAOD/xAODParticleEventAthenaPool/src/xAODCompositeParticleAuxContainerCnv.h b/Event/xAOD/xAODParticleEventAthenaPool/src/xAODCompositeParticleAuxContainerCnv.h
index ea87f78675e..0e036b55724 100644
--- a/Event/xAOD/xAODParticleEventAthenaPool/src/xAODCompositeParticleAuxContainerCnv.h
+++ b/Event/xAOD/xAODParticleEventAthenaPool/src/xAODCompositeParticleAuxContainerCnv.h
@@ -23,7 +23,9 @@ class xAODCompositeParticleAuxContainerCnv : public xAODCompositeParticleAuxCont
protected:
/** The constructor */
+public:
xAODCompositeParticleAuxContainerCnv( ISvcLocator* svcLoc );
+protected:
/** Create persistent container */
xAOD::CompositeParticleAuxContainer* createPersistent( xAOD::CompositeParticleAuxContainer* trans );
diff --git a/Event/xAOD/xAODParticleEventAthenaPool/src/xAODParticleAuxContainerCnv.h b/Event/xAOD/xAODParticleEventAthenaPool/src/xAODParticleAuxContainerCnv.h
index dd08f5b59cd..102a28164fd 100644
--- a/Event/xAOD/xAODParticleEventAthenaPool/src/xAODParticleAuxContainerCnv.h
+++ b/Event/xAOD/xAODParticleEventAthenaPool/src/xAODParticleAuxContainerCnv.h
@@ -23,7 +23,9 @@ class xAODParticleAuxContainerCnv : public xAODParticleAuxContainerCnvBase {
protected:
/** The constructor */
+public:
xAODParticleAuxContainerCnv( ISvcLocator* svcLoc );
+protected:
/** Create persistent container */
xAOD::ParticleAuxContainer* createPersistent( xAOD::ParticleAuxContainer* trans );
diff --git a/Event/xAOD/xAODTauAthenaPool/src/xAODDiTauJetAuxContainerCnv.h b/Event/xAOD/xAODTauAthenaPool/src/xAODDiTauJetAuxContainerCnv.h
index 114b0ed6b59..4addde6098d 100644
--- a/Event/xAOD/xAODTauAthenaPool/src/xAODDiTauJetAuxContainerCnv.h
+++ b/Event/xAOD/xAODTauAthenaPool/src/xAODDiTauJetAuxContainerCnv.h
@@ -27,7 +27,9 @@ class xAODDiTauJetAuxContainerCnv :
protected:
/// Converter constructor
+public:
xAODDiTauJetAuxContainerCnv( ISvcLocator* svcLoc );
+protected:
/// Function preparing the container to be written out
virtual xAOD::DiTauJetAuxContainer*
diff --git a/Event/xAOD/xAODTauAthenaPool/src/xAODTauJetAuxContainerCnv.h b/Event/xAOD/xAODTauAthenaPool/src/xAODTauJetAuxContainerCnv.h
index 82128790dc7..1f34be01850 100644
--- a/Event/xAOD/xAODTauAthenaPool/src/xAODTauJetAuxContainerCnv.h
+++ b/Event/xAOD/xAODTauAthenaPool/src/xAODTauJetAuxContainerCnv.h
@@ -45,7 +45,9 @@ class xAODTauJetAuxContainerCnv :
protected:
/// Converter constructor
+public:
xAODTauJetAuxContainerCnv( ISvcLocator* svcLoc );
+protected:
/// Function preparing the container to be written out
virtual xAOD::TauJetAuxContainer*
diff --git a/Event/xAOD/xAODTauAthenaPool/src/xAODTauTrackAuxContainerCnv.h b/Event/xAOD/xAODTauAthenaPool/src/xAODTauTrackAuxContainerCnv.h
index a0853b7b3ad..6ed8dd17e3d 100644
--- a/Event/xAOD/xAODTauAthenaPool/src/xAODTauTrackAuxContainerCnv.h
+++ b/Event/xAOD/xAODTauAthenaPool/src/xAODTauTrackAuxContainerCnv.h
@@ -26,7 +26,9 @@ class xAODTauTrackAuxContainerCnv :
protected:
/// Converter constructor
+public:
xAODTauTrackAuxContainerCnv( ISvcLocator* svcLoc );
+protected:
/// Function preparing the container to be written out
virtual xAOD::TauTrackAuxContainer*
diff --git a/Event/xAOD/xAODTrackingAthenaPool/src/xAODNeutralParticleAuxContainerCnv.h b/Event/xAOD/xAODTrackingAthenaPool/src/xAODNeutralParticleAuxContainerCnv.h
index 9a565c2f67e..dd619ab42d5 100644
--- a/Event/xAOD/xAODTrackingAthenaPool/src/xAODNeutralParticleAuxContainerCnv.h
+++ b/Event/xAOD/xAODTrackingAthenaPool/src/xAODNeutralParticleAuxContainerCnv.h
@@ -30,13 +30,11 @@ typedef T_AthenaPoolCustomCnv< xAOD::NeutralParticleAuxContainer,
class xAODNeutralParticleAuxContainerCnv :
public xAODNeutralParticleAuxContainerCnvBase {
- // Declare the factory as our friend:
- friend class CnvFactory< xAODNeutralParticleAuxContainerCnv >;
-
-protected:
+public:
/// Converter constructor
xAODNeutralParticleAuxContainerCnv( ISvcLocator* svcLoc );
+protected:
/// Function preparing the container to be written out
virtual xAOD::NeutralParticleAuxContainer*
createPersistent( xAOD::NeutralParticleAuxContainer* trans );
diff --git a/Event/xAOD/xAODTrackingAthenaPool/src/xAODTrackMeasurementValidationAuxContainerCnv.h b/Event/xAOD/xAODTrackingAthenaPool/src/xAODTrackMeasurementValidationAuxContainerCnv.h
index edb95470cba..a0f02e1629d 100644
--- a/Event/xAOD/xAODTrackingAthenaPool/src/xAODTrackMeasurementValidationAuxContainerCnv.h
+++ b/Event/xAOD/xAODTrackingAthenaPool/src/xAODTrackMeasurementValidationAuxContainerCnv.h
@@ -30,13 +30,11 @@ typedef T_AthenaPoolCustomCnv< xAOD::TrackMeasurementValidationAuxContainer,
class xAODTrackMeasurementValidationAuxContainerCnv :
public xAODTrackMeasurementValidationAuxContainerCnvBase {
- // Declare the factory as our friend:
- friend class CnvFactory< xAODTrackMeasurementValidationAuxContainerCnv >;
-
-protected:
+public:
/// Converter constructor
xAODTrackMeasurementValidationAuxContainerCnv( ISvcLocator* svcLoc );
+protected:
/// Function preparing the container to be written out
virtual xAOD::TrackMeasurementValidationAuxContainer*
createPersistent( xAOD::TrackMeasurementValidationAuxContainer* trans );
diff --git a/Event/xAOD/xAODTrackingAthenaPool/src/xAODTrackParticleAuxContainerCnv.h b/Event/xAOD/xAODTrackingAthenaPool/src/xAODTrackParticleAuxContainerCnv.h
index c0e03bfb956..c9cf0157bfe 100644
--- a/Event/xAOD/xAODTrackingAthenaPool/src/xAODTrackParticleAuxContainerCnv.h
+++ b/Event/xAOD/xAODTrackingAthenaPool/src/xAODTrackParticleAuxContainerCnv.h
@@ -35,6 +35,12 @@ typedef T_AthenaPoolCustomCnv< xAOD::TrackParticleAuxContainer,
class xAODTrackParticleAuxContainerCnv :
public xAODTrackParticleAuxContainerCnvBase {
+public:
+ /// Converter constructor
+ xAODTrackParticleAuxContainerCnv( ISvcLocator* svcLoc );
+
+private:
+
// Declare the factory as our friend:
friend class CnvFactory< xAODTrackParticleAuxContainerCnv >;
@@ -42,9 +48,6 @@ class xAODTrackParticleAuxContainerCnv :
StatusCode initialize() override;
protected:
- /// Converter constructor
- xAODTrackParticleAuxContainerCnv( ISvcLocator* svcLoc );
-
/// Function preparing the container to be written out
virtual xAOD::TrackParticleAuxContainer*
createPersistent( xAOD::TrackParticleAuxContainer* trans ) override;
diff --git a/Event/xAOD/xAODTrackingAthenaPool/src/xAODTrackStateValidationAuxContainerCnv.h b/Event/xAOD/xAODTrackingAthenaPool/src/xAODTrackStateValidationAuxContainerCnv.h
index afe1a8ce6ab..72f3cf6c744 100644
--- a/Event/xAOD/xAODTrackingAthenaPool/src/xAODTrackStateValidationAuxContainerCnv.h
+++ b/Event/xAOD/xAODTrackingAthenaPool/src/xAODTrackStateValidationAuxContainerCnv.h
@@ -29,13 +29,11 @@ typedef T_AthenaPoolCustomCnv< xAOD::TrackStateValidationAuxContainer,
class xAODTrackStateValidationAuxContainerCnv :
public xAODTrackStateValidationAuxContainerCnvBase {
- // Declare the factory as our friend:
- friend class CnvFactory< xAODTrackStateValidationAuxContainerCnv >;
-
-protected:
+public:
/// Converter constructor
xAODTrackStateValidationAuxContainerCnv( ISvcLocator* svcLoc );
+protected:
/// Function preparing the container to be written out
virtual xAOD::TrackStateValidationAuxContainer*
createPersistent( xAOD::TrackStateValidationAuxContainer* trans );
diff --git a/Event/xAOD/xAODTrackingAthenaPool/src/xAODVertexAuxContainerCnv.h b/Event/xAOD/xAODTrackingAthenaPool/src/xAODVertexAuxContainerCnv.h
index cf944958c0c..366ce06e9e1 100644
--- a/Event/xAOD/xAODTrackingAthenaPool/src/xAODVertexAuxContainerCnv.h
+++ b/Event/xAOD/xAODTrackingAthenaPool/src/xAODVertexAuxContainerCnv.h
@@ -37,13 +37,11 @@ typedef T_AthenaPoolCustomCnv< xAOD::VertexAuxContainer,
class xAODVertexAuxContainerCnv :
public xAODVertexAuxContainerCnvBase {
- // Declare the factory as our friend:
- friend class CnvFactory< xAODVertexAuxContainerCnv >;
-
-protected:
+public:
/// Converter constructor
xAODVertexAuxContainerCnv( ISvcLocator* svcLoc );
+protected:
/// Function preparing the container to be written out
virtual xAOD::VertexAuxContainer*
createPersistent( xAOD::VertexAuxContainer* trans );
diff --git a/Event/xAOD/xAODTrigBphysAthenaPool/src/xAODTrigBphysAuxContainerCnv.h b/Event/xAOD/xAODTrigBphysAthenaPool/src/xAODTrigBphysAuxContainerCnv.h
index ead0553ac11..c4702e54d67 100644
--- a/Event/xAOD/xAODTrigBphysAthenaPool/src/xAODTrigBphysAuxContainerCnv.h
+++ b/Event/xAOD/xAODTrigBphysAthenaPool/src/xAODTrigBphysAuxContainerCnv.h
@@ -30,13 +30,11 @@ typedef T_AthenaPoolCustomCnv< xAOD::TrigBphysAuxContainer,
class xAODTrigBphysAuxContainerCnv :
public xAODTrigBphysAuxContainerCnvBase {
- // Declare the factory as our friend:
- friend class CnvFactory< xAODTrigBphysAuxContainerCnv >;
-
-protected:
+public:
/// Converter constructor
xAODTrigBphysAuxContainerCnv( ISvcLocator* svcLoc );
+protected:
/// Function preparing the container to be written out
virtual xAOD::TrigBphysAuxContainer*
createPersistent( xAOD::TrigBphysAuxContainer* trans );
diff --git a/Event/xAOD/xAODTrigCaloAthenaPool/src/xAODCaloClusterTrigAuxContainerCnv.h b/Event/xAOD/xAODTrigCaloAthenaPool/src/xAODCaloClusterTrigAuxContainerCnv.h
index ad0b89481b0..f3970f4fb15 100644
--- a/Event/xAOD/xAODTrigCaloAthenaPool/src/xAODCaloClusterTrigAuxContainerCnv.h
+++ b/Event/xAOD/xAODTrigCaloAthenaPool/src/xAODCaloClusterTrigAuxContainerCnv.h
@@ -36,7 +36,9 @@ class xAODCaloClusterTrigAuxContainerCnv :
protected:
/// Converter constructor
+public:
xAODCaloClusterTrigAuxContainerCnv( ISvcLocator* svcLoc );
+protected:
/// Function preparing the container to be written out
virtual xAOD::CaloClusterTrigAuxContainer*
diff --git a/Event/xAOD/xAODTrigCaloAthenaPool/src/xAODTrigCaloClusterAuxContainerCnv.h b/Event/xAOD/xAODTrigCaloAthenaPool/src/xAODTrigCaloClusterAuxContainerCnv.h
index b882d9aefff..ed69acdb857 100644
--- a/Event/xAOD/xAODTrigCaloAthenaPool/src/xAODTrigCaloClusterAuxContainerCnv.h
+++ b/Event/xAOD/xAODTrigCaloAthenaPool/src/xAODTrigCaloClusterAuxContainerCnv.h
@@ -36,7 +36,9 @@ class xAODTrigCaloClusterAuxContainerCnv :
protected:
/// Converter constructor
+public:
xAODTrigCaloClusterAuxContainerCnv( ISvcLocator* svcLoc );
+protected:
/// Function preparing the container to be written out
virtual xAOD::TrigCaloClusterAuxContainer*
diff --git a/Event/xAOD/xAODTrigCaloAthenaPool/src/xAODTrigEMClusterAuxContainerCnv.h b/Event/xAOD/xAODTrigCaloAthenaPool/src/xAODTrigEMClusterAuxContainerCnv.h
index 4fb925ebcb2..33644e45935 100644
--- a/Event/xAOD/xAODTrigCaloAthenaPool/src/xAODTrigEMClusterAuxContainerCnv.h
+++ b/Event/xAOD/xAODTrigCaloAthenaPool/src/xAODTrigEMClusterAuxContainerCnv.h
@@ -36,7 +36,9 @@ class xAODTrigEMClusterAuxContainerCnv :
protected:
/// Converter constructor
+public:
xAODTrigEMClusterAuxContainerCnv( ISvcLocator* svcLoc );
+protected:
/// Function preparing the container to be written out
virtual xAOD::TrigEMClusterAuxContainer*
diff --git a/Event/xAOD/xAODTrigEgammaAthenaPool/src/xAODElectronTrigAuxContainerCnv.h b/Event/xAOD/xAODTrigEgammaAthenaPool/src/xAODElectronTrigAuxContainerCnv.h
index 9789e486ee3..24b6f1ee6b2 100644
--- a/Event/xAOD/xAODTrigEgammaAthenaPool/src/xAODElectronTrigAuxContainerCnv.h
+++ b/Event/xAOD/xAODTrigEgammaAthenaPool/src/xAODElectronTrigAuxContainerCnv.h
@@ -35,7 +35,9 @@ class xAODElectronTrigAuxContainerCnv :
protected:
/// Converter constructor
+public:
xAODElectronTrigAuxContainerCnv( ISvcLocator* svcLoc );
+protected:
/// Function preparing the container to be written out
virtual xAOD::ElectronTrigAuxContainer*
diff --git a/Event/xAOD/xAODTrigEgammaAthenaPool/src/xAODPhotonTrigAuxContainerCnv.h b/Event/xAOD/xAODTrigEgammaAthenaPool/src/xAODPhotonTrigAuxContainerCnv.h
index 2b51b420e03..11c51ef2535 100644
--- a/Event/xAOD/xAODTrigEgammaAthenaPool/src/xAODPhotonTrigAuxContainerCnv.h
+++ b/Event/xAOD/xAODTrigEgammaAthenaPool/src/xAODPhotonTrigAuxContainerCnv.h
@@ -35,7 +35,9 @@ class xAODPhotonTrigAuxContainerCnv :
protected:
/// Converter constructor
+public:
xAODPhotonTrigAuxContainerCnv( ISvcLocator* svcLoc );
+protected:
/// Function preparing the container to be written out
virtual xAOD::PhotonTrigAuxContainer*
diff --git a/Event/xAOD/xAODTrigEgammaAthenaPool/src/xAODTrigElectronAuxContainerCnv.h b/Event/xAOD/xAODTrigEgammaAthenaPool/src/xAODTrigElectronAuxContainerCnv.h
index 0321dec17d0..93c1c3d3094 100644
--- a/Event/xAOD/xAODTrigEgammaAthenaPool/src/xAODTrigElectronAuxContainerCnv.h
+++ b/Event/xAOD/xAODTrigEgammaAthenaPool/src/xAODTrigElectronAuxContainerCnv.h
@@ -35,7 +35,9 @@ class xAODTrigElectronAuxContainerCnv :
protected:
/// Converter constructor
+public:
xAODTrigElectronAuxContainerCnv( ISvcLocator* svcLoc );
+protected:
/// Function preparing the container to be written out
virtual xAOD::TrigElectronAuxContainer*
diff --git a/Event/xAOD/xAODTrigEgammaAthenaPool/src/xAODTrigPhotonAuxContainerCnv.h b/Event/xAOD/xAODTrigEgammaAthenaPool/src/xAODTrigPhotonAuxContainerCnv.h
index 54052cf5592..c7a91d11e26 100644
--- a/Event/xAOD/xAODTrigEgammaAthenaPool/src/xAODTrigPhotonAuxContainerCnv.h
+++ b/Event/xAOD/xAODTrigEgammaAthenaPool/src/xAODTrigPhotonAuxContainerCnv.h
@@ -35,7 +35,9 @@ class xAODTrigPhotonAuxContainerCnv :
protected:
/// Converter constructor
+public:
xAODTrigPhotonAuxContainerCnv( ISvcLocator* svcLoc );
+protected:
/// Function preparing the container to be written out
virtual xAOD::TrigPhotonAuxContainer*
diff --git a/Event/xAOD/xAODTrigMinBiasAthenaPool/src/xAODTrigSpacePointCountsAuxContainerCnv.h b/Event/xAOD/xAODTrigMinBiasAthenaPool/src/xAODTrigSpacePointCountsAuxContainerCnv.h
index 73d0539316f..13d8a6a1a64 100644
--- a/Event/xAOD/xAODTrigMinBiasAthenaPool/src/xAODTrigSpacePointCountsAuxContainerCnv.h
+++ b/Event/xAOD/xAODTrigMinBiasAthenaPool/src/xAODTrigSpacePointCountsAuxContainerCnv.h
@@ -30,13 +30,11 @@ typedef T_AthenaPoolCustomCnv< xAOD::TrigSpacePointCountsAuxContainer,
class xAODTrigSpacePointCountsAuxContainerCnv :
public xAODTrigSpacePointCountsAuxContainerCnvBase {
- // Declare the factory as our friend:
- friend class CnvFactory< xAODTrigSpacePointCountsAuxContainerCnv >;
-
-protected:
+public:
/// Converter constructor
xAODTrigSpacePointCountsAuxContainerCnv( ISvcLocator* svcLoc );
+protected:
/// Function preparing the container to be written out
virtual xAOD::TrigSpacePointCountsAuxContainer*
createPersistent( xAOD::TrigSpacePointCountsAuxContainer* trans );
diff --git a/Event/xAOD/xAODTrigMinBiasAthenaPool/src/xAODTrigT2MbtsBitsAuxContainerCnv.h b/Event/xAOD/xAODTrigMinBiasAthenaPool/src/xAODTrigT2MbtsBitsAuxContainerCnv.h
index d0ae31d21b0..99b75e9f1b8 100644
--- a/Event/xAOD/xAODTrigMinBiasAthenaPool/src/xAODTrigT2MbtsBitsAuxContainerCnv.h
+++ b/Event/xAOD/xAODTrigMinBiasAthenaPool/src/xAODTrigT2MbtsBitsAuxContainerCnv.h
@@ -30,13 +30,11 @@ typedef T_AthenaPoolCustomCnv< xAOD::TrigT2MbtsBitsAuxContainer,
class xAODTrigT2MbtsBitsAuxContainerCnv :
public xAODTrigT2MbtsBitsAuxContainerCnvBase {
- // Declare the factory as our friend:
- friend class CnvFactory< xAODTrigT2MbtsBitsAuxContainerCnv >;
-
-protected:
+public:
/// Converter constructor
xAODTrigT2MbtsBitsAuxContainerCnv( ISvcLocator* svcLoc );
+protected:
/// Function preparing the container to be written out
virtual xAOD::TrigT2MbtsBitsAuxContainer*
createPersistent( xAOD::TrigT2MbtsBitsAuxContainer* trans );
diff --git a/Event/xAOD/xAODTrigMinBiasAthenaPool/src/xAODTrigT2ZdcSignalsAuxContainerCnv.h b/Event/xAOD/xAODTrigMinBiasAthenaPool/src/xAODTrigT2ZdcSignalsAuxContainerCnv.h
index 26324c96c4b..5c88b25a77a 100644
--- a/Event/xAOD/xAODTrigMinBiasAthenaPool/src/xAODTrigT2ZdcSignalsAuxContainerCnv.h
+++ b/Event/xAOD/xAODTrigMinBiasAthenaPool/src/xAODTrigT2ZdcSignalsAuxContainerCnv.h
@@ -30,13 +30,11 @@ typedef T_AthenaPoolCustomCnv< xAOD::TrigT2ZdcSignalsAuxContainer,
class xAODTrigT2ZdcSignalsAuxContainerCnv :
public xAODTrigT2ZdcSignalsAuxContainerCnvBase {
- // Declare the factory as our friend:
- friend class CnvFactory< xAODTrigT2ZdcSignalsAuxContainerCnv >;
-
-protected:
+public:
/// Converter constructor
xAODTrigT2ZdcSignalsAuxContainerCnv( ISvcLocator* svcLoc );
+protected:
/// Function preparing the container to be written out
virtual xAOD::TrigT2ZdcSignalsAuxContainer*
createPersistent( xAOD::TrigT2ZdcSignalsAuxContainer* trans );
diff --git a/Event/xAOD/xAODTrigMinBiasAthenaPool/src/xAODTrigTrackCountsAuxContainerCnv.h b/Event/xAOD/xAODTrigMinBiasAthenaPool/src/xAODTrigTrackCountsAuxContainerCnv.h
index 9938cb40118..3898be1c95e 100644
--- a/Event/xAOD/xAODTrigMinBiasAthenaPool/src/xAODTrigTrackCountsAuxContainerCnv.h
+++ b/Event/xAOD/xAODTrigMinBiasAthenaPool/src/xAODTrigTrackCountsAuxContainerCnv.h
@@ -30,13 +30,11 @@ typedef T_AthenaPoolCustomCnv< xAOD::TrigTrackCountsAuxContainer,
class xAODTrigTrackCountsAuxContainerCnv :
public xAODTrigTrackCountsAuxContainerCnvBase {
- // Declare the factory as our friend:
- friend class CnvFactory< xAODTrigTrackCountsAuxContainerCnv >;
-
-protected:
+public:
/// Converter constructor
xAODTrigTrackCountsAuxContainerCnv( ISvcLocator* svcLoc );
+protected:
/// Function preparing the container to be written out
virtual xAOD::TrigTrackCountsAuxContainer*
createPersistent( xAOD::TrigTrackCountsAuxContainer* trans );
diff --git a/Event/xAOD/xAODTrigMinBiasAthenaPool/src/xAODTrigVertexCountsAuxContainerCnv.h b/Event/xAOD/xAODTrigMinBiasAthenaPool/src/xAODTrigVertexCountsAuxContainerCnv.h
index 201394e92dc..d9a47d8ad82 100644
--- a/Event/xAOD/xAODTrigMinBiasAthenaPool/src/xAODTrigVertexCountsAuxContainerCnv.h
+++ b/Event/xAOD/xAODTrigMinBiasAthenaPool/src/xAODTrigVertexCountsAuxContainerCnv.h
@@ -30,13 +30,11 @@ typedef T_AthenaPoolCustomCnv< xAOD::TrigVertexCountsAuxContainer,
class xAODTrigVertexCountsAuxContainerCnv :
public xAODTrigVertexCountsAuxContainerCnvBase {
- // Declare the factory as our friend:
- friend class CnvFactory< xAODTrigVertexCountsAuxContainerCnv >;
-
-protected:
+public:
/// Converter constructor
xAODTrigVertexCountsAuxContainerCnv( ISvcLocator* svcLoc );
+protected:
/// Function preparing the container to be written out
virtual xAOD::TrigVertexCountsAuxContainer*
createPersistent( xAOD::TrigVertexCountsAuxContainer* trans );
diff --git a/Event/xAOD/xAODTrigMissingETAthenaPool/src/xAODTrigMissingETAuxContainerCnv.h b/Event/xAOD/xAODTrigMissingETAthenaPool/src/xAODTrigMissingETAuxContainerCnv.h
index 535bfe0df4a..1cdc6bdfab7 100644
--- a/Event/xAOD/xAODTrigMissingETAthenaPool/src/xAODTrigMissingETAuxContainerCnv.h
+++ b/Event/xAOD/xAODTrigMissingETAthenaPool/src/xAODTrigMissingETAuxContainerCnv.h
@@ -30,13 +30,11 @@ typedef T_AthenaPoolCustomCnv< xAOD::TrigMissingETAuxContainer,
class xAODTrigMissingETAuxContainerCnv :
public xAODTrigMissingETAuxContainerCnvBase {
- // Declare the factory as our friend:
- friend class CnvFactory< xAODTrigMissingETAuxContainerCnv >;
-
-protected:
+public:
/// Converter constructor
xAODTrigMissingETAuxContainerCnv( ISvcLocator* svcLoc );
+protected:
/// Function preparing the container to be written out
virtual xAOD::TrigMissingETAuxContainer*
createPersistent( xAOD::TrigMissingETAuxContainer* trans );
diff --git a/Event/xAOD/xAODTrigMuonAthenaPool/src/xAODL2CombinedMuonAuxContainerCnv.h b/Event/xAOD/xAODTrigMuonAthenaPool/src/xAODL2CombinedMuonAuxContainerCnv.h
index 878d7201d61..5d50032b4d9 100644
--- a/Event/xAOD/xAODTrigMuonAthenaPool/src/xAODL2CombinedMuonAuxContainerCnv.h
+++ b/Event/xAOD/xAODTrigMuonAthenaPool/src/xAODL2CombinedMuonAuxContainerCnv.h
@@ -23,13 +23,11 @@ typedef T_AthenaPoolCustomCnv< xAOD::L2CombinedMuonAuxContainer,
class xAODL2CombinedMuonAuxContainerCnv :
public xAODL2CombinedMuonAuxContainerCnvBase {
- // Declare the factory as our friend:
- friend class CnvFactory< xAODL2CombinedMuonAuxContainerCnv >;
-
-protected:
+public:
/// Converter constructor
xAODL2CombinedMuonAuxContainerCnv( ISvcLocator* svcLoc );
+protected:
/// Function preparing the container to be written out
virtual xAOD::L2CombinedMuonAuxContainer*
createPersistent( xAOD::L2CombinedMuonAuxContainer* trans );
diff --git a/Event/xAOD/xAODTrigMuonAthenaPool/src/xAODL2IsoMuonAuxContainerCnv.h b/Event/xAOD/xAODTrigMuonAthenaPool/src/xAODL2IsoMuonAuxContainerCnv.h
index 306831b480e..254bcbdbcf6 100644
--- a/Event/xAOD/xAODTrigMuonAthenaPool/src/xAODL2IsoMuonAuxContainerCnv.h
+++ b/Event/xAOD/xAODTrigMuonAthenaPool/src/xAODL2IsoMuonAuxContainerCnv.h
@@ -23,13 +23,11 @@ typedef T_AthenaPoolCustomCnv< xAOD::L2IsoMuonAuxContainer,
class xAODL2IsoMuonAuxContainerCnv :
public xAODL2IsoMuonAuxContainerCnvBase {
- // Declare the factory as our friend:
- friend class CnvFactory< xAODL2IsoMuonAuxContainerCnv >;
-
-protected:
+public:
/// Converter constructor
xAODL2IsoMuonAuxContainerCnv( ISvcLocator* svcLoc );
+protected:
/// Function preparing the container to be written out
virtual xAOD::L2IsoMuonAuxContainer*
createPersistent( xAOD::L2IsoMuonAuxContainer* trans );
diff --git a/Event/xAOD/xAODTrigMuonAthenaPool/src/xAODL2StandAloneMuonAuxContainerCnv.h b/Event/xAOD/xAODTrigMuonAthenaPool/src/xAODL2StandAloneMuonAuxContainerCnv.h
index fa3a0b8c982..ef176f61bd9 100644
--- a/Event/xAOD/xAODTrigMuonAthenaPool/src/xAODL2StandAloneMuonAuxContainerCnv.h
+++ b/Event/xAOD/xAODTrigMuonAthenaPool/src/xAODL2StandAloneMuonAuxContainerCnv.h
@@ -26,13 +26,11 @@ typedef T_AthenaPoolCustomCnv< xAOD::L2StandAloneMuonAuxContainer,
class xAODL2StandAloneMuonAuxContainerCnv :
public xAODL2StandAloneMuonAuxContainerCnvBase {
- // Declare the factory as our friend:
- friend class CnvFactory< xAODL2StandAloneMuonAuxContainerCnv >;
-
-protected:
+public:
/// Converter constructor
xAODL2StandAloneMuonAuxContainerCnv( ISvcLocator* svcLoc );
+protected:
/// Function preparing the container to be written out
virtual xAOD::L2StandAloneMuonAuxContainer*
createPersistent( xAOD::L2StandAloneMuonAuxContainer* trans );
diff --git a/Event/xAOD/xAODTrigRingerAthenaPool/src/xAODTrigRNNOutputAuxContainerCnv.h b/Event/xAOD/xAODTrigRingerAthenaPool/src/xAODTrigRNNOutputAuxContainerCnv.h
index 1034bad7f13..eeeadb888f4 100644
--- a/Event/xAOD/xAODTrigRingerAthenaPool/src/xAODTrigRNNOutputAuxContainerCnv.h
+++ b/Event/xAOD/xAODTrigRingerAthenaPool/src/xAODTrigRNNOutputAuxContainerCnv.h
@@ -30,13 +30,11 @@ typedef T_AthenaPoolCustomCnv< xAOD::TrigRNNOutputAuxContainer,
class xAODTrigRNNOutputAuxContainerCnv :
public xAODTrigRNNOutputAuxContainerCnvBase {
- // Declare the factory as our friend:
- friend class CnvFactory< xAODTrigRNNOutputAuxContainerCnv >;
-
-protected:
+public:
/// Converter constructor
- xAODTrigRNNOutputAuxContainerCnv( ISvcLocator* svcLoc );
+ xAODTrigRNNOutputAuxContainerCnv( ISvcLocator* svcLoc );
+protected:
/// Function preparing the container to be written out
virtual xAOD::TrigRNNOutputAuxContainer*
createPersistent( xAOD::TrigRNNOutputAuxContainer* trans );
diff --git a/Event/xAOD/xAODTrigRingerAthenaPool/src/xAODTrigRingerRingsAuxContainerCnv.h b/Event/xAOD/xAODTrigRingerAthenaPool/src/xAODTrigRingerRingsAuxContainerCnv.h
index 4b6ff235817..1c6e7e0eec9 100644
--- a/Event/xAOD/xAODTrigRingerAthenaPool/src/xAODTrigRingerRingsAuxContainerCnv.h
+++ b/Event/xAOD/xAODTrigRingerAthenaPool/src/xAODTrigRingerRingsAuxContainerCnv.h
@@ -30,12 +30,11 @@ typedef T_AthenaPoolCustomCnv< xAOD::TrigRingerRingsAuxContainer,
class xAODTrigRingerRingsAuxContainerCnv :
public xAODTrigRingerRingsAuxContainerCnvBase {
- // Declare the factory as our friend:
- friend class CnvFactory< xAODTrigRingerRingsAuxContainerCnv >;
-
-protected:
+public:
/// Converter constructor
xAODTrigRingerRingsAuxContainerCnv( ISvcLocator* svcLoc );
+
+protected:
/// Function preparing the container to be written out
virtual xAOD::TrigRingerRingsAuxContainer*
createPersistent( xAOD::TrigRingerRingsAuxContainer* trans );
diff --git a/Event/xAOD/xAODTriggerAthenaPool/src/xAODEmTauRoIAuxContainerCnv.h b/Event/xAOD/xAODTriggerAthenaPool/src/xAODEmTauRoIAuxContainerCnv.h
index c0fa8fb4d41..7a6c2d05a75 100644
--- a/Event/xAOD/xAODTriggerAthenaPool/src/xAODEmTauRoIAuxContainerCnv.h
+++ b/Event/xAOD/xAODTriggerAthenaPool/src/xAODEmTauRoIAuxContainerCnv.h
@@ -46,7 +46,9 @@ class xAODEmTauRoIAuxContainerCnv :
protected:
/// Converter constructor
+public:
xAODEmTauRoIAuxContainerCnv( ISvcLocator* svcLoc );
+protected:
/// Function preparing the container to be written out
virtual xAOD::EmTauRoIAuxContainer*
diff --git a/Event/xAOD/xAODTriggerAthenaPool/src/xAODEnergySumRoIAuxInfoCnv.h b/Event/xAOD/xAODTriggerAthenaPool/src/xAODEnergySumRoIAuxInfoCnv.h
index 59fc481bd19..18b5b2b90d0 100644
--- a/Event/xAOD/xAODTriggerAthenaPool/src/xAODEnergySumRoIAuxInfoCnv.h
+++ b/Event/xAOD/xAODTriggerAthenaPool/src/xAODEnergySumRoIAuxInfoCnv.h
@@ -46,7 +46,9 @@ class xAODEnergySumRoIAuxInfoCnv :
protected:
/// Converter constructor
+public:
xAODEnergySumRoIAuxInfoCnv( ISvcLocator* svcLoc );
+protected:
/// Function preparing the container to be written out
virtual xAOD::EnergySumRoIAuxInfo*
diff --git a/Event/xAOD/xAODTriggerAthenaPool/src/xAODJetRoIAuxContainerCnv.h b/Event/xAOD/xAODTriggerAthenaPool/src/xAODJetRoIAuxContainerCnv.h
index d16f092ab87..97a2f40b125 100644
--- a/Event/xAOD/xAODTriggerAthenaPool/src/xAODJetRoIAuxContainerCnv.h
+++ b/Event/xAOD/xAODTriggerAthenaPool/src/xAODJetRoIAuxContainerCnv.h
@@ -46,7 +46,9 @@ class xAODJetRoIAuxContainerCnv :
protected:
/// Converter constructor
+public:
xAODJetRoIAuxContainerCnv( ISvcLocator* svcLoc );
+protected:
/// Function preparing the container to be written out
virtual xAOD::JetRoIAuxContainer*
diff --git a/Event/xAOD/xAODTriggerAthenaPool/src/xAODTrigNavigationAuxInfoCnv.h b/Event/xAOD/xAODTriggerAthenaPool/src/xAODTrigNavigationAuxInfoCnv.h
index 3e21bb99366..0356c5964d3 100644
--- a/Event/xAOD/xAODTriggerAthenaPool/src/xAODTrigNavigationAuxInfoCnv.h
+++ b/Event/xAOD/xAODTriggerAthenaPool/src/xAODTrigNavigationAuxInfoCnv.h
@@ -40,7 +40,9 @@ class xAODTrigNavigationAuxInfoCnv :
protected:
/// Converter constructor
+public:
xAODTrigNavigationAuxInfoCnv( ISvcLocator* svcLoc );
+protected:
/// Function preparing the container to be written out
virtual xAOD::TrigNavigationAuxInfo*
diff --git a/Event/xAOD/xAODTriggerAthenaPool/src/xAODTriggerMenuAuxContainerCnv.h b/Event/xAOD/xAODTriggerAthenaPool/src/xAODTriggerMenuAuxContainerCnv.h
index 7c1ea86e6c4..53deba1888e 100644
--- a/Event/xAOD/xAODTriggerAthenaPool/src/xAODTriggerMenuAuxContainerCnv.h
+++ b/Event/xAOD/xAODTriggerAthenaPool/src/xAODTriggerMenuAuxContainerCnv.h
@@ -41,7 +41,9 @@ class xAODTriggerMenuAuxContainerCnv :
protected:
/// Converter constructor
+public:
xAODTriggerMenuAuxContainerCnv( ISvcLocator* svcLoc );
+protected:
/// Function preparing the container to be written out
virtual xAOD::TriggerMenuAuxContainer*
diff --git a/Event/xAOD/xAODTruthAthenaPool/src/xAODTruthEventAuxContainerCnv.h b/Event/xAOD/xAODTruthAthenaPool/src/xAODTruthEventAuxContainerCnv.h
index 5bb6046caec..7cedfb12616 100644
--- a/Event/xAOD/xAODTruthAthenaPool/src/xAODTruthEventAuxContainerCnv.h
+++ b/Event/xAOD/xAODTruthAthenaPool/src/xAODTruthEventAuxContainerCnv.h
@@ -36,13 +36,11 @@ typedef T_AthenaPoolCustomCnv< xAOD::TruthEventAuxContainer,
class xAODTruthEventAuxContainerCnv :
public xAODTruthEventAuxContainerCnvBase {
- // Declare the factory as our friend:
- friend class CnvFactory< xAODTruthEventAuxContainerCnv >;
-
-protected:
+public:
/// Converter constructor
xAODTruthEventAuxContainerCnv( ISvcLocator* svcLoc );
+protected:
/// Function preparing the container to be written out
virtual xAOD::TruthEventAuxContainer*
createPersistent( xAOD::TruthEventAuxContainer* trans );
diff --git a/Event/xAOD/xAODTruthAthenaPool/src/xAODTruthParticleAuxContainerCnv.h b/Event/xAOD/xAODTruthAthenaPool/src/xAODTruthParticleAuxContainerCnv.h
index 5a21025a6ef..a1182b4a4d0 100644
--- a/Event/xAOD/xAODTruthAthenaPool/src/xAODTruthParticleAuxContainerCnv.h
+++ b/Event/xAOD/xAODTruthAthenaPool/src/xAODTruthParticleAuxContainerCnv.h
@@ -36,13 +36,11 @@ typedef T_AthenaPoolCustomCnv< xAOD::TruthParticleAuxContainer,
class xAODTruthParticleAuxContainerCnv :
public xAODTruthParticleAuxContainerCnvBase {
- // Declare the factory as our friend:
- friend class CnvFactory< xAODTruthParticleAuxContainerCnv >;
-
-protected:
+public:
/// Converter constructor
xAODTruthParticleAuxContainerCnv( ISvcLocator* svcLoc );
+protected:
/// Function preparing the container to be written out
virtual xAOD::TruthParticleAuxContainer*
createPersistent( xAOD::TruthParticleAuxContainer* trans );
diff --git a/Event/xAOD/xAODTruthAthenaPool/src/xAODTruthPileupEventAuxContainerCnv.h b/Event/xAOD/xAODTruthAthenaPool/src/xAODTruthPileupEventAuxContainerCnv.h
index 4e4e2756cd4..0e0ffe7cd05 100644
--- a/Event/xAOD/xAODTruthAthenaPool/src/xAODTruthPileupEventAuxContainerCnv.h
+++ b/Event/xAOD/xAODTruthAthenaPool/src/xAODTruthPileupEventAuxContainerCnv.h
@@ -36,13 +36,11 @@ typedef T_AthenaPoolCustomCnv< xAOD::TruthPileupEventAuxContainer,
class xAODTruthPileupEventAuxContainerCnv :
public xAODTruthPileupEventAuxContainerCnvBase {
- // Declare the factory as our friend:
- friend class CnvFactory< xAODTruthPileupEventAuxContainerCnv >;
-
-protected:
+public:
/// Converter constructor
xAODTruthPileupEventAuxContainerCnv( ISvcLocator* svcLoc );
+protected:
/// Function preparing the container to be written out
virtual xAOD::TruthPileupEventAuxContainer*
createPersistent( xAOD::TruthPileupEventAuxContainer* trans );
diff --git a/Event/xAOD/xAODTruthAthenaPool/src/xAODTruthVertexAuxContainerCnv.h b/Event/xAOD/xAODTruthAthenaPool/src/xAODTruthVertexAuxContainerCnv.h
index a2f05901f80..151fe227034 100644
--- a/Event/xAOD/xAODTruthAthenaPool/src/xAODTruthVertexAuxContainerCnv.h
+++ b/Event/xAOD/xAODTruthAthenaPool/src/xAODTruthVertexAuxContainerCnv.h
@@ -36,13 +36,11 @@ typedef T_AthenaPoolCustomCnv< xAOD::TruthVertexAuxContainer,
class xAODTruthVertexAuxContainerCnv :
public xAODTruthVertexAuxContainerCnvBase {
- // Declare the factory as our friend:
- friend class CnvFactory< xAODTruthVertexAuxContainerCnv >;
-
-protected:
+public:
/// Converter constructor
xAODTruthVertexAuxContainerCnv( ISvcLocator* svcLoc );
+protected:
/// Function preparing the container to be written out
virtual xAOD::TruthVertexAuxContainer*
createPersistent( xAOD::TruthVertexAuxContainer* trans );
diff --git a/ForwardDetectors/AFP/AFP_ByteStream2RawCnv/AFP_ByteStream2RawCnv/AFP_ByteStream2RawCnv.h b/ForwardDetectors/AFP/AFP_ByteStream2RawCnv/AFP_ByteStream2RawCnv/AFP_ByteStream2RawCnv.h
index 325b346789e..9c940c63464 100644
--- a/ForwardDetectors/AFP/AFP_ByteStream2RawCnv/AFP_ByteStream2RawCnv/AFP_ByteStream2RawCnv.h
+++ b/ForwardDetectors/AFP/AFP_ByteStream2RawCnv/AFP_ByteStream2RawCnv/AFP_ByteStream2RawCnv.h
@@ -16,7 +16,6 @@
#include "GaudiKernel/IToolSvc.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/ToolFactory.h"
#include "StoreGate/StoreGateSvc.h"
#include "ByteStreamCnvSvcBase/IByteStreamEventAccess.h"
diff --git a/ForwardDetectors/AFP/AFP_ByteStream2RawCnv/AFP_ByteStream2RawCnv/AFP_RawDataProviderTool.h b/ForwardDetectors/AFP/AFP_ByteStream2RawCnv/AFP_ByteStream2RawCnv/AFP_RawDataProviderTool.h
index 4c465d6537a..6da15253413 100644
--- a/ForwardDetectors/AFP/AFP_ByteStream2RawCnv/AFP_ByteStream2RawCnv/AFP_RawDataProviderTool.h
+++ b/ForwardDetectors/AFP/AFP_ByteStream2RawCnv/AFP_ByteStream2RawCnv/AFP_RawDataProviderTool.h
@@ -15,7 +15,6 @@
#include "DataModel/DataVector.h"
#include "GaudiKernel/IToolSvc.h"
#include "GaudiKernel/ServiceHandle.h"
-#include "GaudiKernel/ToolFactory.h"
#include "GaudiKernel/ToolHandle.h" //included under assumption you'll want to use some tools! Remove if you don't!
#include <set>
#include <stdint.h>
diff --git a/ForwardDetectors/AFP/AFP_DBTools/src/components/AFP_DBTools_entries.cxx b/ForwardDetectors/AFP/AFP_DBTools/src/components/AFP_DBTools_entries.cxx
index c34c4e0a48e..186da425619 100644
--- a/ForwardDetectors/AFP/AFP_DBTools/src/components/AFP_DBTools_entries.cxx
+++ b/ForwardDetectors/AFP/AFP_DBTools/src/components/AFP_DBTools_entries.cxx
@@ -3,10 +3,8 @@
*/
#include "AFP_DBTools/SiLocAlignDBTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-DECLARE_NAMESPACE_TOOL_FACTORY(AFP, SiLocAlignDBTool)
+using namespace AFP;
+
+DECLARE_COMPONENT(SiLocAlignDBTool)
-DECLARE_FACTORY_ENTRIES(AFP_DBTools) {
- DECLARE_NAMESPACE_TOOL(AFP, SiLocAlignDBTool)
-}
diff --git a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/src/AFP_SIDLocRecoEvCollectionCnv.h b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/src/AFP_SIDLocRecoEvCollectionCnv.h
index 55638d3cc8d..6e3c5d1c945 100644
--- a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/src/AFP_SIDLocRecoEvCollectionCnv.h
+++ b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/src/AFP_SIDLocRecoEvCollectionCnv.h
@@ -24,7 +24,9 @@ class AFP_SIDLocRecoEvCollectionCnv : public T_AthenaPoolCustomCnv <AFP_SIDLocRe
protected:
+public:
AFP_SIDLocRecoEvCollectionCnv(ISvcLocator* svcloc) : T_AthenaPoolCustomCnv <AFP_SIDLocRecoEvCollection, AFP_SIDLocRecoEvCollection_PERS >(svcloc) {}
+protected:
AFP_SIDLocRecoEvCollection_PERS* createPersistent (AFP_SIDLocRecoEvCollection *transCont);
AFP_SIDLocRecoEvCollection* createTransient ();
diff --git a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/src/AFP_SIDSimHitCollectionCnv.h b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/src/AFP_SIDSimHitCollectionCnv.h
index 91f040550ee..b5e8a3a9feb 100644
--- a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/src/AFP_SIDSimHitCollectionCnv.h
+++ b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/src/AFP_SIDSimHitCollectionCnv.h
@@ -18,7 +18,9 @@ class AFP_SIDSimHitCollectionCnv : public T_AthenaPoolCustomCnv <AFP_SIDSimHitCo
friend class CnvFactory<AFP_SIDSimHitCollectionCnv>;
protected:
+public:
AFP_SIDSimHitCollectionCnv(ISvcLocator* svcloc) : T_AthenaPoolCustomCnv <AFP_SIDSimHitCollection, AFP_SIDSimHitCollection_PERS >(svcloc) {}
+protected:
AFP_SIDSimHitCollection_PERS* createPersistent (AFP_SIDSimHitCollection *transCont);
AFP_SIDSimHitCollection* createTransient ();
diff --git a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/src/AFP_SiDigiCollectionCnv.h b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/src/AFP_SiDigiCollectionCnv.h
index cc37a6baf05..97ee00da2b3 100644
--- a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/src/AFP_SiDigiCollectionCnv.h
+++ b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/src/AFP_SiDigiCollectionCnv.h
@@ -18,7 +18,9 @@ class AFP_SiDigiCollectionCnv : public T_AthenaPoolCustomCnv <AFP_SiDigiCollecti
friend class CnvFactory<AFP_SiDigiCollectionCnv>;
protected:
+public:
AFP_SiDigiCollectionCnv(ISvcLocator* svcloc) : T_AthenaPoolCustomCnv <AFP_SiDigiCollection, AFP_SiDigiCollection_PERS >(svcloc) {}
+protected:
AFP_SiDigiCollection_PERS* createPersistent (AFP_SiDigiCollection *transCont);
AFP_SiDigiCollection* createTransient ();
diff --git a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/src/AFP_TDDigiCollectionCnv.h b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/src/AFP_TDDigiCollectionCnv.h
index 448d6e69336..4823b46cb06 100644
--- a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/src/AFP_TDDigiCollectionCnv.h
+++ b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/src/AFP_TDDigiCollectionCnv.h
@@ -17,10 +17,11 @@ class AFP_TDDigiCollectionCnv : public T_AthenaPoolCustomCnv <AFP_TDDigiCollecti
{
friend class CnvFactory<AFP_TDDigiCollectionCnv>;
-protected:
+public:
AFP_TDDigiCollectionCnv(ISvcLocator* svcloc) : T_AthenaPoolCustomCnv <AFP_TDDigiCollection,
AFP_TDDigiCollection_PERS >(svcloc) {}
+protected:
AFP_TDDigiCollection_PERS* createPersistent (AFP_TDDigiCollection *transCont);
AFP_TDDigiCollection* createTransient ();
};
diff --git a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/src/AFP_TDLocRecoEvCollectionCnv.h b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/src/AFP_TDLocRecoEvCollectionCnv.h
index 6f4681d03f2..33cb7198b62 100644
--- a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/src/AFP_TDLocRecoEvCollectionCnv.h
+++ b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/src/AFP_TDLocRecoEvCollectionCnv.h
@@ -24,7 +24,9 @@ class AFP_TDLocRecoEvCollectionCnv : public T_AthenaPoolCustomCnv <AFP_TDLocReco
protected:
+public:
AFP_TDLocRecoEvCollectionCnv(ISvcLocator* svcloc) : T_AthenaPoolCustomCnv <AFP_TDLocRecoEvCollection, AFP_TDLocRecoEvCollection_PERS >(svcloc) {}
+protected:
AFP_TDLocRecoEvCollection_PERS* createPersistent (AFP_TDLocRecoEvCollection *transCont);
AFP_TDLocRecoEvCollection* createTransient ();
diff --git a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/src/AFP_TDSimHitCollectionCnv.h b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/src/AFP_TDSimHitCollectionCnv.h
index 8badae33111..a9b1f4b3029 100644
--- a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/src/AFP_TDSimHitCollectionCnv.h
+++ b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/src/AFP_TDSimHitCollectionCnv.h
@@ -18,7 +18,9 @@ class AFP_TDSimHitCollectionCnv : public T_AthenaPoolCustomCnv <AFP_TDSimHitColl
friend class CnvFactory<AFP_TDSimHitCollectionCnv>;
protected:
+public:
AFP_TDSimHitCollectionCnv(ISvcLocator* svcloc) : T_AthenaPoolCustomCnv <AFP_TDSimHitCollection, AFP_TDSimHitCollection_PERS >(svcloc) {}
+protected:
AFP_TDSimHitCollection_PERS* createPersistent (AFP_TDSimHitCollection *transCont);
AFP_TDSimHitCollection* createTransient ();
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/ALFA_CLinkEventCnv.h b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/ALFA_CLinkEventCnv.h
index 1a457972fe6..b7a7fcc5a95 100644
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/ALFA_CLinkEventCnv.h
+++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/ALFA_CLinkEventCnv.h
@@ -22,7 +22,9 @@ class ALFA_CLinkEventCnv : public T_AthenaPoolCustomCnv <ALFA_CLinkEvent, ALFA_C
friend class CnvFactory<ALFA_CLinkEventCnv>;
protected:
+public:
ALFA_CLinkEventCnv(ISvcLocator* svcloc) : T_AthenaPoolCustomCnv <ALFA_CLinkEvent, ALFA_CLinkEvent_PERS >(svcloc) {}
+protected:
ALFA_CLinkEvent_PERS* createPersistent (ALFA_CLinkEvent *transCont);
ALFA_CLinkEvent* createTransient ();
};
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/ALFA_DigitCollectionCnv.h b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/ALFA_DigitCollectionCnv.h
index 1c6bc6178d5..9393b27b100 100644
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/ALFA_DigitCollectionCnv.h
+++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/ALFA_DigitCollectionCnv.h
@@ -24,7 +24,9 @@ class ALFA_DigitCollectionCnv : public T_AthenaPoolCustomCnv <ALFA_DigitCollecti
protected:
+public:
ALFA_DigitCollectionCnv(ISvcLocator* svcloc) : T_AthenaPoolCustomCnv <ALFA_DigitCollection, ALFA_DigitCollection_PERS >(svcloc) {}
+protected:
ALFA_DigitCollection_PERS* createPersistent (ALFA_DigitCollection *transCont);
ALFA_DigitCollection* createTransient ();
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/ALFA_GloRecEvCollectionCnv.h b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/ALFA_GloRecEvCollectionCnv.h
index d4057bfd405..ab5933ee4e0 100644
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/ALFA_GloRecEvCollectionCnv.h
+++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/ALFA_GloRecEvCollectionCnv.h
@@ -24,7 +24,9 @@ class ALFA_GloRecEvCollectionCnv : public T_AthenaPoolCustomCnv <ALFA_GloRecEvCo
protected:
+public:
ALFA_GloRecEvCollectionCnv(ISvcLocator* svcloc) : T_AthenaPoolCustomCnv <ALFA_GloRecEvCollection, ALFA_GloRecEvCollection_PERS >(svcloc) {}
+protected:
ALFA_GloRecEvCollection_PERS* createPersistent (ALFA_GloRecEvCollection *transCont);
ALFA_GloRecEvCollection* createTransient ();
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/ALFA_HitCollectionCnv.h b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/ALFA_HitCollectionCnv.h
index 64eec442a83..7ef6a42c6b2 100644
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/ALFA_HitCollectionCnv.h
+++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/ALFA_HitCollectionCnv.h
@@ -24,7 +24,9 @@ class ALFA_HitCollectionCnv : public T_AthenaPoolCustomCnv <ALFA_HitCollection,
protected:
+public:
ALFA_HitCollectionCnv(ISvcLocator* svcloc) : T_AthenaPoolCustomCnv <ALFA_HitCollection, ALFA_HitCollection_PERS >(svcloc) {}
+protected:
ALFA_HitCollection_PERS* createPersistent (ALFA_HitCollection *transCont);
ALFA_HitCollection* createTransient ();
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/ALFA_LocRecCorrEvCollectionCnv.h b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/ALFA_LocRecCorrEvCollectionCnv.h
index 83a198eda8a..b8b1c5ca164 100644
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/ALFA_LocRecCorrEvCollectionCnv.h
+++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/ALFA_LocRecCorrEvCollectionCnv.h
@@ -24,7 +24,9 @@ class ALFA_LocRecCorrEvCollectionCnv : public T_AthenaPoolCustomCnv <ALFA_LocRec
protected:
+public:
ALFA_LocRecCorrEvCollectionCnv(ISvcLocator* svcloc) : T_AthenaPoolCustomCnv <ALFA_LocRecCorrEvCollection, ALFA_LocRecCorrEvCollection_PERS >(svcloc) {}
+protected:
ALFA_LocRecCorrEvCollection_PERS* createPersistent (ALFA_LocRecCorrEvCollection *transCont);
ALFA_LocRecCorrEvCollection* createTransient ();
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/ALFA_LocRecCorrODEvCollectionCnv.h b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/ALFA_LocRecCorrODEvCollectionCnv.h
index 42851c10178..2b6a0534514 100644
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/ALFA_LocRecCorrODEvCollectionCnv.h
+++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/ALFA_LocRecCorrODEvCollectionCnv.h
@@ -24,7 +24,9 @@ class ALFA_LocRecCorrODEvCollectionCnv : public T_AthenaPoolCustomCnv <ALFA_LocR
protected:
+public:
ALFA_LocRecCorrODEvCollectionCnv(ISvcLocator* svcloc) : T_AthenaPoolCustomCnv <ALFA_LocRecCorrODEvCollection, ALFA_LocRecCorrODEvCollection_PERS >(svcloc) {}
+protected:
ALFA_LocRecCorrODEvCollection_PERS* createPersistent (ALFA_LocRecCorrODEvCollection *transCont);
ALFA_LocRecCorrODEvCollection* createTransient ();
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/ALFA_LocRecEvCollectionCnv.h b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/ALFA_LocRecEvCollectionCnv.h
index c191910168a..d1eb94b2d39 100644
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/ALFA_LocRecEvCollectionCnv.h
+++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/ALFA_LocRecEvCollectionCnv.h
@@ -24,7 +24,9 @@ class ALFA_LocRecEvCollectionCnv : public T_AthenaPoolCustomCnv <ALFA_LocRecEvCo
protected:
+public:
ALFA_LocRecEvCollectionCnv(ISvcLocator* svcloc) : T_AthenaPoolCustomCnv <ALFA_LocRecEvCollection, ALFA_LocRecEvCollection_PERS >(svcloc) {}
+protected:
ALFA_LocRecEvCollection_PERS* createPersistent (ALFA_LocRecEvCollection *transCont);
ALFA_LocRecEvCollection* createTransient ();
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/ALFA_LocRecODEvCollectionCnv.h b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/ALFA_LocRecODEvCollectionCnv.h
index fee0cd19ad4..295b9e35b0d 100644
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/ALFA_LocRecODEvCollectionCnv.h
+++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/ALFA_LocRecODEvCollectionCnv.h
@@ -24,7 +24,9 @@ class ALFA_LocRecODEvCollectionCnv : public T_AthenaPoolCustomCnv <ALFA_LocRecOD
protected:
+public:
ALFA_LocRecODEvCollectionCnv(ISvcLocator* svcloc) : T_AthenaPoolCustomCnv <ALFA_LocRecODEvCollection, ALFA_LocRecODEvCollection_PERS >(svcloc) {}
+protected:
ALFA_LocRecODEvCollection_PERS* createPersistent (ALFA_LocRecODEvCollection *transCont);
ALFA_LocRecODEvCollection* createTransient ();
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/ALFA_ODDigitCollectionCnv.h b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/ALFA_ODDigitCollectionCnv.h
index 04cbf97b0bc..b9c7dd5941c 100644
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/ALFA_ODDigitCollectionCnv.h
+++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/ALFA_ODDigitCollectionCnv.h
@@ -24,7 +24,9 @@ class ALFA_ODDigitCollectionCnv : public T_AthenaPoolCustomCnv <ALFA_ODDigitColl
protected:
+public:
ALFA_ODDigitCollectionCnv(ISvcLocator* svcloc) : T_AthenaPoolCustomCnv <ALFA_ODDigitCollection, ALFA_ODDigitCollection_PERS >(svcloc) {}
+protected:
ALFA_ODDigitCollection_PERS* createPersistent (ALFA_ODDigitCollection *transCont);
ALFA_ODDigitCollection* createTransient ();
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/ALFA_ODHitCollectionCnv.h b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/ALFA_ODHitCollectionCnv.h
index 2270d41aa35..728724ff992 100644
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/ALFA_ODHitCollectionCnv.h
+++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/ALFA_ODHitCollectionCnv.h
@@ -25,7 +25,9 @@ class ALFA_ODHitCollectionCnv : public T_AthenaPoolCustomCnv <ALFA_ODHitCollecti
protected:
+public:
ALFA_ODHitCollectionCnv(ISvcLocator* svcloc) : T_AthenaPoolCustomCnv <ALFA_ODHitCollection, ALFA_ODHitCollection_PERS >(svcloc) {}
+protected:
ALFA_ODHitCollection_PERS* createPersistent (ALFA_ODHitCollection *transCont);
ALFA_ODHitCollection* createTransient ();
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/ALFA_RawDataContainerCnv.h b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/ALFA_RawDataContainerCnv.h
old mode 100755
new mode 100644
index 0e8e0a28464..4f646b60070
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/ALFA_RawDataContainerCnv.h
+++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/ALFA_RawDataContainerCnv.h
@@ -11,8 +11,7 @@
#include "ALFA_EventTPCnv/ALFA_RawDataContainer_p1.h"
#include "GaudiKernel/MsgStream.h"
#include "StoreGate/StoreGateSvc.h"
-#include "GaudiKernel/CnvFactory.h"
-
+
typedef ALFA_RawDataContainer_p1 ALFA_RawDataContainer_PERS;
@@ -26,7 +25,9 @@ class ALFA_RawDataContainerCnv: public ALFA_RawDataContainerCnvBase {
protected:
+public:
ALFA_RawDataContainerCnv(ISvcLocator* svcloc): ALFA_RawDataContainerCnvBase(svcloc) {}
+protected:
virtual ALFA_RawDataContainer_PERS* createPersistent(ALFA_RawDataContainer* transCont);
virtual ALFA_RawDataContainer* createTransient ();
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/ALFA_RawDataContainerCnv_charge.h b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/ALFA_RawDataContainerCnv_charge.h
index 094e65274bb..9a232e6f616 100644
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/ALFA_RawDataContainerCnv_charge.h
+++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/ALFA_RawDataContainerCnv_charge.h
@@ -11,7 +11,6 @@
#include "ALFA_EventTPCnv/ALFA_RawDataContainer_charge_p1.h"
#include "GaudiKernel/MsgStream.h"
#include "StoreGate/StoreGateSvc.h"
-#include "GaudiKernel/CnvFactory.h"
typedef ALFA_RawDataContainer_charge_p1 ALFA_RawDataContainer_charge_PERS;
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_RawDataByteStreamCnv/ALFA_RawDataByteStreamCnv/ALFA_Decoder.h b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_RawDataByteStreamCnv/ALFA_RawDataByteStreamCnv/ALFA_Decoder.h
index b062ffa924d..dabe4d9eb6c 100644
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_RawDataByteStreamCnv/ALFA_RawDataByteStreamCnv/ALFA_Decoder.h
+++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_RawDataByteStreamCnv/ALFA_RawDataByteStreamCnv/ALFA_Decoder.h
@@ -15,7 +15,6 @@
#include "GaudiKernel/ToolHandle.h"
#include "GaudiKernel/ServiceHandle.h"
-#include "GaudiKernel/ToolFactory.h"
#include "GaudiKernel/IToolSvc.h"
#include "GaudiKernel/MsgStream.h"
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_RawDataByteStreamCnv/ALFA_RawDataByteStreamCnv/ALFA_Decoder_charge.h b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_RawDataByteStreamCnv/ALFA_RawDataByteStreamCnv/ALFA_Decoder_charge.h
index b24415ed4a5..a768588af99 100644
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_RawDataByteStreamCnv/ALFA_RawDataByteStreamCnv/ALFA_Decoder_charge.h
+++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_RawDataByteStreamCnv/ALFA_RawDataByteStreamCnv/ALFA_Decoder_charge.h
@@ -15,7 +15,6 @@
#include "GaudiKernel/ToolHandle.h"
#include "GaudiKernel/ServiceHandle.h"
-#include "GaudiKernel/ToolFactory.h"
#include "GaudiKernel/IToolSvc.h"
#include "GaudiKernel/MsgStream.h"
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_RawDataByteStreamCnv/ALFA_RawDataByteStreamCnv/ALFA_RawDataProviderTool.h b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_RawDataByteStreamCnv/ALFA_RawDataByteStreamCnv/ALFA_RawDataProviderTool.h
index c472421f149..e866fbbac11 100644
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_RawDataByteStreamCnv/ALFA_RawDataByteStreamCnv/ALFA_RawDataProviderTool.h
+++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_RawDataByteStreamCnv/ALFA_RawDataByteStreamCnv/ALFA_RawDataProviderTool.h
@@ -11,7 +11,6 @@
#include "GaudiKernel/ToolHandle.h"
#include "GaudiKernel/ServiceHandle.h"
-#include "GaudiKernel/ToolFactory.h"
#include "GaudiKernel/IToolSvc.h"
#include "ByteStreamData/RawEvent.h"
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_RawDataByteStreamCnv/ALFA_RawDataByteStreamCnv/ALFA_RawDataProviderTool_charge.h b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_RawDataByteStreamCnv/ALFA_RawDataByteStreamCnv/ALFA_RawDataProviderTool_charge.h
index e72a2c27c1c..a1be1fefd89 100644
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_RawDataByteStreamCnv/ALFA_RawDataByteStreamCnv/ALFA_RawDataProviderTool_charge.h
+++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_RawDataByteStreamCnv/ALFA_RawDataByteStreamCnv/ALFA_RawDataProviderTool_charge.h
@@ -11,7 +11,6 @@
#include "GaudiKernel/ToolHandle.h"
#include "GaudiKernel/ServiceHandle.h"
-#include "GaudiKernel/ToolFactory.h"
#include "GaudiKernel/IToolSvc.h"
#include "ByteStreamData/RawEvent.h"
diff --git a/ForwardDetectors/ForwardIdCnv/src/ForwardIdCnv_entries.cxx b/ForwardDetectors/ForwardIdCnv/src/ForwardIdCnv_entries.cxx
index 9802a3f5153..57aab600d5f 100644
--- a/ForwardDetectors/ForwardIdCnv/src/ForwardIdCnv_entries.cxx
+++ b/ForwardDetectors/ForwardIdCnv/src/ForwardIdCnv_entries.cxx
@@ -1,4 +1,4 @@
#include "ZdcIDDetDescrCnv.h"
-DECLARE_CONVERTER_FACTORY( ZdcIDDetDescrCnv )
+DECLARE_CONVERTER( ZdcIDDetDescrCnv )
diff --git a/ForwardDetectors/ForwardIdCnv/src/ZdcIDDetDescrCnv.cxx b/ForwardDetectors/ForwardIdCnv/src/ZdcIDDetDescrCnv.cxx
index 38dc26a4a99..090c7425463 100644
--- a/ForwardDetectors/ForwardIdCnv/src/ZdcIDDetDescrCnv.cxx
+++ b/ForwardDetectors/ForwardIdCnv/src/ZdcIDDetDescrCnv.cxx
@@ -17,7 +17,6 @@
#include "DetDescrCnvSvc/DetDescrConverter.h"
#include "DetDescrCnvSvc/DetDescrAddress.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/CnvFactory.h"
#include "StoreGate/StoreGate.h"
#include "IdDictDetDescr/IdDictManager.h"
diff --git a/ForwardDetectors/ForwardIdCnv/src/ZdcIDDetDescrCnv.h b/ForwardDetectors/ForwardIdCnv/src/ZdcIDDetDescrCnv.h
index 6575c1d6820..2890fb6d723 100644
--- a/ForwardDetectors/ForwardIdCnv/src/ZdcIDDetDescrCnv.h
+++ b/ForwardDetectors/ForwardIdCnv/src/ZdcIDDetDescrCnv.h
@@ -35,7 +35,7 @@ class ZdcID;
**/
class ZdcIDDetDescrCnv: public DetDescrConverter {
- friend class CnvFactory<ZdcIDDetDescrCnv>;
+ // friend class CnvFactory<ZdcIDDetDescrCnv>;
public:
@@ -48,7 +48,7 @@ public:
static long storageType();
static const CLID& classID();
-protected:
+ // protected:
ZdcIDDetDescrCnv(ISvcLocator* svcloc);
private:
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/src/SimulationHitCollectionCnv.h b/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/src/SimulationHitCollectionCnv.h
index 3a23cd2de6a..f82d98cb5f6 100644
--- a/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/src/SimulationHitCollectionCnv.h
+++ b/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/src/SimulationHitCollectionCnv.h
@@ -18,7 +18,9 @@ class SimulationHitCollectionCnv : public T_AthenaPoolCustomCnv <SimulationHitCo
friend class CnvFactory<SimulationHitCollectionCnv>;
protected:
+public:
SimulationHitCollectionCnv(ISvcLocator* svcloc) : T_AthenaPoolCustomCnv <SimulationHitCollection, SimulationHitCollection_PERS >(svcloc) {}
+protected:
SimulationHitCollection_PERS* createPersistent (SimulationHitCollection *transCont);
SimulationHitCollection* createTransient ();
diff --git a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventAthenaPool/src/LUCID_DigitContainerCnv.h b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventAthenaPool/src/LUCID_DigitContainerCnv.h
index e5469a634ec..9cc7aed4cbc 100644
--- a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventAthenaPool/src/LUCID_DigitContainerCnv.h
+++ b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventAthenaPool/src/LUCID_DigitContainerCnv.h
@@ -20,7 +20,9 @@ class LUCID_DigitContainerCnv: public LUCID_DigitContainerCnvBase {
protected:
+public:
LUCID_DigitContainerCnv(ISvcLocator* svcloc): LUCID_DigitContainerCnvBase(svcloc) {}
+protected:
virtual LUCID_DigitContainer_PERS* createPersistent(LUCID_DigitContainer* transCont);
virtual LUCID_DigitContainer* createTransient ();
diff --git a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventAthenaPool/src/LUCID_RawDataContainerCnv.h b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventAthenaPool/src/LUCID_RawDataContainerCnv.h
index ecb73ce9738..384d2763ab3 100644
--- a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventAthenaPool/src/LUCID_RawDataContainerCnv.h
+++ b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventAthenaPool/src/LUCID_RawDataContainerCnv.h
@@ -20,7 +20,9 @@ class LUCID_RawDataContainerCnv: public LUCID_RawDataContainerCnvBase {
protected:
+public:
LUCID_RawDataContainerCnv(ISvcLocator* svcloc): LUCID_RawDataContainerCnvBase(svcloc) {}
+protected:
virtual LUCID_RawDataContainer_PERS* createPersistent(LUCID_RawDataContainer* transCont);
virtual LUCID_RawDataContainer* createTransient ();
diff --git a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_RawDataByteStreamCnv/LUCID_RawDataByteStreamCnv/LUCID_DigitByteStreamCnv.h b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_RawDataByteStreamCnv/LUCID_RawDataByteStreamCnv/LUCID_DigitByteStreamCnv.h
index 974246155ae..e37dd02e1ef 100644
--- a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_RawDataByteStreamCnv/LUCID_RawDataByteStreamCnv/LUCID_DigitByteStreamCnv.h
+++ b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_RawDataByteStreamCnv/LUCID_RawDataByteStreamCnv/LUCID_DigitByteStreamCnv.h
@@ -26,7 +26,6 @@
#include "eformat/SourceIdentifier.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IRegistry.h"
diff --git a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_RawDataByteStreamCnv/src/components/LUCID_RawDataByteStreamCnv_entries.cxx b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_RawDataByteStreamCnv/src/components/LUCID_RawDataByteStreamCnv_entries.cxx
index 5ba06c1e29f..9cf75e0b297 100644
--- a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_RawDataByteStreamCnv/src/components/LUCID_RawDataByteStreamCnv_entries.cxx
+++ b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_RawDataByteStreamCnv/src/components/LUCID_RawDataByteStreamCnv_entries.cxx
@@ -5,5 +5,5 @@ DECLARE_COMPONENT( LUCID_ByteStreamRawDataCnv )
DECLARE_COMPONENT( LUCID_DigitRawDataCnv )
#include "LUCID_RawDataByteStreamCnv/LUCID_DigitByteStreamCnv.h"
-DECLARE_CONVERTER_FACTORY( LUCID_DigitByteStreamCnv )
+DECLARE_CONVERTER( LUCID_DigitByteStreamCnv )
diff --git a/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/ZdcByteStream/ZdcByteStreamCnv.h b/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/ZdcByteStream/ZdcByteStreamCnv.h
index f19a4194872..7707c860c42 100644
--- a/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/ZdcByteStream/ZdcByteStreamCnv.h
+++ b/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/ZdcByteStream/ZdcByteStreamCnv.h
@@ -50,12 +50,9 @@ extern long ByteStream_StorageType;
*/
class ZdcByteStreamCnv: public Converter
{
- friend class CnvFactory<ZdcByteStreamCnv> ;
-
-protected:
+public:
ZdcByteStreamCnv(ISvcLocator* svcloc);
-public:
virtual ~ZdcByteStreamCnv();
virtual StatusCode initialize();
diff --git a/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/ZdcByteStreamCnv.cxx b/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/ZdcByteStreamCnv.cxx
index 2fdf3499f90..9e3295bc592 100644
--- a/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/ZdcByteStreamCnv.cxx
+++ b/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/ZdcByteStreamCnv.cxx
@@ -28,7 +28,6 @@
#include "ByteStreamData/ROBData.h"
#include "CLIDSvc/tools/ClassID_traits.h"
#include "DataModel/DataVector.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IOpaqueAddress.h"
#include "GaudiKernel/IRegistry.h"
diff --git a/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/components/ZdcByteStream_entries.cxx b/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/components/ZdcByteStream_entries.cxx
index c50568d7645..752bcdedc0a 100644
--- a/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/components/ZdcByteStream_entries.cxx
+++ b/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/components/ZdcByteStream_entries.cxx
@@ -18,7 +18,7 @@ DECLARE_COMPONENT( ZdcByteStreamTool )
DECLARE_COMPONENT( ZdcByteStreamReadV1V2Tool )
DECLARE_COMPONENT( ZdcL1CaloErrorByteStreamTool )
DECLARE_COMPONENT( ZdcDataAccessV2 )
-DECLARE_CONVERTER_FACTORY( ZdcByteStreamCnv )
+DECLARE_CONVERTER( ZdcByteStreamCnv )
DECLARE_COMPONENT( ZdcByteStreamTester )
DECLARE_COMPONENT( ZdcByteStreamRawData )
DECLARE_COMPONENT( ZdcByteStreamRawDataV2 )
diff --git a/ForwardDetectors/ZDC/ZdcCnv/ZdcEventAthenaPool/src/ZDC_SimPixelHit_CollectionCnv.h b/ForwardDetectors/ZDC/ZdcCnv/ZdcEventAthenaPool/src/ZDC_SimPixelHit_CollectionCnv.h
index 55375548307..120ff1539a1 100644
--- a/ForwardDetectors/ZDC/ZdcCnv/ZdcEventAthenaPool/src/ZDC_SimPixelHit_CollectionCnv.h
+++ b/ForwardDetectors/ZDC/ZdcCnv/ZdcEventAthenaPool/src/ZDC_SimPixelHit_CollectionCnv.h
@@ -25,7 +25,9 @@ class ZDC_SimPixelHit_CollectionCnv : public ZDC_SimPixelHit_CollectionCnvBase
protected:
+public:
ZDC_SimPixelHit_CollectionCnv(ISvcLocator* svcloc) : ZDC_SimPixelHit_CollectionCnvBase ( svcloc) {}
+protected:
virtual ZDC_SimPixelHit_Collection_PERS* createPersistent(ZDC_SimPixelHit_Collection* transCont);
virtual ZDC_SimPixelHit_Collection* createTransient ();
diff --git a/ForwardDetectors/ZDC/ZdcCnv/ZdcEventAthenaPool/src/ZDC_SimStripHit_CollectionCnv.h b/ForwardDetectors/ZDC/ZdcCnv/ZdcEventAthenaPool/src/ZDC_SimStripHit_CollectionCnv.h
index dc947998b26..2572d08afab 100644
--- a/ForwardDetectors/ZDC/ZdcCnv/ZdcEventAthenaPool/src/ZDC_SimStripHit_CollectionCnv.h
+++ b/ForwardDetectors/ZDC/ZdcCnv/ZdcEventAthenaPool/src/ZDC_SimStripHit_CollectionCnv.h
@@ -25,7 +25,9 @@ class ZDC_SimStripHit_CollectionCnv : public ZDC_SimStripHit_CollectionCnvBase
protected:
+public:
ZDC_SimStripHit_CollectionCnv(ISvcLocator* svcloc) : ZDC_SimStripHit_CollectionCnvBase ( svcloc) {}
+protected:
virtual ZDC_SimStripHit_Collection_PERS* createPersistent(ZDC_SimStripHit_Collection* transCont);
virtual ZDC_SimStripHit_Collection* createTransient ();
diff --git a/ForwardDetectors/ZDC/ZdcCnv/ZdcEventAthenaPool/src/ZdcDigitsCollectionCnv.h b/ForwardDetectors/ZDC/ZdcCnv/ZdcEventAthenaPool/src/ZdcDigitsCollectionCnv.h
old mode 100755
new mode 100644
index cdcde47b6a4..3ac2bacce4d
--- a/ForwardDetectors/ZDC/ZdcCnv/ZdcEventAthenaPool/src/ZdcDigitsCollectionCnv.h
+++ b/ForwardDetectors/ZDC/ZdcCnv/ZdcEventAthenaPool/src/ZdcDigitsCollectionCnv.h
@@ -16,7 +16,9 @@ typedef T_AthenaPoolCustomCnv<ZdcDigitsCollection, ZdcDigitsCollection_PERS > Zd
class ZdcDigitsCollectionCnv : public ZdcDigitsCollectionCnvBase {
friend class CnvFactory<ZdcDigitsCollectionCnv>;
protected:
+public:
ZdcDigitsCollectionCnv(ISvcLocator* svcloc) : ZdcDigitsCollectionCnvBase ( svcloc) {}
+protected:
virtual ZdcDigitsCollection_PERS* createPersistent(ZdcDigitsCollection* transCont);
virtual ZdcDigitsCollection* createTransient ();
};
diff --git a/ForwardDetectors/ZDC/ZdcCnv/ZdcEventAthenaPool/src/ZdcRawChannelCollectionCnv.h b/ForwardDetectors/ZDC/ZdcCnv/ZdcEventAthenaPool/src/ZdcRawChannelCollectionCnv.h
index c7a7a1989e8..52e1332f7b9 100755
--- a/ForwardDetectors/ZDC/ZdcCnv/ZdcEventAthenaPool/src/ZdcRawChannelCollectionCnv.h
+++ b/ForwardDetectors/ZDC/ZdcCnv/ZdcEventAthenaPool/src/ZdcRawChannelCollectionCnv.h
@@ -13,9 +13,10 @@ typedef ZdcRawChannelCollection_p1 ZdcRawChannelCollection_PERS;
class ZdcRawChannelCollectionCnv : public T_AthenaPoolCustomCnv<ZdcRawChannelCollection, ZdcRawChannelCollection_PERS > {
friend class CnvFactory<ZdcRawChannelCollectionCnv>;
-protected:
+public:
ZdcRawChannelCollectionCnv(ISvcLocator* svcloc) :
T_AthenaPoolCustomCnv<ZdcRawChannelCollection, ZdcRawChannelCollection_PERS >( svcloc) {}
+protected:
ZdcRawChannelCollection_PERS* createPersistent(ZdcRawChannelCollection* transCont);
ZdcRawChannelCollection* createTransient ();
};
diff --git a/Generators/EvtGen_i/src/EvtInclusiveDecay.cxx b/Generators/EvtGen_i/src/EvtInclusiveDecay.cxx
index 47b4103bb80..4846fd91710 100644
--- a/Generators/EvtGen_i/src/EvtInclusiveDecay.cxx
+++ b/Generators/EvtGen_i/src/EvtInclusiveDecay.cxx
@@ -35,7 +35,6 @@
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/AlgFactory.h"
#include "GaudiKernel/DataSvc.h"
#include "GaudiKernel/IPartPropSvc.h"
#include "AthenaKernel/IAtRndmGenSvc.h"
diff --git a/Generators/GeneratorFilters/src/BoostedHadTopAndTopPair.cxx b/Generators/GeneratorFilters/src/BoostedHadTopAndTopPair.cxx
index 8b4f0b798a4..1928f85020e 100644
--- a/Generators/GeneratorFilters/src/BoostedHadTopAndTopPair.cxx
+++ b/Generators/GeneratorFilters/src/BoostedHadTopAndTopPair.cxx
@@ -11,7 +11,6 @@
#include "GeneratorFilters/BoostedHadTopAndTopPair.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/AlgFactory.h"
#include <iostream>
#include <cmath>
diff --git a/Generators/GeneratorFilters/src/HTFilter.cxx b/Generators/GeneratorFilters/src/HTFilter.cxx
index 3c9d54839e4..e332acfde8f 100644
--- a/Generators/GeneratorFilters/src/HTFilter.cxx
+++ b/Generators/GeneratorFilters/src/HTFilter.cxx
@@ -7,7 +7,6 @@
// Framework Related Headers
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/AlgFactory.h"
// Used for retrieving the collection
#include "xAODJet/JetContainer.h"
diff --git a/Generators/GeneratorFilters/src/HiggsFilter.cxx b/Generators/GeneratorFilters/src/HiggsFilter.cxx
index 82851ac2463..fec195d143e 100644
--- a/Generators/GeneratorFilters/src/HiggsFilter.cxx
+++ b/Generators/GeneratorFilters/src/HiggsFilter.cxx
@@ -29,7 +29,6 @@
// Framework Related Headers:-
//#include "GaudiKernel/MsgStream.h"
-//#include "GaudiKernel/AlgFactory.h"
// Other classes used by this class:-
//#include <math.h>
diff --git a/Generators/GeneratorFilters/src/LeptonPairFilter.cxx b/Generators/GeneratorFilters/src/LeptonPairFilter.cxx
index fdf226b982b..24b58314cc2 100644
--- a/Generators/GeneratorFilters/src/LeptonPairFilter.cxx
+++ b/Generators/GeneratorFilters/src/LeptonPairFilter.cxx
@@ -22,7 +22,6 @@
// Framework Related Headers:-
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/AlgFactory.h"
// Other classes used by this class:-
#include <math.h>
diff --git a/Generators/GeneratorFilters/src/SusySubprocessFinder.cxx b/Generators/GeneratorFilters/src/SusySubprocessFinder.cxx
index 8ddb135b421..0fa6ca53325 100644
--- a/Generators/GeneratorFilters/src/SusySubprocessFinder.cxx
+++ b/Generators/GeneratorFilters/src/SusySubprocessFinder.cxx
@@ -4,7 +4,6 @@
#include "GeneratorFilters/SusySubprocessFinder.h"
#include "TruthUtils/PIDHelpers.h"
-#include "GaudiKernel/AlgFactory.h"
using HepMC::GenVertex;
using HepMC::GenParticle;
diff --git a/Generators/GeneratorFilters/src/TTbarPlusHeavyFlavorFilter.cxx b/Generators/GeneratorFilters/src/TTbarPlusHeavyFlavorFilter.cxx
index 3732998609f..2eb0244f426 100644
--- a/Generators/GeneratorFilters/src/TTbarPlusHeavyFlavorFilter.cxx
+++ b/Generators/GeneratorFilters/src/TTbarPlusHeavyFlavorFilter.cxx
@@ -5,7 +5,6 @@
#include "GeneratorFilters/TTbarPlusHeavyFlavorFilter.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/AlgFactory.h"
//--------------------------------------------------------------------------
TTbarPlusHeavyFlavorFilter::TTbarPlusHeavyFlavorFilter(const std::string& fname,
diff --git a/Generators/GeneratorFilters/src/TtHtoVVDecayFilter.cxx b/Generators/GeneratorFilters/src/TtHtoVVDecayFilter.cxx
index 9e8d4020940..0a94b1b773c 100644
--- a/Generators/GeneratorFilters/src/TtHtoVVDecayFilter.cxx
+++ b/Generators/GeneratorFilters/src/TtHtoVVDecayFilter.cxx
@@ -3,8 +3,7 @@
*/
#include "GeneratorFilters/TtHtoVVDecayFilter.h"
-#include "GaudiKernel/AlgFactory.h"
-
+
TtHtoVVDecayFilter::TtHtoVVDecayFilter(const std::string& name, ISvcLocator* pSvcLocator)
: GenFilter(name, pSvcLocator)
diff --git a/Generators/GeneratorFilters/src/VHtoVVDiLepFilter.cxx b/Generators/GeneratorFilters/src/VHtoVVDiLepFilter.cxx
index eabdb4fafe0..296037a0e13 100644
--- a/Generators/GeneratorFilters/src/VHtoVVDiLepFilter.cxx
+++ b/Generators/GeneratorFilters/src/VHtoVVDiLepFilter.cxx
@@ -3,7 +3,6 @@
*/
#include "GeneratorFilters/VHtoVVDiLepFilter.h"
-#include "GaudiKernel/AlgFactory.h"
VHtoVVDiLepFilter::VHtoVVDiLepFilter(const std::string& name, ISvcLocator* pSvcLocator)
diff --git a/Generators/GeneratorFilters/src/VHtoVVFilter.cxx b/Generators/GeneratorFilters/src/VHtoVVFilter.cxx
index a4b7fcf3e34..6a7a9c2b95a 100644
--- a/Generators/GeneratorFilters/src/VHtoVVFilter.cxx
+++ b/Generators/GeneratorFilters/src/VHtoVVFilter.cxx
@@ -3,7 +3,6 @@
*/
#include "GeneratorFilters/VHtoVVFilter.h"
-#include "GaudiKernel/AlgFactory.h"
VHtoVVFilter::VHtoVVFilter(const std::string& name, ISvcLocator* pSvcLocator)
diff --git a/Generators/GeneratorFilters/src/XtoVVDecayFilter.cxx b/Generators/GeneratorFilters/src/XtoVVDecayFilter.cxx
index 9a5cdd8ab3c..ad145625025 100644
--- a/Generators/GeneratorFilters/src/XtoVVDecayFilter.cxx
+++ b/Generators/GeneratorFilters/src/XtoVVDecayFilter.cxx
@@ -3,7 +3,6 @@
*/
#include "GeneratorFilters/XtoVVDecayFilter.h"
-#include "GaudiKernel/AlgFactory.h"
XtoVVDecayFilter::XtoVVDecayFilter(const std::string& name, ISvcLocator* pSvcLocator)
diff --git a/Generators/GeneratorFilters/src/XtoVVDecayFilterExtended.cxx b/Generators/GeneratorFilters/src/XtoVVDecayFilterExtended.cxx
index 81cb8bf2530..1f8768e29f2 100644
--- a/Generators/GeneratorFilters/src/XtoVVDecayFilterExtended.cxx
+++ b/Generators/GeneratorFilters/src/XtoVVDecayFilterExtended.cxx
@@ -3,7 +3,6 @@
*/
#include "GeneratorFilters/XtoVVDecayFilterExtended.h"
-#include "GaudiKernel/AlgFactory.h"
XtoVVDecayFilterExtended::XtoVVDecayFilterExtended(const std::string& name, ISvcLocator* pSvcLocator)
diff --git a/Generators/GeneratorObjectsAthenaPool/src/McEventCollectionCnv.h b/Generators/GeneratorObjectsAthenaPool/src/McEventCollectionCnv.h
old mode 100755
new mode 100644
index 88dc9efee32..4f389b1811b
--- a/Generators/GeneratorObjectsAthenaPool/src/McEventCollectionCnv.h
+++ b/Generators/GeneratorObjectsAthenaPool/src/McEventCollectionCnv.h
@@ -44,7 +44,9 @@ class McEventCollectionCnv: public T_AthenaPoolCustomCnv<
/** Create the converter from the service locator
*/
+public:
McEventCollectionCnv(ISvcLocator* svcloc);
+protected:
/** Build the persistent representation from the transient one.
*/
diff --git a/Generators/McAsciiEventSelector/src/McAsciiCnvSvc.cxx b/Generators/McAsciiEventSelector/src/McAsciiCnvSvc.cxx
index b0be0c15ba6..4d3245aedbb 100644
--- a/Generators/McAsciiEventSelector/src/McAsciiCnvSvc.cxx
+++ b/Generators/McAsciiEventSelector/src/McAsciiCnvSvc.cxx
@@ -14,8 +14,6 @@
#include <stdexcept>
// Framework includes
-#include "GaudiKernel/SvcFactory.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/GenericAddress.h"
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/IConversionSvc.h"
diff --git a/Generators/McAsciiEventSelector/src/McAsciiEventCnv.cxx b/Generators/McAsciiEventSelector/src/McAsciiEventCnv.cxx
index 12b073449a8..82310455e2a 100644
--- a/Generators/McAsciiEventSelector/src/McAsciiEventCnv.cxx
+++ b/Generators/McAsciiEventSelector/src/McAsciiEventCnv.cxx
@@ -13,7 +13,6 @@
// STL includes
// Framework includes
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/StatusCode.h"
#include "SGTools/StorableConversions.h"
diff --git a/Generators/McAsciiEventSelector/src/McAsciiEventCnv.h b/Generators/McAsciiEventSelector/src/McAsciiEventCnv.h
index 28b2ccc0dca..d860ee5e076 100644
--- a/Generators/McAsciiEventSelector/src/McAsciiEventCnv.h
+++ b/Generators/McAsciiEventSelector/src/McAsciiEventCnv.h
@@ -24,7 +24,6 @@ template <class CnvType> class CnvFactory;
class McAsciiEventCnv : public Converter
{
- friend class CnvFactory<McAsciiEventCnv>;
///////////////////////////////////////////////////////////////////
// Public methods:
@@ -53,11 +52,6 @@ class McAsciiEventCnv : public Converter
StatusCode createObj( IOpaqueAddress* pAddr, DataObject*& pObj );
- ///////////////////////////////////////////////////////////////////
- // Protected methods:
- ///////////////////////////////////////////////////////////////////
- protected:
-
/// Constructor with parameters:
McAsciiEventCnv( ISvcLocator* svcLoc );
};
diff --git a/Generators/McAsciiEventSelector/src/components/McAsciiEventSelector_entries.cxx b/Generators/McAsciiEventSelector/src/components/McAsciiEventSelector_entries.cxx
index 31db103a107..2a1a40f78c4 100644
--- a/Generators/McAsciiEventSelector/src/components/McAsciiEventSelector_entries.cxx
+++ b/Generators/McAsciiEventSelector/src/components/McAsciiEventSelector_entries.cxx
@@ -2,7 +2,7 @@
#include "../McAsciiEventCnv.h"
#include "../McAsciiEventSelector.h"
-DECLARE_CONVERTER_FACTORY( McAsciiEventCnv )
+DECLARE_CONVERTER( McAsciiEventCnv )
DECLARE_COMPONENT( McAsciiCnvSvc )
DECLARE_COMPONENT( McAsciiEventSelector )
diff --git a/Generators/McEventSelector/McEventSelector/McEventCnv.h b/Generators/McEventSelector/McEventSelector/McEventCnv.h
index 63cecf1062e..9f96ec8299d 100644
--- a/Generators/McEventSelector/McEventSelector/McEventCnv.h
+++ b/Generators/McEventSelector/McEventSelector/McEventCnv.h
@@ -16,12 +16,10 @@ template <class TYPE> class CnvFactory;
// Externals
class McEventCnv: public Converter {
- friend class CnvFactory<McEventCnv>;
- protected:
+ public:
McEventCnv(ISvcLocator* svcloc);
- public:
StatusCode createObj(IOpaqueAddress* pAddr, DataObject*& pObj);
/// Storage type and class ID
diff --git a/Generators/McEventSelector/src/McCnvSvc.cxx b/Generators/McEventSelector/src/McCnvSvc.cxx
index 11601d722fa..04800941a7b 100644
--- a/Generators/McEventSelector/src/McCnvSvc.cxx
+++ b/Generators/McEventSelector/src/McCnvSvc.cxx
@@ -13,8 +13,6 @@
// Include files
#include <iostream>
-#include "GaudiKernel/SvcFactory.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/GenericAddress.h"
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/ISvcLocator.h"
diff --git a/Generators/McEventSelector/src/McEventCnv.cxx b/Generators/McEventSelector/src/McEventCnv.cxx
index b578a78242d..72aaf9d5253 100644
--- a/Generators/McEventSelector/src/McEventCnv.cxx
+++ b/Generators/McEventSelector/src/McEventCnv.cxx
@@ -4,7 +4,6 @@
#include "McEventSelector/McEventCnv.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/StatusCode.h"
#include "SGTools/StorableConversions.h"
#include "McEventSelector/McAddress.h"
diff --git a/Generators/McEventSelector/src/McEventSelector.cxx b/Generators/McEventSelector/src/McEventSelector.cxx
index 4ff3fb3bb49..7c27696c514 100644
--- a/Generators/McEventSelector/src/McEventSelector.cxx
+++ b/Generators/McEventSelector/src/McEventSelector.cxx
@@ -31,7 +31,6 @@
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/GenericAddress.h"
#include "GaudiKernel/StatusCode.h"
-#include "GaudiKernel/SvcFactory.h"
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/IIncidentSvc.h"
#include "GaudiKernel/Incident.h"
diff --git a/Generators/McEventSelector/src/McEventSelector_entries.cxx b/Generators/McEventSelector/src/McEventSelector_entries.cxx
index 0461b7826b0..ea30ab2561d 100644
--- a/Generators/McEventSelector/src/McEventSelector_entries.cxx
+++ b/Generators/McEventSelector/src/McEventSelector_entries.cxx
@@ -2,7 +2,7 @@
#include "McEventSelector/McCnvSvc.h"
#include "McEventSelector/McEventSelector.h"
-DECLARE_CONVERTER_FACTORY( McEventCnv )
+DECLARE_CONVERTER( McEventCnv )
DECLARE_COMPONENT( McCnvSvc )
DECLARE_COMPONENT( McEventSelector )
diff --git a/Generators/PythiaB/src/PythiaB.cxx b/Generators/PythiaB/src/PythiaB.cxx
index 50edabd6c40..c2a22b81b22 100644
--- a/Generators/PythiaB/src/PythiaB.cxx
+++ b/Generators/PythiaB/src/PythiaB.cxx
@@ -45,7 +45,6 @@
// Framework Related Headers:-
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/AlgFactory.h"
#include "GaudiKernel/Algorithm.h"
#include "GeneratorObjects/McEventCollection.h"
diff --git a/HLT/Trigger/TrigControl/TrigServices/src/TrigMessageSvc.cxx b/HLT/Trigger/TrigControl/TrigServices/src/TrigMessageSvc.cxx
index 50e2f140fb4..a26fa2f1c0d 100644
--- a/HLT/Trigger/TrigControl/TrigServices/src/TrigMessageSvc.cxx
+++ b/HLT/Trigger/TrigControl/TrigServices/src/TrigMessageSvc.cxx
@@ -8,7 +8,6 @@
#include "GaudiKernel/IIncidentSvc.h"
#include "GaudiKernel/ITHistSvc.h"
#include "GaudiKernel/StatusCode.h"
-#include "GaudiKernel/SvcFactory.h"
#include "GaudiKernel/Message.h"
#include "GaudiKernel/xtoa.h"
#include "GaudiKernel/IJobOptionsSvc.h"
diff --git a/HLT/Trigger/TrigControl/TrigServices/src/TrigMonTHistSvc.cxx b/HLT/Trigger/TrigControl/TrigServices/src/TrigMonTHistSvc.cxx
index a99e0cc7152..bdbe85d3a6a 100644
--- a/HLT/Trigger/TrigControl/TrigServices/src/TrigMonTHistSvc.cxx
+++ b/HLT/Trigger/TrigControl/TrigServices/src/TrigMonTHistSvc.cxx
@@ -3,7 +3,6 @@
*/
-#include "GaudiKernel/SvcFactory.h"
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/ThreadGaudi.h"
diff --git a/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/src/TrigALFAROBMonitor.cxx b/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/src/TrigALFAROBMonitor.cxx
index 9f32e3418bc..6b7f68b4b01 100755
--- a/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/src/TrigALFAROBMonitor.cxx
+++ b/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/src/TrigALFAROBMonitor.cxx
@@ -15,7 +15,6 @@
#include "TrigT1Result/MuCTPI_RDO.h"
#include "TrigT1Result/MuCTPI_MultiplicityWord_Decoder.h"
#include "TrigT1Result/MuCTPI_DataWord_Decoder.h"
-#include "GaudiKernel/AlgFactory.h"
#include "GaudiKernel/ThreadGaudi.h"
#include "GaudiKernel/ITHistSvc.h"
#include "AthenaKernel/Timeout.h"
diff --git a/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/src/TrigMuCTPiROBMonitor.cxx b/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/src/TrigMuCTPiROBMonitor.cxx
index 9cab4af1294..7703d1542f6 100755
--- a/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/src/TrigMuCTPiROBMonitor.cxx
+++ b/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/src/TrigMuCTPiROBMonitor.cxx
@@ -7,7 +7,6 @@
#include "TrigT1Result/MuCTPI_RDO.h"
#include "TrigT1Result/MuCTPI_MultiplicityWord_Decoder.h"
#include "TrigT1Result/MuCTPI_DataWord_Decoder.h"
-#include "GaudiKernel/AlgFactory.h"
#include "GaudiKernel/ThreadGaudi.h"
#include "GaudiKernel/ITHistSvc.h"
#include "AthenaKernel/Timeout.h"
diff --git a/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/src/TrigROBMonitor.cxx b/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/src/TrigROBMonitor.cxx
index 573d1e6bbd3..9c59cab60d0 100755
--- a/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/src/TrigROBMonitor.cxx
+++ b/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/src/TrigROBMonitor.cxx
@@ -3,7 +3,6 @@
*/
#include "TrigOnlineMonitor/TrigROBMonitor.h"
-#include "GaudiKernel/AlgFactory.h"
#include "GaudiKernel/ThreadGaudi.h"
#include "GaudiKernel/ITHistSvc.h"
#include "AthenaKernel/Timeout.h"
diff --git a/InnerDetector/InDetConditions/InDetBeamSpotService/src/BeamCondSvc.cxx b/InnerDetector/InDetConditions/InDetBeamSpotService/src/BeamCondSvc.cxx
index 13be2f71fbc..805a42a936f 100644
--- a/InnerDetector/InDetConditions/InDetBeamSpotService/src/BeamCondSvc.cxx
+++ b/InnerDetector/InDetConditions/InDetBeamSpotService/src/BeamCondSvc.cxx
@@ -5,7 +5,6 @@
// BeamCondSvc.cxx - service giving beamspot data
// Richard Hawkings, started 16/6/05
-#include "GaudiKernel/SvcFactory.h"
#include "AthenaPoolUtilities/AthenaAttributeList.h"
#include "CoralBase/AttributeListException.h"
#include "EventPrimitives/EventPrimitives.h"
diff --git a/InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/src/InDetBSErrContainerCnv.h b/InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/src/InDetBSErrContainerCnv.h
index 33aa036aeb6..9866fd74955 100644
--- a/InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/src/InDetBSErrContainerCnv.h
+++ b/InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/src/InDetBSErrContainerCnv.h
@@ -23,9 +23,10 @@ typedef InDetBSErrContainer_p1 InDetBSErrContainer_PERS;
typedef T_AthenaPoolCustomCnv<InDetBSErrContainer, InDetBSErrContainer_PERS > InDetBSErrContainerCnvBase;
class InDetBSErrContainerCnv : public InDetBSErrContainerCnvBase {
-friend class CnvFactory<InDetBSErrContainerCnv >;
-protected:
+public:
InDetBSErrContainerCnv (ISvcLocator* svcloc) : InDetBSErrContainerCnvBase(svcloc) {}
+
+protected:
virtual InDetBSErrContainer_PERS* createPersistent (InDetBSErrContainer* transCont);
virtual InDetBSErrContainer* createTransient ();
diff --git a/InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/src/SCT_ByteStreamFractionContainerCnv.h b/InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/src/SCT_ByteStreamFractionContainerCnv.h
index 96eb3dc62c1..7d448fb6de3 100644
--- a/InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/src/SCT_ByteStreamFractionContainerCnv.h
+++ b/InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/src/SCT_ByteStreamFractionContainerCnv.h
@@ -24,8 +24,9 @@ typedef T_AthenaPoolCustomCnv<SCT_ByteStreamFractionContainer, SCT_ByteStreamFr
class SCT_ByteStreamFractionContainerCnv : public SCT_ByteStreamFractionContainerCnvBase {
friend class CnvFactory<SCT_ByteStreamFractionContainerCnv>;
-protected:
+public:
SCT_ByteStreamFractionContainerCnv (ISvcLocator* svcloc) : SCT_ByteStreamFractionContainerCnvBase(svcloc) {}
+protected:
virtual SCT_ByteStreamFractionContainer_PERS*createPersistent(SCT_ByteStreamFractionContainer* transCont);
virtual SCT_ByteStreamFractionContainer* createTransient();
diff --git a/InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/src/TRT_BSErrContainerCnv.h b/InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/src/TRT_BSErrContainerCnv.h
index 0cfc32ad52e..465403492b2 100644
--- a/InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/src/TRT_BSErrContainerCnv.h
+++ b/InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/src/TRT_BSErrContainerCnv.h
@@ -23,9 +23,10 @@ typedef TRT_BSErrContainer_p1 TRT_BSErrContainer_PERS;
typedef T_AthenaPoolCustomCnv<TRT_BSErrContainer, TRT_BSErrContainer_PERS > TRT_BSErrContainerCnvBase;
class TRT_BSErrContainerCnv : public TRT_BSErrContainerCnvBase {
-friend class CnvFactory<TRT_BSErrContainerCnv >;
-protected:
+public:
TRT_BSErrContainerCnv (ISvcLocator* svcloc) : TRT_BSErrContainerCnvBase(svcloc) {}
+
+protected:
virtual TRT_BSErrContainer_PERS* createPersistent (TRT_BSErrContainer* transCont);
virtual TRT_BSErrContainer* createTransient ();
diff --git a/InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/src/TRT_BSIdErrContainerCnv.h b/InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/src/TRT_BSIdErrContainerCnv.h
index c7c1f9a8643..825ccb26bee 100644
--- a/InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/src/TRT_BSIdErrContainerCnv.h
+++ b/InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/src/TRT_BSIdErrContainerCnv.h
@@ -23,9 +23,10 @@ typedef TRT_BSIdErrContainer_p1 TRT_BSIdErrContainer_PERS;
typedef T_AthenaPoolCustomCnv<TRT_BSIdErrContainer, TRT_BSIdErrContainer_PERS > TRT_BSIdErrContainerCnvBase;
class TRT_BSIdErrContainerCnv : public TRT_BSIdErrContainerCnvBase {
-friend class CnvFactory<TRT_BSIdErrContainerCnv >;
-protected:
+public:
TRT_BSIdErrContainerCnv (ISvcLocator* svcloc) : TRT_BSIdErrContainerCnvBase(svcloc) {}
+
+protected:
virtual TRT_BSIdErrContainer_PERS* createPersistent (TRT_BSIdErrContainer* transCont);
virtual TRT_BSIdErrContainer* createTransient ();
diff --git a/InnerDetector/InDetConditions/PixelConditionsServices/test/PixelMapTestAlg.cxx b/InnerDetector/InDetConditions/PixelConditionsServices/test/PixelMapTestAlg.cxx
index bd9e82e5e2e..e9c7ccfc4c4 100755
--- a/InnerDetector/InDetConditions/PixelConditionsServices/test/PixelMapTestAlg.cxx
+++ b/InnerDetector/InDetConditions/PixelConditionsServices/test/PixelMapTestAlg.cxx
@@ -10,7 +10,6 @@
#include "AthenaKernel/IOVSvcDefs.h"
// Gaudi includes
-#include "GaudiKernel/AlgFactory.h"
#include "GaudiKernel/GaudiException.h"
// geometry
diff --git a/InnerDetector/InDetConditions/PixelConditionsTools/src/PixelDCSTestReadWrite.cxx b/InnerDetector/InDetConditions/PixelConditionsTools/src/PixelDCSTestReadWrite.cxx
index 009dbe27a3d..f3f03153d4f 100644
--- a/InnerDetector/InDetConditions/PixelConditionsTools/src/PixelDCSTestReadWrite.cxx
+++ b/InnerDetector/InDetConditions/PixelConditionsTools/src/PixelDCSTestReadWrite.cxx
@@ -10,7 +10,6 @@
#include "AthenaKernel/IOVSvcDefs.h"
// Gaudi includes
-#include "GaudiKernel/AlgFactory.h"
//#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/IIncidentSvc.h"
#include "GaudiKernel/GaudiException.h"
diff --git a/InnerDetector/InDetConditions/PixelConditionsTools/src/PixelDistortionsTestReadWrite.cxx b/InnerDetector/InDetConditions/PixelConditionsTools/src/PixelDistortionsTestReadWrite.cxx
index 062ca421434..1a45b17093f 100644
--- a/InnerDetector/InDetConditions/PixelConditionsTools/src/PixelDistortionsTestReadWrite.cxx
+++ b/InnerDetector/InDetConditions/PixelConditionsTools/src/PixelDistortionsTestReadWrite.cxx
@@ -9,7 +9,6 @@
//#include "StoreGate/StoreGateSvc.h"
// Gaudi includes
-#include "GaudiKernel/AlgFactory.h"
#include "InDetReadoutGeometry/SiDetectorManager.h"
#include "InDetReadoutGeometry/SiDetectorElement.h"
diff --git a/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_ByteStream_ConditionsSvc.cxx b/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_ByteStream_ConditionsSvc.cxx
index 7663716b413..1fcf025f49f 100644
--- a/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_ByteStream_ConditionsSvc.cxx
+++ b/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_ByteStream_ConditionsSvc.cxx
@@ -9,7 +9,6 @@
* @author Paul Keener
*/
-#include "GaudiKernel/ToolFactory.h"
#include "TRT_ByteStream_ConditionsSvc.h"
#include "InDetByteStreamErrors/TRT_BSErrContainer.h"
diff --git a/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_DAQ_ConditionsSvc.cxx b/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_DAQ_ConditionsSvc.cxx
index 0edbb347355..285e51981ec 100644
--- a/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_DAQ_ConditionsSvc.cxx
+++ b/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_DAQ_ConditionsSvc.cxx
@@ -8,7 +8,6 @@
*///-------------------------------------------------
// Header Includes
-#include "GaudiKernel/ToolFactory.h"
#include "GaudiKernel/IIncidentSvc.h"
#include "EventInfo/EventInfo.h"
#include "EventInfo/EventID.h"
diff --git a/InnerDetector/InDetDetDescr/SCT_ModuleDistortions/src/SCT_TestDistortionsTool.cxx b/InnerDetector/InDetDetDescr/SCT_ModuleDistortions/src/SCT_TestDistortionsTool.cxx
index 4a4b392d83d..7c1dee3f42b 100644
--- a/InnerDetector/InDetDetDescr/SCT_ModuleDistortions/src/SCT_TestDistortionsTool.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_ModuleDistortions/src/SCT_TestDistortionsTool.cxx
@@ -5,7 +5,6 @@
// Test SCT_DistortionsTool.cxx
//Gaudi
-#include "GaudiKernel/AlgFactory.h"
//Athena
#include "InDetIdentifier/SCT_ID.h"
diff --git a/InnerDetector/InDetDetDescr/TRT_Cabling/src/TRT_CablingSvc.cxx b/InnerDetector/InDetDetDescr/TRT_Cabling/src/TRT_CablingSvc.cxx
index 536b2ced6f7..03900ac4c27 100644
--- a/InnerDetector/InDetDetDescr/TRT_Cabling/src/TRT_CablingSvc.cxx
+++ b/InnerDetector/InDetDetDescr/TRT_Cabling/src/TRT_CablingSvc.cxx
@@ -7,7 +7,6 @@
//
//#include <iostream>
-#include "GaudiKernel/ToolFactory.h"
#include "TRT_CablingSvc.h"
//#include <fstream>
diff --git a/InnerDetector/InDetDetDescr/TRT_Cabling/src/TRT_FillCablingData_DC1.cxx b/InnerDetector/InDetDetDescr/TRT_Cabling/src/TRT_FillCablingData_DC1.cxx
index 008b105218f..94f730dbae5 100644
--- a/InnerDetector/InDetDetDescr/TRT_Cabling/src/TRT_FillCablingData_DC1.cxx
+++ b/InnerDetector/InDetDetDescr/TRT_Cabling/src/TRT_FillCablingData_DC1.cxx
@@ -6,7 +6,6 @@
// Implementation file for TRT_FillCablingData_DC1 class
//
-#include "GaudiKernel/ToolFactory.h"
#include "TRT_FillCablingData_DC1.h"
#include "InDetIdentifier/TRT_ID.h"
#include <iostream>
diff --git a/InnerDetector/InDetDetDescr/TRT_Cabling/src/TRT_FillCablingData_DC2.cxx b/InnerDetector/InDetDetDescr/TRT_Cabling/src/TRT_FillCablingData_DC2.cxx
index 094428b078a..cb0059a86ba 100644
--- a/InnerDetector/InDetDetDescr/TRT_Cabling/src/TRT_FillCablingData_DC2.cxx
+++ b/InnerDetector/InDetDetDescr/TRT_Cabling/src/TRT_FillCablingData_DC2.cxx
@@ -6,7 +6,6 @@
// Implementation file for TRT_FillCablingData_DC2 class
//
-#include "GaudiKernel/ToolFactory.h"
#include "TRT_FillCablingData_DC2.h"
#include "InDetIdentifier/TRT_ID.h"
#include <iostream>
diff --git a/InnerDetector/InDetDetDescr/TRT_Cabling/src/TRT_FillCablingData_DC3.cxx b/InnerDetector/InDetDetDescr/TRT_Cabling/src/TRT_FillCablingData_DC3.cxx
index 27abf0a9744..b7d262256ac 100644
--- a/InnerDetector/InDetDetDescr/TRT_Cabling/src/TRT_FillCablingData_DC3.cxx
+++ b/InnerDetector/InDetDetDescr/TRT_Cabling/src/TRT_FillCablingData_DC3.cxx
@@ -38,7 +38,6 @@
#include <stdio.h>
#include <iostream>
-#include "GaudiKernel/ToolFactory.h"
#include "TRT_FillCablingData_DC3.h"
#include <fstream>
diff --git a/InnerDetector/InDetDetDescr/TRT_Cabling/src/TRT_FillCablingData_SR1.cxx b/InnerDetector/InDetDetDescr/TRT_Cabling/src/TRT_FillCablingData_SR1.cxx
index b23a17b0a9d..276139525a6 100644
--- a/InnerDetector/InDetDetDescr/TRT_Cabling/src/TRT_FillCablingData_SR1.cxx
+++ b/InnerDetector/InDetDetDescr/TRT_Cabling/src/TRT_FillCablingData_SR1.cxx
@@ -21,7 +21,6 @@
#include <fstream>
-#include "GaudiKernel/ToolFactory.h"
#include "eformat/SourceIdentifier.h" // change to new eformat v3
diff --git a/InnerDetector/InDetDetDescr/TRT_Cabling/src/TRT_FillCablingData_SR1_ECC.cxx b/InnerDetector/InDetDetDescr/TRT_Cabling/src/TRT_FillCablingData_SR1_ECC.cxx
index b1075f1c1e7..d1bcb65d292 100644
--- a/InnerDetector/InDetDetDescr/TRT_Cabling/src/TRT_FillCablingData_SR1_ECC.cxx
+++ b/InnerDetector/InDetDetDescr/TRT_Cabling/src/TRT_FillCablingData_SR1_ECC.cxx
@@ -22,7 +22,6 @@
//#include <stdio.h>
//#include <iostream>
-#include "GaudiKernel/ToolFactory.h"
#include "TRT_FillCablingData_SR1_ECC.h"
#include <fstream>
diff --git a/InnerDetector/InDetDetDescr/TRT_Cabling/src/TRT_FillCablingData_TB04.cxx b/InnerDetector/InDetDetDescr/TRT_Cabling/src/TRT_FillCablingData_TB04.cxx
index 56410be9ef4..b272417dcc2 100644
--- a/InnerDetector/InDetDetDescr/TRT_Cabling/src/TRT_FillCablingData_TB04.cxx
+++ b/InnerDetector/InDetDetDescr/TRT_Cabling/src/TRT_FillCablingData_TB04.cxx
@@ -20,7 +20,6 @@
//#include <iostream>
-#include "GaudiKernel/ToolFactory.h"
#include "TRT_FillCablingData_TB04.h"
#include <fstream>
diff --git a/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/InDetIdCnv_entries.cxx b/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/InDetIdCnv_entries.cxx
index 1c559c85c6b..06d053ac9e8 100644
--- a/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/InDetIdCnv_entries.cxx
+++ b/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/InDetIdCnv_entries.cxx
@@ -3,8 +3,8 @@
#include "SiliconIDDetDescrCnv.h"
#include "TRT_IDDetDescrCnv.h"
-DECLARE_CONVERTER_FACTORY(SCT_IDDetDescrCnv)
-DECLARE_CONVERTER_FACTORY(PixelIDDetDescrCnv)
-DECLARE_CONVERTER_FACTORY(SiliconIDDetDescrCnv)
-DECLARE_CONVERTER_FACTORY(TRT_IDDetDescrCnv)
+DECLARE_CONVERTER(SCT_IDDetDescrCnv)
+DECLARE_CONVERTER(PixelIDDetDescrCnv)
+DECLARE_CONVERTER(SiliconIDDetDescrCnv)
+DECLARE_CONVERTER(TRT_IDDetDescrCnv)
diff --git a/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/PixelIDDetDescrCnv.cxx b/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/PixelIDDetDescrCnv.cxx
old mode 100755
new mode 100644
index e9c36943a83..0937c86e3f7
--- a/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/PixelIDDetDescrCnv.cxx
+++ b/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/PixelIDDetDescrCnv.cxx
@@ -17,7 +17,6 @@
#include "DetDescrCnvSvc/DetDescrConverter.h"
#include "DetDescrCnvSvc/DetDescrAddress.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/CnvFactory.h"
#include "StoreGate/StoreGate.h"
#include "IdDictDetDescr/IdDictManager.h"
diff --git a/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/PixelIDDetDescrCnv.h b/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/PixelIDDetDescrCnv.h
old mode 100755
new mode 100644
index 8b0227406ee..63b248268c1
--- a/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/PixelIDDetDescrCnv.h
+++ b/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/PixelIDDetDescrCnv.h
@@ -35,7 +35,6 @@ class PixelID;
**/
class PixelIDDetDescrCnv: public DetDescrConverter {
- friend class CnvFactory<PixelIDDetDescrCnv>;
public:
@@ -48,7 +47,6 @@ public:
static long storageType();
static const CLID& classID();
-protected:
PixelIDDetDescrCnv(ISvcLocator* svcloc);
private:
diff --git a/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/SCT_IDDetDescrCnv.cxx b/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/SCT_IDDetDescrCnv.cxx
old mode 100755
new mode 100644
index 42cead1f4ef..80075761662
--- a/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/SCT_IDDetDescrCnv.cxx
+++ b/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/SCT_IDDetDescrCnv.cxx
@@ -17,7 +17,6 @@
#include "DetDescrCnvSvc/DetDescrConverter.h"
#include "DetDescrCnvSvc/DetDescrAddress.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/CnvFactory.h"
#include "StoreGate/StoreGate.h"
#include "IdDictDetDescr/IdDictManager.h"
diff --git a/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/SCT_IDDetDescrCnv.h b/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/SCT_IDDetDescrCnv.h
old mode 100755
new mode 100644
index 61c4f06a574..c352546fe3e
--- a/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/SCT_IDDetDescrCnv.h
+++ b/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/SCT_IDDetDescrCnv.h
@@ -36,7 +36,6 @@ class SCT_ID;
**/
class SCT_IDDetDescrCnv: public DetDescrConverter {
- friend class CnvFactory<SCT_IDDetDescrCnv>;
public:
virtual long int repSvcType() const;
@@ -48,7 +47,6 @@ public:
static long storageType();
static const CLID& classID();
-protected:
SCT_IDDetDescrCnv(ISvcLocator* svcloc);
private:
diff --git a/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/SiliconIDDetDescrCnv.cxx b/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/SiliconIDDetDescrCnv.cxx
old mode 100755
new mode 100644
index 1062491cee9..f7a9302786f
--- a/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/SiliconIDDetDescrCnv.cxx
+++ b/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/SiliconIDDetDescrCnv.cxx
@@ -17,7 +17,6 @@
#include "DetDescrCnvSvc/DetDescrConverter.h"
#include "DetDescrCnvSvc/DetDescrAddress.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/CnvFactory.h"
#include "StoreGate/StoreGate.h"
#include "IdDictDetDescr/IdDictManager.h"
diff --git a/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/SiliconIDDetDescrCnv.h b/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/SiliconIDDetDescrCnv.h
old mode 100755
new mode 100644
index e738f29f123..b2b50f2d95a
--- a/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/SiliconIDDetDescrCnv.h
+++ b/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/SiliconIDDetDescrCnv.h
@@ -35,7 +35,6 @@ class SiliconID;
**/
class SiliconIDDetDescrCnv: public DetDescrConverter {
- friend class CnvFactory<SiliconIDDetDescrCnv>;
public:
@@ -48,7 +47,6 @@ public:
static long storageType();
static const CLID& classID();
-protected:
SiliconIDDetDescrCnv(ISvcLocator* svcloc);
private:
diff --git a/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/TRT_IDDetDescrCnv.cxx b/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/TRT_IDDetDescrCnv.cxx
old mode 100755
new mode 100644
index 3a96173ec4e..8804f39781c
--- a/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/TRT_IDDetDescrCnv.cxx
+++ b/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/TRT_IDDetDescrCnv.cxx
@@ -17,7 +17,6 @@
#include "DetDescrCnvSvc/DetDescrConverter.h"
#include "DetDescrCnvSvc/DetDescrAddress.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/CnvFactory.h"
#include "StoreGate/StoreGate.h"
#include "IdDictDetDescr/IdDictManager.h"
diff --git a/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/TRT_IDDetDescrCnv.h b/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/TRT_IDDetDescrCnv.h
old mode 100755
new mode 100644
index c6c41334f5a..4f036fa03fb
--- a/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/TRT_IDDetDescrCnv.h
+++ b/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/TRT_IDDetDescrCnv.h
@@ -36,7 +36,6 @@ class TRT_ID;
**/
class TRT_IDDetDescrCnv: public DetDescrConverter {
- friend class CnvFactory<TRT_IDDetDescrCnv>;
public:
@@ -49,7 +48,6 @@ public:
static long storageType();
static const CLID& classID();
-protected:
TRT_IDDetDescrCnv(ISvcLocator* svcloc);
private:
diff --git a/InnerDetector/InDetDigitization/PixelDigitization/src/ChargeCollProbSvc.cxx b/InnerDetector/InDetDigitization/PixelDigitization/src/ChargeCollProbSvc.cxx
index 570b6b3bd23..229925664ad 100644
--- a/InnerDetector/InDetDigitization/PixelDigitization/src/ChargeCollProbSvc.cxx
+++ b/InnerDetector/InDetDigitization/PixelDigitization/src/ChargeCollProbSvc.cxx
@@ -6,7 +6,6 @@
#include "src/IChargeCollProbSvc.h"
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/IToolSvc.h"
-#include "GaudiKernel/SvcFactory.h"
#include "GaudiKernel/IConversionSvc.h"
#include "GaudiKernel/ServiceHandle.h"
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 ee3cde9e4b7..2f02d983608 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,5 @@
#include "BCM_RawDataByteStreamCnv/BCM_RawContByteStreamCnv.h"
-DECLARE_CONVERTER_FACTORY( BCM_RawContByteStreamCnv )
+DECLARE_CONVERTER( BCM_RawContByteStreamCnv )
#include "BCM_RawDataByteStreamCnv/BCM_RawContByteStreamTool.h"
DECLARE_COMPONENT( BCM_RawContByteStreamTool )
diff --git a/InnerDetector/InDetEventCnv/InDetBCM_EventAthenaPool/src/BCM_RDO_ContainerCnv.h b/InnerDetector/InDetEventCnv/InDetBCM_EventAthenaPool/src/BCM_RDO_ContainerCnv.h
index 9e82862989e..66c08c64ffd 100755
--- a/InnerDetector/InDetEventCnv/InDetBCM_EventAthenaPool/src/BCM_RDO_ContainerCnv.h
+++ b/InnerDetector/InDetEventCnv/InDetBCM_EventAthenaPool/src/BCM_RDO_ContainerCnv.h
@@ -9,17 +9,16 @@
#define INDETBCM_EVENTATHENAPOOL_BCM_RDO_CONTAINERCNV_H
#include "AthenaPoolCnvSvc/T_AthenaPoolCustomCnv.h"
-#include "GaudiKernel/CnvFactory.h"
#include "InDetBCM_RawData/BCM_RDO_Container.h"
#include "InDetBCM_EventAthenaPool/BCM_RDO_Container_p0.h"
#include "BCM_RDO_ContainerCnv_p0.h"
class BCM_RDO_ContainerCnv : public T_AthenaPoolCustomCnv<BCM_RDO_Container,BCM_RDO_Container_p0> {
- friend class CnvFactory<BCM_RDO_ContainerCnv>;
-
- protected:
+public:
BCM_RDO_ContainerCnv(ISvcLocator* svcloc) : T_AthenaPoolCustomCnv<BCM_RDO_Container, BCM_RDO_Container_p0>(svcloc) {}
+
+ protected:
virtual BCM_RDO_Container_p0* createPersistent(BCM_RDO_Container* transCont);
virtual BCM_RDO_Container* createTransient();
diff --git a/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/InDetLowBetaCandidateCnv.h b/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/InDetLowBetaCandidateCnv.h
index ad0286891c8..cdaef25db6d 100644
--- a/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/InDetLowBetaCandidateCnv.h
+++ b/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/InDetLowBetaCandidateCnv.h
@@ -22,7 +22,9 @@ class InDetLowBetaCandidateCnv : public T_AthenaPoolCustomCnv<InDet::InDetLowBe
protected:
+public:
InDetLowBetaCandidateCnv(ISvcLocator* svcloc);
+protected:
~InDetLowBetaCandidateCnv();
InDetLowBetaCandidate_PERS* createPersistent(InDet::InDetLowBetaCandidate* transCont);
diff --git a/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/InDetLowBetaContainerCnv.h b/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/InDetLowBetaContainerCnv.h
index 46346f1b954..4e0dd783013 100644
--- a/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/InDetLowBetaContainerCnv.h
+++ b/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/InDetLowBetaContainerCnv.h
@@ -30,7 +30,9 @@ class InDetLowBetaContainerCnv : public InDetLowBetaContainerCnvBase {
protected:
+public:
InDetLowBetaContainerCnv(ISvcLocator *svcloc);
+protected:
~InDetLowBetaContainerCnv();
virtual InDetLowBetaContainer_PERS *createPersistent(InDet::InDetLowBetaContainer *transObj);
diff --git a/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/InDetSimDataCollectionCnv.h b/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/InDetSimDataCollectionCnv.h
index 567ddeca780..653b709f796 100644
--- a/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/InDetSimDataCollectionCnv.h
+++ b/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/InDetSimDataCollectionCnv.h
@@ -25,7 +25,9 @@ class InDetSimDataCollectionCnv : public InDetSimDataCollectionCnvBase {
friend class CnvFactory<InDetSimDataCollectionCnv >;
protected:
+public:
InDetSimDataCollectionCnv (ISvcLocator* svcloc) : InDetSimDataCollectionCnvBase(svcloc) {}
+protected:
virtual InDetSimDataCollection_PERS* createPersistent (InDetSimDataCollection* transCont);
virtual InDetSimDataCollection* createTransient ();
};
diff --git a/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/InDetTrackCnv.h b/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/InDetTrackCnv.h
index a161ce6f56a..328af80ffb3 100644
--- a/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/InDetTrackCnv.h
+++ b/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/InDetTrackCnv.h
@@ -27,7 +27,9 @@ class InDetTrackCnv : public InDetTrackCnvBase
friend class CnvFactory<InDetTrackCnv>;
protected:
+public:
InDetTrackCnv( ISvcLocator *svcloc );
+protected:
virtual StatusCode initialize();
diff --git a/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/PixelClusterContainerCnv.h b/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/PixelClusterContainerCnv.h
index b86c6ddfdc9..a77e8209497 100644
--- a/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/PixelClusterContainerCnv.h
+++ b/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/PixelClusterContainerCnv.h
@@ -47,7 +47,9 @@ class PixelClusterContainerCnv : public PixelClusterContainerCnvBase
StoreGateSvc* m_storeGate;
protected:
+public:
PixelClusterContainerCnv (ISvcLocator* svcloc);
+protected:
~PixelClusterContainerCnv();
virtual PixelClusterContainer_PERS* createPersistent (InDet::PixelClusterContainer* transCont);
virtual InDet::PixelClusterContainer* createTransient ();
diff --git a/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/PixelClusterContainerCnv_p0.cxx b/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/PixelClusterContainerCnv_p0.cxx
index 1d85c7a303f..1fdef16f373 100644
--- a/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/PixelClusterContainerCnv_p0.cxx
+++ b/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/PixelClusterContainerCnv_p0.cxx
@@ -10,7 +10,6 @@
// Gaudi
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/Bootstrap.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/Service.h"
#include "GaudiKernel/MsgStream.h"
diff --git a/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/PixelGangedClusterAmbiguitiesCnv.h b/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/PixelGangedClusterAmbiguitiesCnv.h
index 3da1affd7ff..758951702bf 100644
--- a/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/PixelGangedClusterAmbiguitiesCnv.h
+++ b/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/PixelGangedClusterAmbiguitiesCnv.h
@@ -22,7 +22,9 @@ typedef T_AthenaPoolCustomCnv<InDet::PixelGangedClusterAmbiguities, PixelGanged
class PixelGangedClusterAmbiguitiesCnv : public PixelGangedClusterAmbiguitiesCnvBase {
friend class CnvFactory<PixelGangedClusterAmbiguitiesCnv >;
protected:
+public:
PixelGangedClusterAmbiguitiesCnv (ISvcLocator* svcloc) : PixelGangedClusterAmbiguitiesCnvBase(svcloc, "PixelGangedClusterAmbiguitiesConverter") {}
+protected:
virtual PixelGangedClusterAmbiguities_PERS* createPersistent (InDet::PixelGangedClusterAmbiguities* transObj);
virtual InDet::PixelGangedClusterAmbiguities* createTransient ();
};
diff --git a/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/PixelRDO_ContainerCnv.h b/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/PixelRDO_ContainerCnv.h
index d465136586a..b30ad0ec16f 100644
--- a/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/PixelRDO_ContainerCnv.h
+++ b/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/PixelRDO_ContainerCnv.h
@@ -37,12 +37,13 @@ class PixelRDO_ContainerCnv : public PixelRDO_ContainerCnvBase {
// Should not be needed at some point.
StoreGateSvc* m_storeGate;
-protected:
+public:
PixelRDO_ContainerCnv (ISvcLocator* svcloc)
: PixelRDO_ContainerCnvBase(svcloc, "PixelRDO_ContainerCnv"),
m_converter_p0(),
m_storeGate(nullptr)
{}
+protected:
virtual PixelRDO_Container_PERS* createPersistent (PixelRDO_Container* transCont);
virtual PixelRDO_Container* createTransient ();
diff --git a/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/SCT_ClusterContainerCnv.h b/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/SCT_ClusterContainerCnv.h
index 027a1e159ac..61f028c594a 100644
--- a/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/SCT_ClusterContainerCnv.h
+++ b/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/SCT_ClusterContainerCnv.h
@@ -47,7 +47,9 @@ class SCT_ClusterContainerCnv : public SCT_ClusterContainerCnvBase
StoreGateSvc* m_storeGate;
protected:
+public:
SCT_ClusterContainerCnv (ISvcLocator* svcloc);
+protected:
~SCT_ClusterContainerCnv();
virtual SCT_ClusterContainer_PERS* createPersistent (InDet::SCT_ClusterContainer* transCont);
virtual InDet::SCT_ClusterContainer* createTransient ();
diff --git a/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/SCT_ClusterContainerCnv_p0.cxx b/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/SCT_ClusterContainerCnv_p0.cxx
index 7c732c1adc6..8fc9018e228 100644
--- a/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/SCT_ClusterContainerCnv_p0.cxx
+++ b/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/SCT_ClusterContainerCnv_p0.cxx
@@ -10,7 +10,6 @@
// Gaudi
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/Bootstrap.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/Service.h"
#include "GaudiKernel/MsgStream.h"
diff --git a/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/SCT_RDO_ContainerCnv.h b/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/SCT_RDO_ContainerCnv.h
index 5ae704fe943..f45e3ab03c8 100644
--- a/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/SCT_RDO_ContainerCnv.h
+++ b/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/SCT_RDO_ContainerCnv.h
@@ -41,7 +41,9 @@ class SCT_RDO_ContainerCnv : public SCT_RDO_ContainerCnvBase {
StoreGateSvc* m_storeGate;
protected:
+public:
SCT_RDO_ContainerCnv (ISvcLocator* svcloc);
+protected:
virtual SCT_RDO_Container_PERS* createPersistent (SCT_RDO_Container* transCont);
virtual SCT_RDO_Container* createTransient ();
diff --git a/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/TRT_DriftCircleContainerCnv.h b/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/TRT_DriftCircleContainerCnv.h
index 3ae53a511fe..9c160bc7d1d 100644
--- a/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/TRT_DriftCircleContainerCnv.h
+++ b/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/TRT_DriftCircleContainerCnv.h
@@ -34,7 +34,9 @@ class TRT_DriftCircleContainerCnv : public TRT_DriftCircleContainerCnvBase
StoreGateSvc* m_storeGate;
protected:
+public:
TRT_DriftCircleContainerCnv (ISvcLocator* svcloc);
+protected:
~TRT_DriftCircleContainerCnv();
virtual TRT_DriftCircleContainer_PERS* createPersistent (InDet::TRT_DriftCircleContainer* transCont);
virtual InDet::TRT_DriftCircleContainer* createTransient ();
diff --git a/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/TRT_DriftCircleContainerCnv_p0.cxx b/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/TRT_DriftCircleContainerCnv_p0.cxx
index 14caa163a9b..d9d0e50edaa 100644
--- a/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/TRT_DriftCircleContainerCnv_p0.cxx
+++ b/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/TRT_DriftCircleContainerCnv_p0.cxx
@@ -11,7 +11,6 @@
// Gaudi
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/Bootstrap.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/Service.h"
#include "GaudiKernel/MsgStream.h"
diff --git a/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/TRT_RDO_ContainerCnv.h b/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/TRT_RDO_ContainerCnv.h
index b761e4d1001..ef4b23321d6 100644
--- a/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/TRT_RDO_ContainerCnv.h
+++ b/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/TRT_RDO_ContainerCnv.h
@@ -39,13 +39,14 @@ class TRT_RDO_ContainerCnv : public TRT_RDO_ContainerCnvBase {
// Should not be needed at some point.
StoreGateSvc* m_storeGate;
-protected:
+public:
TRT_RDO_ContainerCnv (ISvcLocator* svcloc)
: TRT_RDO_ContainerCnvBase(svcloc, "TRT_RDO_ContainerCnv"),
m_converter_p1(),
m_converter_p0(),
m_storeGate(nullptr)
{}
+protected:
virtual TRT_RDO_Container_PERS* createPersistent (TRT_RDO_Container* transCont);
virtual TRT_RDO_Container* createTransient ();
diff --git a/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/InDetPrepRawData/PixelClusterContainerCnv_p1.cxx b/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/InDetPrepRawData/PixelClusterContainerCnv_p1.cxx
index bcc3e5ea0f1..b1b113b583a 100644
--- a/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/InDetPrepRawData/PixelClusterContainerCnv_p1.cxx
+++ b/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/InDetPrepRawData/PixelClusterContainerCnv_p1.cxx
@@ -14,7 +14,6 @@
// Gaudi
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/Bootstrap.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/Service.h"
#include "GaudiKernel/MsgStream.h"
diff --git a/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/InDetPrepRawData/PixelGangedClusterAmbiguitiesCnv_p1.cxx b/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/InDetPrepRawData/PixelGangedClusterAmbiguitiesCnv_p1.cxx
index aa5c495a779..6f172b6ea1f 100644
--- a/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/InDetPrepRawData/PixelGangedClusterAmbiguitiesCnv_p1.cxx
+++ b/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/InDetPrepRawData/PixelGangedClusterAmbiguitiesCnv_p1.cxx
@@ -12,7 +12,6 @@
// Gaudi
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/Bootstrap.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/Service.h"
#include "GaudiKernel/MsgStream.h"
diff --git a/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/InDetPrepRawData/SCT_ClusterContainerCnv_p1.cxx b/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/InDetPrepRawData/SCT_ClusterContainerCnv_p1.cxx
index 49e3b51721e..142e4f1993a 100644
--- a/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/InDetPrepRawData/SCT_ClusterContainerCnv_p1.cxx
+++ b/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/InDetPrepRawData/SCT_ClusterContainerCnv_p1.cxx
@@ -14,7 +14,6 @@
// Gaudi
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/Bootstrap.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/Service.h"
#include "GaudiKernel/MsgStream.h"
diff --git a/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/InDetPrepRawData/TRT_DriftCircleContainerCnv_p1.cxx b/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/InDetPrepRawData/TRT_DriftCircleContainerCnv_p1.cxx
index ee46ba310ab..b1ec2070778 100644
--- a/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/InDetPrepRawData/TRT_DriftCircleContainerCnv_p1.cxx
+++ b/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/InDetPrepRawData/TRT_DriftCircleContainerCnv_p1.cxx
@@ -15,7 +15,6 @@
// Gaudi
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/Bootstrap.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/Service.h"
#include "GaudiKernel/MsgStream.h"
diff --git a/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/PixelClusterContainerCnv_p2.cxx b/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/PixelClusterContainerCnv_p2.cxx
index e32a38bdf4c..bc16bbd366c 100644
--- a/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/PixelClusterContainerCnv_p2.cxx
+++ b/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/PixelClusterContainerCnv_p2.cxx
@@ -18,7 +18,6 @@
// Gaudi
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/Bootstrap.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/Service.h"
#include "GaudiKernel/MsgStream.h"
diff --git a/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/PixelClusterContainerCnv_p3.cxx b/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/PixelClusterContainerCnv_p3.cxx
index 92decc31bfd..b27fc4e4790 100644
--- a/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/PixelClusterContainerCnv_p3.cxx
+++ b/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/PixelClusterContainerCnv_p3.cxx
@@ -18,7 +18,6 @@
// Gaudi
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/Bootstrap.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/Service.h"
#include "GaudiKernel/MsgStream.h"
diff --git a/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/SCT_ClusterContainerCnv_p2.cxx b/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/SCT_ClusterContainerCnv_p2.cxx
index c80ef83f6d5..687f7682eb0 100644
--- a/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/SCT_ClusterContainerCnv_p2.cxx
+++ b/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/SCT_ClusterContainerCnv_p2.cxx
@@ -18,7 +18,6 @@
// Gaudi
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/Bootstrap.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/Service.h"
#include "GaudiKernel/MsgStream.h"
diff --git a/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/SCT_ClusterContainerCnv_p3.cxx b/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/SCT_ClusterContainerCnv_p3.cxx
index 9de6d5cbae4..efe5cfb1bd3 100644
--- a/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/SCT_ClusterContainerCnv_p3.cxx
+++ b/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/SCT_ClusterContainerCnv_p3.cxx
@@ -18,7 +18,6 @@
// Gaudi
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/Bootstrap.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/Service.h"
#include "GaudiKernel/MsgStream.h"
diff --git a/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/TRT_DriftCircleContainerCnv_p2.cxx b/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/TRT_DriftCircleContainerCnv_p2.cxx
index 108c2f3e11e..6d634a651d8 100644
--- a/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/TRT_DriftCircleContainerCnv_p2.cxx
+++ b/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/TRT_DriftCircleContainerCnv_p2.cxx
@@ -18,7 +18,6 @@
// Gaudi
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/Bootstrap.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/Service.h"
#include "GaudiKernel/MsgStream.h"
diff --git a/InnerDetector/InDetEventCnv/InDetSimEventAthenaPool/src/SiHitCollectionCnv.h b/InnerDetector/InDetEventCnv/InDetSimEventAthenaPool/src/SiHitCollectionCnv.h
index 4a2d322ef88..36f053cb2db 100644
--- a/InnerDetector/InDetEventCnv/InDetSimEventAthenaPool/src/SiHitCollectionCnv.h
+++ b/InnerDetector/InDetEventCnv/InDetSimEventAthenaPool/src/SiHitCollectionCnv.h
@@ -23,9 +23,10 @@ typedef SiHitCollectionCnv_p2 SiHitCollectionCnv_PERS;
class SiHitCollectionCnv : public T_AthenaPoolCustomCnv<SiHitCollection, SiHitCollection_PERS > {
friend class CnvFactory<SiHitCollectionCnv>;
-protected:
+public:
SiHitCollectionCnv(ISvcLocator* svcloc) :
T_AthenaPoolCustomCnv<SiHitCollection, SiHitCollection_PERS >( svcloc) {}
+protected:
SiHitCollection_PERS* createPersistent(SiHitCollection* transCont);
SiHitCollection* createTransient ();
};
diff --git a/InnerDetector/InDetEventCnv/InDetSimEventAthenaPool/src/TRTUncompressedHitCollectionCnv.h b/InnerDetector/InDetEventCnv/InDetSimEventAthenaPool/src/TRTUncompressedHitCollectionCnv.h
index dbee4527aac..d8e393186cc 100755
--- a/InnerDetector/InDetEventCnv/InDetSimEventAthenaPool/src/TRTUncompressedHitCollectionCnv.h
+++ b/InnerDetector/InDetEventCnv/InDetSimEventAthenaPool/src/TRTUncompressedHitCollectionCnv.h
@@ -28,9 +28,10 @@ typedef TRT_HitCollectionCnv_p3 TRT_HitCollectionCnv_PERS;
class TRTUncompressedHitCollectionCnv : public T_AthenaPoolCustomCnv<TRTUncompressedHitCollection, TRT_HitCollection_PERS > {
friend class CnvFactory<TRTUncompressedHitCollectionCnv>;
-protected:
+public:
TRTUncompressedHitCollectionCnv(ISvcLocator* svcloc) :
T_AthenaPoolCustomCnv<TRTUncompressedHitCollection, TRT_HitCollection_PERS >( svcloc) {}
+protected:
TRT_HitCollection_PERS* createPersistent(TRTUncompressedHitCollection* transCont);
TRTUncompressedHitCollection* createTransient ();
};
diff --git a/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/PixelRawContByteStreamCnv.h b/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/PixelRawContByteStreamCnv.h
index 426906a1133..890f100d716 100644
--- a/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/PixelRawContByteStreamCnv.h
+++ b/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/PixelRawContByteStreamCnv.h
@@ -42,13 +42,10 @@ class IChronoStatSvc;
class PixelRawContByteStreamCnv: public Converter {
- // friend class CnvFactory<PixelRawContByteStreamCnv>;
-
~PixelRawContByteStreamCnv( );
public:
-
typedef InDetRawDataCollection<Pixel1RawData> COLLECTION; // define collection format here
PixelRawContByteStreamCnv(ISvcLocator* svcloc);
diff --git a/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/components/PixelRawDataByteStreamCnv_entries.cxx b/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/components/PixelRawDataByteStreamCnv_entries.cxx
index 981c2099f56..8c1e32d1d4a 100644
--- a/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/components/PixelRawDataByteStreamCnv_entries.cxx
+++ b/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/components/PixelRawDataByteStreamCnv_entries.cxx
@@ -1,5 +1,5 @@
#include "../PixelRawContByteStreamCnv.h"
-DECLARE_CONVERTER_FACTORY( PixelRawContByteStreamCnv )
+DECLARE_CONVERTER( PixelRawContByteStreamCnv )
#include "../PixelRawContByteStreamTool.h"
DECLARE_COMPONENT( PixelRawContByteStreamTool )
diff --git a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCTRawContByteStreamCnv.h b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCTRawContByteStreamCnv.h
index 7da6d4831bc..57355643c18 100644
--- a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCTRawContByteStreamCnv.h
+++ b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCTRawContByteStreamCnv.h
@@ -32,15 +32,11 @@ extern long ByteStream_StorageType;
* to do the actual converting. */
class SCTRawContByteStreamCnv: public Converter {
- friend class CnvFactory<SCTRawContByteStreamCnv>;
-
~SCTRawContByteStreamCnv();
- protected:
-
+ public:
SCTRawContByteStreamCnv(ISvcLocator* svcloc);
- public:
typedef SCT_RDO_Container SCTRawContainer;
/** Storage type and class ID */
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 264fbc38e1d..7e8bf602e9c 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,5 @@
#include "../SCTRawContByteStreamCnv.h"
-DECLARE_CONVERTER_FACTORY( SCTRawContByteStreamCnv )
+DECLARE_CONVERTER( SCTRawContByteStreamCnv )
#include "../SCTRawContByteStreamService.h"
DECLARE_COMPONENT( SCTRawContByteStreamService )
diff --git a/InnerDetector/InDetEventCnv/TRT_RawDataByteStreamCnv/src/TRTRawContByteStreamCnv.h b/InnerDetector/InDetEventCnv/TRT_RawDataByteStreamCnv/src/TRTRawContByteStreamCnv.h
index 1539c2b3168..e23a1a6bec9 100644
--- a/InnerDetector/InDetEventCnv/TRT_RawDataByteStreamCnv/src/TRTRawContByteStreamCnv.h
+++ b/InnerDetector/InDetEventCnv/TRT_RawDataByteStreamCnv/src/TRTRawContByteStreamCnv.h
@@ -27,15 +27,11 @@ extern long ByteStream_StorageType;
// the converter for writing BS from TRT Raw Data
class TRTRawContByteStreamCnv: public Converter {
- friend class CnvFactory<TRTRawContByteStreamCnv>;
-
~TRTRawContByteStreamCnv( );
-
- protected:
-
- TRTRawContByteStreamCnv(ISvcLocator* svcloc);
public:
+ TRTRawContByteStreamCnv(ISvcLocator* svcloc);
+
typedef TRT_RDO_Container TRTRawContainer;
//! Storage type and class ID
diff --git a/InnerDetector/InDetEventCnv/TRT_RawDataByteStreamCnv/src/TRTRawContByteStreamTool.cxx b/InnerDetector/InDetEventCnv/TRT_RawDataByteStreamCnv/src/TRTRawContByteStreamTool.cxx
index e8728b1d811..fa9ed3d1ca5 100644
--- a/InnerDetector/InDetEventCnv/TRT_RawDataByteStreamCnv/src/TRTRawContByteStreamTool.cxx
+++ b/InnerDetector/InDetEventCnv/TRT_RawDataByteStreamCnv/src/TRTRawContByteStreamTool.cxx
@@ -7,7 +7,6 @@
#include "ByteStreamCnvSvcBase/FullEventAssembler.h"
#include "ByteStreamCnvSvcBase/SrcIdMap.h"
-#include "GaudiKernel/ToolFactory.h"
#include "GaudiKernel/MsgStream.h"
diff --git a/InnerDetector/InDetEventCnv/TRT_RawDataByteStreamCnv/src/TRTRawDataProviderTool.cxx b/InnerDetector/InDetEventCnv/TRT_RawDataByteStreamCnv/src/TRTRawDataProviderTool.cxx
index 7e22fbfbc08..8b6ce3ecf26 100644
--- a/InnerDetector/InDetEventCnv/TRT_RawDataByteStreamCnv/src/TRTRawDataProviderTool.cxx
+++ b/InnerDetector/InDetEventCnv/TRT_RawDataByteStreamCnv/src/TRTRawDataProviderTool.cxx
@@ -6,7 +6,6 @@
//#include "TRT_ConditionsServices/ITRT_ByteStream_ConditionsSvc.h"
#include "TRTRawDataProviderTool.h"
-#include "GaudiKernel/ToolFactory.h"
#include "GaudiKernel/IToolSvc.h"
#include "InDetRawData/TRT_RDORawData.h"
#include "ByteStreamData/RawEvent.h"
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 155c2d0b2a2..4a8735df01c 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,5 @@
#include "../TRTRawContByteStreamCnv.h"
-DECLARE_CONVERTER_FACTORY( TRTRawContByteStreamCnv )
+DECLARE_CONVERTER( TRTRawContByteStreamCnv )
#include "../TRTRawContByteStreamTool.h"
DECLARE_COMPONENT( TRTRawContByteStreamTool )
diff --git a/InnerDetector/InDetRecTools/InDetSVWithMuonTool/src/InDetSVWithMuonTool.cxx b/InnerDetector/InDetRecTools/InDetSVWithMuonTool/src/InDetSVWithMuonTool.cxx
index 3bd548713e9..c818897aa10 100755
--- a/InnerDetector/InDetRecTools/InDetSVWithMuonTool/src/InDetSVWithMuonTool.cxx
+++ b/InnerDetector/InDetRecTools/InDetSVWithMuonTool/src/InDetSVWithMuonTool.cxx
@@ -9,7 +9,6 @@
//
//-------------------------------------------------
// Other stuff
-#include "GaudiKernel/ToolFactory.h"
//
#include<iostream>
diff --git a/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/src/BTagVrtSecMulti.cxx b/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/src/BTagVrtSecMulti.cxx
index c7b87b6f687..9025e7a0989 100755
--- a/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/src/BTagVrtSecMulti.cxx
+++ b/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/src/BTagVrtSecMulti.cxx
@@ -6,7 +6,6 @@
#include "InDetVKalVxInJetTool/InDetVKalVxInJetTool.h"
//-------------------------------------------------
// Other stuff
-#include "GaudiKernel/ToolFactory.h"
#include "AnalysisUtils/AnalysisMisc.h"
#include "TrkParticleBase/TrackParticleBaseCollection.h"
//#include "TrkParticleCreator/TrackParticleCreatorTool.h"
diff --git a/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/src/InDetVKalVxInJetTool.cxx b/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/src/InDetVKalVxInJetTool.cxx
index c333938eeef..67c82265d50 100755
--- a/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/src/InDetVKalVxInJetTool.cxx
+++ b/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/src/InDetVKalVxInJetTool.cxx
@@ -11,7 +11,6 @@
//
//-------------------------------------------------
// Other stuff
-#include "GaudiKernel/ToolFactory.h"
//#include "GaudiKernel/MsgStream.h"
//
#include<iostream>
diff --git a/InnerDetector/InDetRecTools/SiClusterizationTool/src/PixelGangedAmbiguitiesFinder.cxx b/InnerDetector/InDetRecTools/SiClusterizationTool/src/PixelGangedAmbiguitiesFinder.cxx
index 7bafd93829f..6a6150be4fb 100755
--- a/InnerDetector/InDetRecTools/SiClusterizationTool/src/PixelGangedAmbiguitiesFinder.cxx
+++ b/InnerDetector/InDetRecTools/SiClusterizationTool/src/PixelGangedAmbiguitiesFinder.cxx
@@ -19,7 +19,6 @@
#include "GaudiKernel/SmartDataPtr.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/AlgFactory.h"
#include "GaudiKernel/IToolSvc.h"
#include <vector>
#include <algorithm>
diff --git a/InnerDetector/InDetRecTools/TRT_DriftCircleTool/src/TRT_DriftCircleTool.cxx b/InnerDetector/InDetRecTools/TRT_DriftCircleTool/src/TRT_DriftCircleTool.cxx
index 756d1fd4724..fe435172554 100755
--- a/InnerDetector/InDetRecTools/TRT_DriftCircleTool/src/TRT_DriftCircleTool.cxx
+++ b/InnerDetector/InDetRecTools/TRT_DriftCircleTool/src/TRT_DriftCircleTool.cxx
@@ -15,7 +15,6 @@
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/DataSvc.h"
#include "GaudiKernel/SmartDataPtr.h"
-#include "GaudiKernel/ToolFactory.h"
#include "TRT_DriftCircleTool/TRT_DriftCircleTool.h"
#include "InDetReadoutGeometry/TRT_BaseElement.h"
#include "InDetPrepRawData/TRT_DriftCircle.h"
diff --git a/InnerDetector/InDetRecTools/TRT_DriftCircleTool/src/TRT_DriftCircleToolCosmics.cxx b/InnerDetector/InDetRecTools/TRT_DriftCircleTool/src/TRT_DriftCircleToolCosmics.cxx
index 84c2079caf6..d36fec71fd5 100755
--- a/InnerDetector/InDetRecTools/TRT_DriftCircleTool/src/TRT_DriftCircleToolCosmics.cxx
+++ b/InnerDetector/InDetRecTools/TRT_DriftCircleTool/src/TRT_DriftCircleToolCosmics.cxx
@@ -15,7 +15,6 @@
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/DataSvc.h"
#include "GaudiKernel/SmartDataPtr.h"
-#include "GaudiKernel/ToolFactory.h"
#include "TRT_DriftCircleTool/TRT_DriftCircleToolCosmics.h"
#include "InDetReadoutGeometry/TRT_BaseElement.h"
#include "InDetPrepRawData/TRT_DriftCircle.h"
diff --git a/InnerDetector/InDetRecTools/TRT_DriftFunctionTool/src/TRT_DriftFunctionTool.cxx b/InnerDetector/InDetRecTools/TRT_DriftFunctionTool/src/TRT_DriftFunctionTool.cxx
index 0ad1befa9e4..102121dd4d5 100755
--- a/InnerDetector/InDetRecTools/TRT_DriftFunctionTool/src/TRT_DriftFunctionTool.cxx
+++ b/InnerDetector/InDetRecTools/TRT_DriftFunctionTool/src/TRT_DriftFunctionTool.cxx
@@ -13,7 +13,6 @@
#include "TRT_DriftFunctionTool/TRT_DriftFunctionTool.h"
-#include "GaudiKernel/ToolFactory.h"
#include "GeoModelInterfaces/IGeoModelSvc.h"
#include "GeoModelUtilities/DecodeVersionKey.h"
diff --git a/InnerDetector/InDetRecTools/TRT_ToT_Tools/src/TRT_ToT_dEdx.cxx b/InnerDetector/InDetRecTools/TRT_ToT_Tools/src/TRT_ToT_dEdx.cxx
index 357aa0ce7c0..eb6225a1cdb 100644
--- a/InnerDetector/InDetRecTools/TRT_ToT_Tools/src/TRT_ToT_dEdx.cxx
+++ b/InnerDetector/InDetRecTools/TRT_ToT_Tools/src/TRT_ToT_dEdx.cxx
@@ -10,7 +10,6 @@
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/AlgFactory.h"
#include "GaudiKernel/IToolSvc.h"
#include "StoreGate/StoreGateSvc.h"
diff --git a/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_DAF/src/TRT_TrackExtensionTool_DAF.cxx b/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_DAF/src/TRT_TrackExtensionTool_DAF.cxx
index e13a1c1c1ab..f23e43174ef 100755
--- a/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_DAF/src/TRT_TrackExtensionTool_DAF.cxx
+++ b/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_DAF/src/TRT_TrackExtensionTool_DAF.cxx
@@ -14,7 +14,6 @@
#include <iostream>
#include <iomanip>
#include <utility>
-//#include "GaudiKernel/ToolFactory.h"
//#include "GaudiKernel/MsgStream.h"
//#include "GaudiKernel/ListItem.h"
#include "StoreGate/StoreGateSvc.h"
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigExtensProcessor/src/InDetTrigExtensProcessor.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigExtensProcessor/src/InDetTrigExtensProcessor.cxx
index 442c48301ef..11fc13c147a 100755
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigExtensProcessor/src/InDetTrigExtensProcessor.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigExtensProcessor/src/InDetTrigExtensProcessor.cxx
@@ -11,8 +11,6 @@
// Gaudi includes
#include "StoreGate/StoreGate.h"
-#include "GaudiKernel/AlgFactory.h"
-#include "GaudiKernel/ToolFactory.h"
#include "StoreGate/StoreGateSvc.h"
//tools
diff --git a/InnerDetector/InDetValidation/InDetVertexSplitter/src/InDetEventSplitter.cxx b/InnerDetector/InDetValidation/InDetVertexSplitter/src/InDetEventSplitter.cxx
index 40839827cdf..89a9f3652b6 100644
--- a/InnerDetector/InDetValidation/InDetVertexSplitter/src/InDetEventSplitter.cxx
+++ b/InnerDetector/InDetValidation/InDetVertexSplitter/src/InDetEventSplitter.cxx
@@ -9,7 +9,6 @@
/////////////////////////////////////////////////////////////////////////////////////
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/AlgFactory.h"
//#include "StoreGate/StoreGateSvc.h"
//#include "StoreGate/DataHandle.h"
diff --git a/InnerDetector/InDetValidation/InDetVertexSplitter/src/InDetVertexSplitter.cxx b/InnerDetector/InDetValidation/InDetVertexSplitter/src/InDetVertexSplitter.cxx
index f7f2e99a763..3ed3088d05e 100644
--- a/InnerDetector/InDetValidation/InDetVertexSplitter/src/InDetVertexSplitter.cxx
+++ b/InnerDetector/InDetValidation/InDetVertexSplitter/src/InDetVertexSplitter.cxx
@@ -9,7 +9,6 @@
/////////////////////////////////////////////////////////////////////////////////////
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/AlgFactory.h"
//#include "StoreGate/StoreGateSvc.h"
//#include "StoreGate/DataHandle.h"
diff --git a/InnerDetector/InDetValidation/InDetVertexSplitter/src/InDetVertexSplitterHist.cxx b/InnerDetector/InDetValidation/InDetVertexSplitter/src/InDetVertexSplitterHist.cxx
index 7f376bcde6a..c49538f4347 100644
--- a/InnerDetector/InDetValidation/InDetVertexSplitter/src/InDetVertexSplitterHist.cxx
+++ b/InnerDetector/InDetValidation/InDetVertexSplitter/src/InDetVertexSplitterHist.cxx
@@ -9,7 +9,6 @@
/////////////////////////////////////////////////////////////////////////////////////
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/AlgFactory.h"
#include "GaudiKernel/ITHistSvc.h"
#include "VxVertex/VxContainer.h"
diff --git a/LArCalorimeter/LArCafJobs/src/LArHECNoise.cxx b/LArCalorimeter/LArCafJobs/src/LArHECNoise.cxx
index 3c1750b4f92..85e4f99048f 100644
--- a/LArCalorimeter/LArCafJobs/src/LArHECNoise.cxx
+++ b/LArCalorimeter/LArCafJobs/src/LArHECNoise.cxx
@@ -3,7 +3,6 @@
*/
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/AlgFactory.h"
#include "GaudiKernel/IToolSvc.h"
#include "StoreGate/StoreGateSvc.h"
diff --git a/LArCalorimeter/LArCafJobs/src/LArNoiseBursts.cxx b/LArCalorimeter/LArCafJobs/src/LArNoiseBursts.cxx
index 94c0ad49bfd..af7434a2f37 100644
--- a/LArCalorimeter/LArCafJobs/src/LArNoiseBursts.cxx
+++ b/LArCalorimeter/LArCafJobs/src/LArNoiseBursts.cxx
@@ -9,7 +9,6 @@
/// BNL, June, 2012
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/AlgFactory.h"
#include "GaudiKernel/IToolSvc.h"
#include "StoreGate/StoreGateSvc.h"
diff --git a/LArCalorimeter/LArCafJobs/src/LArShapeDumper.cxx b/LArCalorimeter/LArCafJobs/src/LArShapeDumper.cxx
index 4d954caf88b..f5ad85e8f2b 100755
--- a/LArCalorimeter/LArCafJobs/src/LArShapeDumper.cxx
+++ b/LArCalorimeter/LArCafJobs/src/LArShapeDumper.cxx
@@ -4,7 +4,6 @@
#include "LArCafJobs/LArShapeDumper.h"
#include "StoreGate/StoreGateSvc.h"
-#include "GaudiKernel/AlgFactory.h"
#include "LArRawEvent/LArDigit.h"
#include "GaudiKernel/IToolSvc.h"
#include "CaloIdentifier/CaloIdManager.h"
diff --git a/LArCalorimeter/LArCafJobs/src/LArSimpleShapeDumper.cxx b/LArCalorimeter/LArCafJobs/src/LArSimpleShapeDumper.cxx
index 159ac84e0ac..0226519ce56 100755
--- a/LArCalorimeter/LArCafJobs/src/LArSimpleShapeDumper.cxx
+++ b/LArCalorimeter/LArCafJobs/src/LArSimpleShapeDumper.cxx
@@ -5,7 +5,6 @@
#include "LArCafJobs/LArSimpleShapeDumper.h"
#include "StoreGate/StoreGateSvc.h"
-#include "GaudiKernel/AlgFactory.h"
#include "GaudiKernel/MsgStream.h"
#include "LArElecCalib/ILArShape.h"
#include "LArRawConditions/LArShapeComplete.h"
diff --git a/LArCalorimeter/LArCalibTools/src/ForceLoadCondObj.cxx b/LArCalorimeter/LArCalibTools/src/ForceLoadCondObj.cxx
index 0cb6fbbfa64..8eaa7f4dc57 100644
--- a/LArCalorimeter/LArCalibTools/src/ForceLoadCondObj.cxx
+++ b/LArCalorimeter/LArCalibTools/src/ForceLoadCondObj.cxx
@@ -6,7 +6,6 @@
#include "StoreGate/StoreGateSvc.h"
#include "AthenaKernel/IClassIDSvc.h"
-//#include "GaudiKernel/AlgFactory.h"
#include "GaudiKernel/MsgStream.h"
#include "LArCalibTools/ForceLoadCondObj.h"
diff --git a/LArCalorimeter/LArCalibUtils/src/LArAutoCorrDecoderTool.cxx b/LArCalorimeter/LArCalibUtils/src/LArAutoCorrDecoderTool.cxx
index 0060b58efc8..195268cbab4 100755
--- a/LArCalorimeter/LArCalibUtils/src/LArAutoCorrDecoderTool.cxx
+++ b/LArCalorimeter/LArCalibUtils/src/LArAutoCorrDecoderTool.cxx
@@ -4,7 +4,6 @@
#include "LArCalibUtils/LArAutoCorrDecoderTool.h"
-#include "GaudiKernel/ToolFactory.h"
#include "GaudiKernel/MsgStream.h"
#include "AthenaKernel/errorcheck.h"
#include "GaudiKernel/IIncidentSvc.h"
diff --git a/LArCalorimeter/LArCalibUtils/src/LArCalibDigitMaker.cxx b/LArCalorimeter/LArCalibUtils/src/LArCalibDigitMaker.cxx
index 679a7ed6a9d..dee9e8c3150 100755
--- a/LArCalorimeter/LArCalibUtils/src/LArCalibDigitMaker.cxx
+++ b/LArCalorimeter/LArCalibUtils/src/LArCalibDigitMaker.cxx
@@ -4,7 +4,6 @@
#include "LArCalibUtils/LArCalibDigitMaker.h"
-#include "GaudiKernel/AlgFactory.h"
#include "GaudiKernel/ToolHandle.h"
#include "xAODEventInfo/EventInfo.h"
diff --git a/LArCalorimeter/LArCalibUtils/src/LArPedestalInPhysicsMaker.cxx b/LArCalorimeter/LArCalibUtils/src/LArPedestalInPhysicsMaker.cxx
index ed77d4abee4..d1ae6ffefe2 100755
--- a/LArCalorimeter/LArCalibUtils/src/LArPedestalInPhysicsMaker.cxx
+++ b/LArCalorimeter/LArCalibUtils/src/LArPedestalInPhysicsMaker.cxx
@@ -21,7 +21,6 @@
// Include files
#include "LArCalibUtils/LArPedestalInPhysicsMaker.h"
-//#include "GaudiKernel/AlgFactory.h"
//#include "GaudiKernel/Property.h"
//#include "GaudiKernel/ListItem.h"
#include "GaudiKernel/IIncidentSvc.h"
diff --git a/LArCalorimeter/LArCalibUtils/src/LArPedestalMaker.cxx b/LArCalorimeter/LArCalibUtils/src/LArPedestalMaker.cxx
index a4b2e17d20c..a22185258b4 100755
--- a/LArCalorimeter/LArCalibUtils/src/LArPedestalMaker.cxx
+++ b/LArCalorimeter/LArCalibUtils/src/LArPedestalMaker.cxx
@@ -23,7 +23,6 @@
// Include files
#include "LArCalibUtils/LArPedestalMaker.h"
-//#include "GaudiKernel/AlgFactory.h"
#include "LArIdentifier/LArOnlineID.h"
#include <math.h>
diff --git a/LArCalorimeter/LArCnv/LArAthenaPool/src/LArDigitContainerCnv.h b/LArCalorimeter/LArCnv/LArAthenaPool/src/LArDigitContainerCnv.h
index 6b849aa9a25..7315901548b 100644
--- a/LArCalorimeter/LArCnv/LArAthenaPool/src/LArDigitContainerCnv.h
+++ b/LArCalorimeter/LArCnv/LArAthenaPool/src/LArDigitContainerCnv.h
@@ -19,9 +19,9 @@ typedef T_AthenaPoolCustomCnv<LArDigitContainer,LArDigitContainerPERS> LArDigitC
class LArDigitContainerCnv : public LArDigitContainerCnvBase
{
- friend class CnvFactory<LArDigitContainerCnv>;
- protected:
+public:
LArDigitContainerCnv(ISvcLocator*);
+protected:
virtual LArDigitContainer* createTransient();
virtual LArDigitContainerPERS* createPersistent(LArDigitContainer*);
private:
diff --git a/LArCalorimeter/LArCnv/LArAthenaPool/src/LArFebErrorSummaryCnv.h b/LArCalorimeter/LArCnv/LArAthenaPool/src/LArFebErrorSummaryCnv.h
index 7e9e2bde732..934c977466a 100644
--- a/LArCalorimeter/LArCnv/LArAthenaPool/src/LArFebErrorSummaryCnv.h
+++ b/LArCalorimeter/LArCnv/LArAthenaPool/src/LArFebErrorSummaryCnv.h
@@ -16,9 +16,9 @@ typedef T_AthenaPoolCustomCnv<LArFebErrorSummary,LArFebErrorSummary_PERSISTENT>
class LArFebErrorSummaryCnv : public LArFebErrorSummaryCnvBase
{
- friend class CnvFactory<LArFebErrorSummaryCnv>;
- protected:
+public:
LArFebErrorSummaryCnv(ISvcLocator*);
+ protected:
virtual LArFebErrorSummary* createTransient();
virtual LArFebErrorSummary_PERSISTENT* createPersistent(LArFebErrorSummary*);
private:
diff --git a/LArCalorimeter/LArCnv/LArAthenaPool/src/LArNoisyROSummaryCnv.h b/LArCalorimeter/LArCnv/LArAthenaPool/src/LArNoisyROSummaryCnv.h
index cbb00a8ee2d..e9c29e6e8aa 100644
--- a/LArCalorimeter/LArCnv/LArAthenaPool/src/LArNoisyROSummaryCnv.h
+++ b/LArCalorimeter/LArCnv/LArAthenaPool/src/LArNoisyROSummaryCnv.h
@@ -16,9 +16,9 @@ typedef T_AthenaPoolCustomCnv<LArNoisyROSummary,LArNoisyROSummary_PERSISTENT> LA
class LArNoisyROSummaryCnv : public LArNoisyROSummaryCnvBase
{
- friend class CnvFactory<LArNoisyROSummaryCnv>;
- protected:
+public:
LArNoisyROSummaryCnv(ISvcLocator*);
+ protected:
virtual LArNoisyROSummary* createTransient();
virtual LArNoisyROSummary_PERSISTENT* createPersistent(LArNoisyROSummary*);
private:
diff --git a/LArCalorimeter/LArCnv/LArAthenaPool/src/LArRawEventContainerCnv.h b/LArCalorimeter/LArCnv/LArAthenaPool/src/LArRawEventContainerCnv.h
index 5139fef0eed..6c6a513cefd 100755
--- a/LArCalorimeter/LArCnv/LArAthenaPool/src/LArRawEventContainerCnv.h
+++ b/LArCalorimeter/LArCnv/LArAthenaPool/src/LArRawEventContainerCnv.h
@@ -9,16 +9,14 @@
// author R.Seuster <seuster@cern.ch>
#include "AthenaPoolCnvSvc/T_AthenaPoolCustomCnv.h"
-#include "GaudiKernel/CnvFactory.h"
template<class T, class P, class C>
class LArRawEventContainerCnv : public T_AthenaPoolCustomCnv<T, P>
{
- friend class CnvFactory<LArRawEventContainerCnv<T, P, C> >;
-
- protected:
+public:
LArRawEventContainerCnv(ISvcLocator* svcloc) : T_AthenaPoolCustomCnv<T, P>( svcloc) {}
+ protected:
virtual P* createPersistent(T* transCont);
virtual T* createTransient ();
diff --git a/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArAccumulatedCalibDigitContByteStreamCnv.h b/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArAccumulatedCalibDigitContByteStreamCnv.h
index afb2c666a90..56e71cf7386 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArAccumulatedCalibDigitContByteStreamCnv.h
+++ b/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArAccumulatedCalibDigitContByteStreamCnv.h
@@ -38,7 +38,6 @@ template <class TYPE> class CnvFactory;
extern long ByteStream_StorageType;
class LArAccumulatedCalibDigitContByteStreamCnv: public Converter {
- friend class CnvFactory<LArAccumulatedCalibDigitContByteStreamCnv>;
public:
LArAccumulatedCalibDigitContByteStreamCnv(ISvcLocator* svcloc);
diff --git a/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArAccumulatedDigitContByteStreamCnv.h b/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArAccumulatedDigitContByteStreamCnv.h
index 295126aec31..19001569bd2 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArAccumulatedDigitContByteStreamCnv.h
+++ b/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArAccumulatedDigitContByteStreamCnv.h
@@ -38,7 +38,6 @@ template <class TYPE> class CnvFactory;
extern long ByteStream_StorageType;
class LArAccumulatedDigitContByteStreamCnv: public Converter {
- friend class CnvFactory<LArAccumulatedDigitContByteStreamCnv>;
public:
LArAccumulatedDigitContByteStreamCnv(ISvcLocator* svcloc);
diff --git a/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArCalibDigitContByteStreamCnv.h b/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArCalibDigitContByteStreamCnv.h
index d4c966d3114..8b49de7edb4 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArCalibDigitContByteStreamCnv.h
+++ b/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArCalibDigitContByteStreamCnv.h
@@ -38,7 +38,6 @@ template <class TYPE> class CnvFactory;
extern long ByteStream_StorageType;
class LArCalibDigitContByteStreamCnv: public Converter {
- friend class CnvFactory<LArCalibDigitContByteStreamCnv>;
public:
LArCalibDigitContByteStreamCnv(ISvcLocator* svcloc);
diff --git a/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArDigitContByteStreamCnv.h b/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArDigitContByteStreamCnv.h
index 7f01e9dd464..d37dd395622 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArDigitContByteStreamCnv.h
+++ b/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArDigitContByteStreamCnv.h
@@ -38,7 +38,6 @@ template <class TYPE> class CnvFactory;
extern long ByteStream_StorageType;
class LArDigitContByteStreamCnv: public Converter {
- friend class CnvFactory<LArDigitContByteStreamCnv>;
public:
LArDigitContByteStreamCnv(ISvcLocator* svcloc);
diff --git a/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArFebHeaderContByteStreamCnv.h b/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArFebHeaderContByteStreamCnv.h
index f02b32c8e0a..74ddb0f5253 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArFebHeaderContByteStreamCnv.h
+++ b/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArFebHeaderContByteStreamCnv.h
@@ -38,12 +38,8 @@ template <class TYPE> class CnvFactory;
extern long ByteStream_StorageType;
class LArFebHeaderContByteStreamCnv: public Converter {
- friend class CnvFactory<LArFebHeaderContByteStreamCnv>;
-
- protected:
- LArFebHeaderContByteStreamCnv(ISvcLocator* svcloc);
-
public:
+ LArFebHeaderContByteStreamCnv(ISvcLocator* svcloc);
typedef LArRawDataContByteStreamTool BYTESTREAMTOOL ;
diff --git a/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRawChannelContByteStreamCnv.h b/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRawChannelContByteStreamCnv.h
index dd2ee663723..ab2188b6048 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRawChannelContByteStreamCnv.h
+++ b/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRawChannelContByteStreamCnv.h
@@ -33,7 +33,6 @@ template <class TYPE> class CnvFactory;
extern long ByteStream_StorageType;
class LArRawChannelContByteStreamCnv: public Converter {
- friend class CnvFactory<LArRawChannelContByteStreamCnv>;
public:
LArRawChannelContByteStreamCnv(ISvcLocator* svcloc);
diff --git a/LArCalorimeter/LArCnv/LArByteStream/src/LArAccumulatedCalibDigitContByteStreamCnv.cxx b/LArCalorimeter/LArCnv/LArByteStream/src/LArAccumulatedCalibDigitContByteStreamCnv.cxx
index ce0b9b879d3..433261bba98 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/src/LArAccumulatedCalibDigitContByteStreamCnv.cxx
+++ b/LArCalorimeter/LArCnv/LArByteStream/src/LArAccumulatedCalibDigitContByteStreamCnv.cxx
@@ -14,7 +14,6 @@
#include "ByteStreamData/RawEvent.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IRegistry.h"
diff --git a/LArCalorimeter/LArCnv/LArByteStream/src/LArAccumulatedDigitContByteStreamCnv.cxx b/LArCalorimeter/LArCnv/LArByteStream/src/LArAccumulatedDigitContByteStreamCnv.cxx
index fb3ea069088..d37117eaeb7 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/src/LArAccumulatedDigitContByteStreamCnv.cxx
+++ b/LArCalorimeter/LArCnv/LArByteStream/src/LArAccumulatedDigitContByteStreamCnv.cxx
@@ -14,7 +14,6 @@
#include "ByteStreamData/RawEvent.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IRegistry.h"
diff --git a/LArCalorimeter/LArCnv/LArByteStream/src/LArCalibDigitContByteStreamCnv.cxx b/LArCalorimeter/LArCnv/LArByteStream/src/LArCalibDigitContByteStreamCnv.cxx
index 66acbb8abda..a544a444f45 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/src/LArCalibDigitContByteStreamCnv.cxx
+++ b/LArCalorimeter/LArCnv/LArByteStream/src/LArCalibDigitContByteStreamCnv.cxx
@@ -12,7 +12,6 @@
#include "ByteStreamData/RawEvent.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IRegistry.h"
diff --git a/LArCalorimeter/LArCnv/LArByteStream/src/LArDigitContByteStreamCnv.cxx b/LArCalorimeter/LArCnv/LArByteStream/src/LArDigitContByteStreamCnv.cxx
index 367b98ea9c5..7bbe99eb1a9 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/src/LArDigitContByteStreamCnv.cxx
+++ b/LArCalorimeter/LArCnv/LArByteStream/src/LArDigitContByteStreamCnv.cxx
@@ -14,7 +14,6 @@
#include "ByteStreamData/RawEvent.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IRegistry.h"
diff --git a/LArCalorimeter/LArCnv/LArByteStream/src/LArFebHeaderContByteStreamCnv.cxx b/LArCalorimeter/LArCnv/LArByteStream/src/LArFebHeaderContByteStreamCnv.cxx
index 882f47562a8..bcff21ab56d 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/src/LArFebHeaderContByteStreamCnv.cxx
+++ b/LArCalorimeter/LArCnv/LArByteStream/src/LArFebHeaderContByteStreamCnv.cxx
@@ -14,7 +14,6 @@
#include "ByteStreamData/RawEvent.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IRegistry.h"
diff --git a/LArCalorimeter/LArCnv/LArByteStream/src/LArRawChannelContByteStreamCnv.cxx b/LArCalorimeter/LArCnv/LArByteStream/src/LArRawChannelContByteStreamCnv.cxx
index f05ec5f0979..eb4c50dcad1 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/src/LArRawChannelContByteStreamCnv.cxx
+++ b/LArCalorimeter/LArCnv/LArByteStream/src/LArRawChannelContByteStreamCnv.cxx
@@ -14,7 +14,6 @@
#include "EventInfo/EventID.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IRegistry.h"
diff --git a/LArCalorimeter/LArCnv/LArByteStream/src/LArRawDataContByteStreamTool.cxx b/LArCalorimeter/LArCnv/LArByteStream/src/LArRawDataContByteStreamTool.cxx
index 5ee294782c0..f65fd66bef3 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/src/LArRawDataContByteStreamTool.cxx
+++ b/LArCalorimeter/LArCnv/LArByteStream/src/LArRawDataContByteStreamTool.cxx
@@ -20,7 +20,6 @@
#include "LArByteStream/LArRodBlockPhysicsV3.h"
#include "LArByteStream/LArRodBlockPhysicsV5.h"
#include "LArByteStream/LArRodBlockPhysicsV6.h"
-#include "GaudiKernel/ToolFactory.h"
#include "GaudiKernel/MsgStream.h"
#include "CaloInterface/ICaloNoiseTool.h"
diff --git a/LArCalorimeter/LArCnv/LArByteStream/src/components/LArByteStream_entries.cxx b/LArCalorimeter/LArCnv/LArByteStream/src/components/LArByteStream_entries.cxx
index 0c9bffbe291..748e89a544e 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/src/components/LArByteStream_entries.cxx
+++ b/LArCalorimeter/LArCnv/LArByteStream/src/components/LArByteStream_entries.cxx
@@ -12,12 +12,13 @@
// Containers
DECLARE_COMPONENT( LArRawDataContByteStreamTool )
DECLARE_COMPONENT( LArRodDecoder )
-DECLARE_CONVERTER_FACTORY( LArRawChannelContByteStreamCnv )
-DECLARE_CONVERTER_FACTORY( LArDigitContByteStreamCnv )
-DECLARE_CONVERTER_FACTORY( LArCalibDigitContByteStreamCnv )
-DECLARE_CONVERTER_FACTORY( LArAccumulatedCalibDigitContByteStreamCnv )
-DECLARE_CONVERTER_FACTORY( LArAccumulatedDigitContByteStreamCnv )
-DECLARE_CONVERTER_FACTORY( LArFebHeaderContByteStreamCnv )
+
+DECLARE_CONVERTER( LArRawChannelContByteStreamCnv )
+DECLARE_CONVERTER( LArDigitContByteStreamCnv )
+DECLARE_CONVERTER( LArCalibDigitContByteStreamCnv )
+DECLARE_CONVERTER( LArAccumulatedCalibDigitContByteStreamCnv )
+DECLARE_CONVERTER( LArAccumulatedDigitContByteStreamCnv )
+DECLARE_CONVERTER( LArFebHeaderContByteStreamCnv )
// Collections
@@ -26,5 +27,5 @@ DECLARE_CONVERTER_FACTORY( LArFebHeaderContByteStreamCnv )
// LARCELLTOOL;
//typedef CollectionByteStreamCnv<LARCELLTOOL> LArCellCollByteStreamCnv ;
//DECLARE_COMPONENT( LARCELLTOOL )
-//DECLARE_CONVERTER_FACTORY( LArCellCollByteStreamCnv )
+//DECLARE_CONVERTER( LArCellCollByteStreamCnv )
diff --git a/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArAutoCorrCompleteCnv.h b/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArAutoCorrCompleteCnv.h
old mode 100755
new mode 100644
index dd3ebb2f49e..6d8dabc93ed
--- a/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArAutoCorrCompleteCnv.h
+++ b/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArAutoCorrCompleteCnv.h
@@ -29,7 +29,9 @@ typedef T_AthenaPoolCoolMultChanCnv<LArAutoCorrComplete, LArAutoCorrTransType, L
class LArAutoCorrCompleteCnv : public LArAutoCorrCompleteCnvBase {
friend class CnvFactory<LArAutoCorrCompleteCnv >;
protected:
+public:
LArAutoCorrCompleteCnv (ISvcLocator* svcloc) : LArAutoCorrCompleteCnvBase(svcloc) {}
+protected:
virtual LArAutoCorrPersType* createPersistent (LArAutoCorrTransType* transObj);
virtual LArAutoCorrTransType* createTransient ();
LArAutoCorrTransType* createTransient(LArConditionsSubset<LArAutoCorrP>* orig);
diff --git a/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArAutoCorrMCCnv.h b/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArAutoCorrMCCnv.h
old mode 100755
new mode 100644
index c30bff9536c..38eab1972dd
--- a/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArAutoCorrMCCnv.h
+++ b/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArAutoCorrMCCnv.h
@@ -29,7 +29,9 @@ typedef T_AthenaPoolCoolMultChanCnv<LArAutoCorrMC, LArAutoCorrTransType, LArAuto
class LArAutoCorrMCCnv : public LArAutoCorrMCCnvBase {
friend class CnvFactory<LArAutoCorrMCCnv >;
protected:
+public:
LArAutoCorrMCCnv (ISvcLocator* svcloc) : LArAutoCorrMCCnvBase(svcloc) {}
+protected:
virtual LArAutoCorrPersType* createPersistent (LArAutoCorrTransType* transObj);
virtual LArAutoCorrTransType* createTransient ();
LArAutoCorrTransType* createTransient(LArConditionsSubset<LArAutoCorrP>* orig);
diff --git a/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArCaliWaveContainerCnv.h b/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArCaliWaveContainerCnv.h
index 92130a5dc44..5212da02dde 100644
--- a/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArCaliWaveContainerCnv.h
+++ b/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArCaliWaveContainerCnv.h
@@ -30,7 +30,9 @@ class LArCaliWaveContainerCnv : public LArCaliWaveContainerCnvBase {
friend class CnvFactory<LArCaliWaveContainerCnv >;
protected:
+public:
LArCaliWaveContainerCnv (ISvcLocator* svcloc) : LArCaliWaveContainerCnvBase(svcloc) {}
+protected:
LArCaliWavePersType* createPersistent (LArCaliWaveTransType* transObj);
LArCaliWaveTransType* createTransient ();
LArCaliWaveTransType* createTransient(LArCaliWaveTransType* orig); //used to read non t/p split version
diff --git a/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArDAC2uACompleteCnv.h b/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArDAC2uACompleteCnv.h
old mode 100755
new mode 100644
index c72eb83550b..21345c02005
--- a/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArDAC2uACompleteCnv.h
+++ b/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArDAC2uACompleteCnv.h
@@ -24,7 +24,9 @@ typedef LArSingleFloatConverter<LArDAC2uAComplete> LArDAC2uACompleteCnvBase;
class LArDAC2uACompleteCnv : public LArDAC2uACompleteCnvBase {
friend class CnvFactory<LArDAC2uACompleteCnv >;
protected:
+public:
LArDAC2uACompleteCnv (ISvcLocator* svcloc) : LArDAC2uACompleteCnvBase(svcloc) {}
+protected:
virtual LArConditionsSubset<LArSingleFloatP>* createTransient ();
LArConditionsSubset<LArSingleFloatP>* createTransient(LArConditionsSubset<LArDAC2uAP>* orig);
};
diff --git a/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArDAC2uAMCCnv.h b/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArDAC2uAMCCnv.h
old mode 100755
new mode 100644
index c5b58e34158..82874be680f
--- a/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArDAC2uAMCCnv.h
+++ b/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArDAC2uAMCCnv.h
@@ -24,7 +24,9 @@ typedef LArSingleFloatConverter<LArDAC2uAMC> LArDAC2uAMCCnvBase;
class LArDAC2uAMCCnv : public LArDAC2uAMCCnvBase {
friend class CnvFactory<LArDAC2uAMCCnv >;
protected:
+public:
LArDAC2uAMCCnv (ISvcLocator* svcloc) : LArDAC2uAMCCnvBase(svcloc) {}
+protected:
virtual LArConditionsSubset<LArSingleFloatP>* createTransient ();
LArConditionsSubset<LArSingleFloatP>* createTransient(LArConditionsSubset<LArDAC2uAP>* orig);
};
diff --git a/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArDSPThresholdsCompleteCnv.h b/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArDSPThresholdsCompleteCnv.h
index a702e15e30f..eb01fa918de 100644
--- a/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArDSPThresholdsCompleteCnv.h
+++ b/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArDSPThresholdsCompleteCnv.h
@@ -25,7 +25,9 @@ typedef T_AthenaPoolCoolMultChanCnv<LArDSPThresholdsComplete, LArDSPThrTransType
class LArDSPThresholdsCompleteCnv : public LArDSPThresholdsCompleteCnvBase {
friend class CnvFactory<LArDSPThresholdsCompleteCnv >;
protected:
+public:
LArDSPThresholdsCompleteCnv (ISvcLocator* svcloc) : LArDSPThresholdsCompleteCnvBase(svcloc) {}
+protected:
virtual LArDSPThrPersType* createPersistent (LArDSPThrTransType* transObj);
virtual LArDSPThrTransType* createTransient ();
};
diff --git a/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArHVScaleCorrCompleteCnv.h b/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArHVScaleCorrCompleteCnv.h
index 7ea52f46f9a..e7c1a1382e2 100644
--- a/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArHVScaleCorrCompleteCnv.h
+++ b/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArHVScaleCorrCompleteCnv.h
@@ -11,7 +11,7 @@
class LArHVScaleCorrCompleteCnv : public LArSingleFloatConverter<LArHVScaleCorrComplete> {
friend class CnvFactory<LArHVScaleCorrCompleteCnv>;
- protected:
+public:
LArHVScaleCorrCompleteCnv (ISvcLocator* svcloc) :
LArSingleFloatConverter<LArHVScaleCorrComplete>(svcloc) {}
};
diff --git a/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArMphysOverMcalCompleteCnv.h b/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArMphysOverMcalCompleteCnv.h
index f44189806cc..02e0e3893a0 100644
--- a/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArMphysOverMcalCompleteCnv.h
+++ b/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArMphysOverMcalCompleteCnv.h
@@ -27,7 +27,9 @@ typedef LArSingleFloatConverter<LArMphysOverMcalComplete> LArMphysOverMcalComple
class LArMphysOverMcalCompleteCnv : public LArMphysOverMcalCompleteCnvBase {
friend class CnvFactory<LArMphysOverMcalCompleteCnv >;
protected:
+public:
LArMphysOverMcalCompleteCnv (ISvcLocator* svcloc) : LArMphysOverMcalCompleteCnvBase(svcloc) {}
+protected:
virtual LArConditionsSubset<LArSingleFloatP>* createTransient ();
LArConditionsSubset<LArSingleFloatP>* createTransient(LArConditionsSubset<LArMphysOverMcalP>* orig);
};
diff --git a/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArMphysOverMcalMCCnv.h b/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArMphysOverMcalMCCnv.h
index b270d37f5fb..8bb1a319290 100644
--- a/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArMphysOverMcalMCCnv.h
+++ b/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArMphysOverMcalMCCnv.h
@@ -22,7 +22,9 @@ typedef LArSingleFloatConverter<LArMphysOverMcalMC> LArMphysOverMcalMCCnvBase;
class LArMphysOverMcalMCCnv : public LArMphysOverMcalMCCnvBase {
friend class CnvFactory<LArMphysOverMcalMCCnv >;
protected:
+public:
LArMphysOverMcalMCCnv (ISvcLocator* svcloc) : LArMphysOverMcalMCCnvBase(svcloc) {}
+protected:
virtual LArConditionsSubset<LArSingleFloatP>* createTransient ();
LArConditionsSubset<LArSingleFloatP>* createTransient(LArConditionsSubset<LArMphysOverMcalP>* orig);
};
diff --git a/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArOFCBinCompleteCnv.h b/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArOFCBinCompleteCnv.h
index 0bc1a3b636c..36f2a35fea8 100644
--- a/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArOFCBinCompleteCnv.h
+++ b/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArOFCBinCompleteCnv.h
@@ -29,7 +29,9 @@ typedef T_AthenaPoolCoolMultChanCnv<LArOFCBinComplete, LArOFCBinTransType, LArOF
class LArOFCBinCompleteCnv : public LArOFCBinCompleteCnvBase {
friend class CnvFactory<LArOFCBinCompleteCnv >;
protected:
+public:
LArOFCBinCompleteCnv (ISvcLocator* svcloc) : LArOFCBinCompleteCnvBase(svcloc) {}
+protected:
virtual LArOFCBinPersType* createPersistent (LArOFCBinTransType* transObj);
virtual LArOFCBinTransType* createTransient ();
private:
diff --git a/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArOFCCompleteCnv.h b/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArOFCCompleteCnv.h
old mode 100755
new mode 100644
index ed45e3ed9db..0aa8a473611
--- a/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArOFCCompleteCnv.h
+++ b/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArOFCCompleteCnv.h
@@ -29,7 +29,9 @@ typedef T_AthenaPoolCoolMultChanCnv<LArOFCComplete, LArOFCTransType, LArOFCPersT
class LArOFCCompleteCnv : public LArOFCCompleteCnvBase {
friend class CnvFactory<LArOFCCompleteCnv >;
protected:
+public:
LArOFCCompleteCnv (ISvcLocator* svcloc) : LArOFCCompleteCnvBase(svcloc) {}
+protected:
virtual LArOFCPersType* createPersistent (LArOFCTransType* transObj);
virtual LArOFCTransType* createTransient();
LArOFCTransType* createTransient(LArConditionsSubset<LArOFCP>* );
diff --git a/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArOFCMCCnv.h b/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArOFCMCCnv.h
index 8de1b3e40c0..3ed3dc8ac2c 100644
--- a/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArOFCMCCnv.h
+++ b/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArOFCMCCnv.h
@@ -29,7 +29,9 @@ typedef T_AthenaPoolCoolMultChanCnv<LArOFCMC, LArOFCTransType, LArOFCPersType >
class LArOFCMCCnv : public LArOFCMCCnvBase {
friend class CnvFactory<LArOFCMCCnv >;
protected:
+public:
LArOFCMCCnv (ISvcLocator* svcloc) : LArOFCMCCnvBase(svcloc) {}
+protected:
virtual LArOFCPersType* createPersistent (LArOFCTransType* transObj);
virtual LArOFCTransType* createTransient();
LArOFCTransType* createTransient (LArConditionsSubset<LArOFCP>* );
diff --git a/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArPedestalCompleteCnv.h b/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArPedestalCompleteCnv.h
old mode 100755
new mode 100644
index cad8244326b..d0e0c34aa03
--- a/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArPedestalCompleteCnv.h
+++ b/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArPedestalCompleteCnv.h
@@ -30,7 +30,9 @@ typedef T_AthenaPoolCoolMultChanCnv<LArPedestalComplete, LArPedTransType, LArPed
class LArPedestalCompleteCnv : public LArPedestalCompleteCnvBase {
friend class CnvFactory<LArPedestalCompleteCnv >;
protected:
+public:
LArPedestalCompleteCnv (ISvcLocator* svcloc) : LArPedestalCompleteCnvBase(svcloc) {}
+protected:
virtual LArPedPersType* createPersistent (LArPedTransType* transObj);
virtual LArPedTransType* createTransient ();
LArPedTransType* createTransient(LArConditionsSubset<LArPedestalP>* orig);
diff --git a/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArPedestalMCCnv.h b/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArPedestalMCCnv.h
index 4e1cdfd373a..7d5026e41ff 100644
--- a/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArPedestalMCCnv.h
+++ b/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArPedestalMCCnv.h
@@ -24,7 +24,9 @@ typedef T_AthenaPoolCustomCnv<LArPedestalMCTransType, LArPedestalMCPersType > LA
class LArPedestalMCCnv : public LArPedestalMCCnvBase {
friend class CnvFactory<LArPedestalMCCnv >;
protected:
+public:
LArPedestalMCCnv (ISvcLocator* svcloc) : LArPedestalMCCnvBase(svcloc) {}
+protected:
virtual LArPedestalMCPersType* createPersistent (LArPedestalMCTransType* transObj);
virtual LArPedestalMCTransType* createTransient ();
};
diff --git a/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArPhysWaveContainerCnv.h b/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArPhysWaveContainerCnv.h
index c48b66f9239..d65f0a5bf75 100644
--- a/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArPhysWaveContainerCnv.h
+++ b/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArPhysWaveContainerCnv.h
@@ -29,7 +29,9 @@ class LArPhysWaveContainerCnv : public LArPhysWaveContainerCnvBase {
friend class CnvFactory<LArPhysWaveContainerCnv>;
protected:
+public:
LArPhysWaveContainerCnv (ISvcLocator* svcloc) : LArPhysWaveContainerCnvBase(svcloc) {}
+protected:
LArPhysWavePersType* createPersistent (LArPhysWaveTransType* transObj);
LArPhysWaveTransType* createTransient ();
LArPhysWaveTransType* createTransient(LArPhysWaveTransType* orig); //used to read non t/p split version
diff --git a/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArRampCompleteCnv.h b/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArRampCompleteCnv.h
old mode 100755
new mode 100644
index b274e9f8646..57850dda2aa
--- a/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArRampCompleteCnv.h
+++ b/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArRampCompleteCnv.h
@@ -29,7 +29,9 @@ typedef T_AthenaPoolCoolMultChanCnv<LArRampComplete, LArRampTransType, LArRampPe
class LArRampCompleteCnv : public LArRampCompleteCnvBase {
friend class CnvFactory<LArRampCompleteCnv >;
protected:
+public:
LArRampCompleteCnv (ISvcLocator* svcloc) : LArRampCompleteCnvBase(svcloc) {}
+protected:
virtual LArRampPersType* createPersistent (LArRampTransType* transObj);
virtual LArRampTransType* createTransient ();
LArRampTransType* createTransient(LArConditionsSubset<LArRampP>* orig);
diff --git a/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArRampMCCnv.h b/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArRampMCCnv.h
old mode 100755
new mode 100644
index 81e1a097530..33ce6100f67
--- a/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArRampMCCnv.h
+++ b/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArRampMCCnv.h
@@ -29,7 +29,9 @@ typedef T_AthenaPoolCoolMultChanCnv<LArRampMC, LArRampTransType, LArRampPersType
class LArRampMCCnv : public LArRampMCCnvBase {
friend class CnvFactory<LArRampMCCnv >;
protected:
+public:
LArRampMCCnv (ISvcLocator* svcloc) : LArRampMCCnvBase(svcloc) {}
+protected:
virtual LArRampPersType* createPersistent (LArRampTransType* transObj);
virtual LArRampTransType* createTransient ();
LArRampTransType* createTransient(LArConditionsSubset<LArRampP>* orig);
diff --git a/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArShape32MCCnv.h b/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArShape32MCCnv.h
old mode 100755
new mode 100644
index 875baa8ee13..d0bccb56708
--- a/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArShape32MCCnv.h
+++ b/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArShape32MCCnv.h
@@ -30,7 +30,9 @@ class LArShape32MCCnv : public LArShape32MCCnvBase {
friend class CnvFactory<LArShape32MCCnv >;
protected:
+public:
LArShape32MCCnv (ISvcLocator* svcloc) : LArShape32MCCnvBase(svcloc) {}
+protected:
virtual LArShapePersType* createPersistent (LArShapeTransType* transObj);
virtual LArShapeTransType* createTransient ();
LArConditionsSubset<LArShapeP1>* createTransient(LArConditionsSubset<LArShapeP>* orig);
diff --git a/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArShapeCompleteCnv.h b/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArShapeCompleteCnv.h
old mode 100755
new mode 100644
index 95eecd73977..55cc9bbd752
--- a/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArShapeCompleteCnv.h
+++ b/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArShapeCompleteCnv.h
@@ -32,7 +32,9 @@ class LArShapeCompleteCnv : public LArShapeCompleteCnvBase {
friend class CnvFactory<LArShapeCompleteCnv >;
protected:
+public:
LArShapeCompleteCnv (ISvcLocator* svcloc) : LArShapeCompleteCnvBase(svcloc) {}
+protected:
virtual LArShapePersType2* createPersistent (LArShapeTransType2* transObj);
virtual LArShapeTransType2* createTransient ();
LArShapeTransType1* createTransient(LArConditionsSubset<LArShapeP>* orig);
diff --git a/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArShapeMCCnv.h b/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArShapeMCCnv.h
old mode 100755
new mode 100644
index 4995cefb63e..ae1a1fbf73b
--- a/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArShapeMCCnv.h
+++ b/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LArShapeMCCnv.h
@@ -30,7 +30,9 @@ class LArShapeMCCnv : public LArShapeMCCnvBase {
friend class CnvFactory<LArShapeMCCnv >;
protected:
+public:
LArShapeMCCnv (ISvcLocator* svcloc) : LArShapeMCCnvBase(svcloc) {}
+protected:
virtual LArShapePersType1* createPersistent (LArShapeTransType1* transObj);
virtual LArShapeTransType1* createTransient ();
LArShapeTransType1* createTransient(LArConditionsSubset<LArShapeP>* orig);
diff --git a/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LAruA2MeVCompleteCnv.h b/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LAruA2MeVCompleteCnv.h
old mode 100755
new mode 100644
index 59f6672fc2e..1b894cb2e39
--- a/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LAruA2MeVCompleteCnv.h
+++ b/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LAruA2MeVCompleteCnv.h
@@ -24,7 +24,9 @@ typedef LArSingleFloatConverter<LAruA2MeVComplete> LAruA2MeVCompleteCnvBase;
class LAruA2MeVCompleteCnv : public LAruA2MeVCompleteCnvBase {
friend class CnvFactory<LAruA2MeVCompleteCnv >;
protected:
+public:
LAruA2MeVCompleteCnv (ISvcLocator* svcloc) : LAruA2MeVCompleteCnvBase(svcloc) {}
+protected:
virtual LArConditionsSubset<LArSingleFloatP>* createTransient ();
LArConditionsSubset<LArSingleFloatP>* createTransient(LArConditionsSubset<LAruA2MeVP>* orig);
};
diff --git a/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LAruA2MeVMCCnv.h b/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LAruA2MeVMCCnv.h
old mode 100755
new mode 100644
index b19f3fb1f6f..b70143deff4
--- a/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LAruA2MeVMCCnv.h
+++ b/LArCalorimeter/LArCnv/LArCondAthenaPool/src/LAruA2MeVMCCnv.h
@@ -24,7 +24,9 @@ typedef LArSingleFloatConverter<LAruA2MeVMC> LAruA2MeVMCCnvBase;
class LAruA2MeVMCCnv : public LAruA2MeVMCCnvBase {
friend class CnvFactory<LAruA2MeVMCCnv >;
protected:
+public:
LAruA2MeVMCCnv (ISvcLocator* svcloc) : LAruA2MeVMCCnvBase(svcloc) {}
+protected:
virtual LArConditionsSubset<LArSingleFloatP>* createTransient ();
LArConditionsSubset<LArSingleFloatP>* createTransient(LArConditionsSubset<LAruA2MeVP>* orig);
};
diff --git a/LArCalorimeter/LArCnv/LArIdCnv/LArIdCnv/LArElectrodeIDDetDescrCnv.h b/LArCalorimeter/LArCnv/LArIdCnv/LArIdCnv/LArElectrodeIDDetDescrCnv.h
index dd23a66445c..194b65ed1fe 100755
--- a/LArCalorimeter/LArCnv/LArIdCnv/LArIdCnv/LArElectrodeIDDetDescrCnv.h
+++ b/LArCalorimeter/LArCnv/LArIdCnv/LArIdCnv/LArElectrodeIDDetDescrCnv.h
@@ -34,8 +34,6 @@
**/
class LArElectrodeIDDetDescrCnv: public DetDescrConverter {
- friend class CnvFactory<LArElectrodeIDDetDescrCnv>;
-
public:
virtual long int repSvcType() const;
virtual StatusCode initialize();
@@ -46,7 +44,6 @@ public:
static long storageType();
static const CLID& classID();
-protected:
LArElectrodeIDDetDescrCnv(ISvcLocator* svcloc);
};
diff --git a/LArCalorimeter/LArCnv/LArIdCnv/LArIdCnv/LArHVLineIDDetDescrCnv.h b/LArCalorimeter/LArCnv/LArIdCnv/LArIdCnv/LArHVLineIDDetDescrCnv.h
index cfea84cb8fa..6f9dfd3724c 100755
--- a/LArCalorimeter/LArCnv/LArIdCnv/LArIdCnv/LArHVLineIDDetDescrCnv.h
+++ b/LArCalorimeter/LArCnv/LArIdCnv/LArIdCnv/LArHVLineIDDetDescrCnv.h
@@ -34,7 +34,6 @@
**/
class LArHVLineIDDetDescrCnv: public DetDescrConverter {
- friend class CnvFactory<LArHVLineIDDetDescrCnv>;
public:
virtual long int repSvcType() const;
@@ -46,7 +45,6 @@ public:
static long storageType();
static const CLID& classID();
-protected:
LArHVLineIDDetDescrCnv(ISvcLocator* svcloc);
};
diff --git a/LArCalorimeter/LArCnv/LArIdCnv/LArIdCnv/LArIdMgrDetDescrCnv.h b/LArCalorimeter/LArCnv/LArIdCnv/LArIdCnv/LArIdMgrDetDescrCnv.h
index 028b878d502..9557dd8dfc9 100755
--- a/LArCalorimeter/LArCnv/LArIdCnv/LArIdCnv/LArIdMgrDetDescrCnv.h
+++ b/LArCalorimeter/LArCnv/LArIdCnv/LArIdCnv/LArIdMgrDetDescrCnv.h
@@ -34,7 +34,6 @@
*/
class LArIdMgrDetDescrCnv: public DetDescrConverter {
- friend class CnvFactory<LArIdMgrDetDescrCnv>;
public:
virtual long int repSvcType() const;
@@ -46,7 +45,6 @@ public:
static long storageType();
static const CLID& classID();
-protected:
LArIdMgrDetDescrCnv(ISvcLocator* svcloc);
private:
diff --git a/LArCalorimeter/LArCnv/LArIdCnv/LArIdCnv/LArOnlineIDDetDescrCnv.h b/LArCalorimeter/LArCnv/LArIdCnv/LArIdCnv/LArOnlineIDDetDescrCnv.h
index 6731050c502..f6463608cc4 100755
--- a/LArCalorimeter/LArCnv/LArIdCnv/LArIdCnv/LArOnlineIDDetDescrCnv.h
+++ b/LArCalorimeter/LArCnv/LArIdCnv/LArIdCnv/LArOnlineIDDetDescrCnv.h
@@ -34,7 +34,6 @@
**/
class LArOnlineIDDetDescrCnv: public DetDescrConverter {
- friend class CnvFactory<LArOnlineIDDetDescrCnv>;
public:
virtual long int repSvcType() const;
@@ -46,7 +45,6 @@ public:
static long storageType();
static const CLID& classID();
-protected:
LArOnlineIDDetDescrCnv(ISvcLocator* svcloc);
};
diff --git a/LArCalorimeter/LArCnv/LArIdCnv/LArIdCnv/LArOnline_SuperCellIDDetDescrCnv.h b/LArCalorimeter/LArCnv/LArIdCnv/LArIdCnv/LArOnline_SuperCellIDDetDescrCnv.h
index b8ed1301a2c..625c78bdc0a 100755
--- a/LArCalorimeter/LArCnv/LArIdCnv/LArIdCnv/LArOnline_SuperCellIDDetDescrCnv.h
+++ b/LArCalorimeter/LArCnv/LArIdCnv/LArIdCnv/LArOnline_SuperCellIDDetDescrCnv.h
@@ -34,7 +34,6 @@
**/
class LArOnline_SuperCellIDDetDescrCnv: public DetDescrConverter {
- friend class CnvFactory<LArOnline_SuperCellIDDetDescrCnv>;
public:
virtual long int repSvcType() const;
@@ -46,7 +45,6 @@ public:
static long storageType();
static const CLID& classID();
-protected:
LArOnline_SuperCellIDDetDescrCnv(ISvcLocator* svcloc);
};
diff --git a/LArCalorimeter/LArCnv/LArIdCnv/src/LArElectrodeIDDetDescrCnv.cxx b/LArCalorimeter/LArCnv/LArIdCnv/src/LArElectrodeIDDetDescrCnv.cxx
index 4ce81750f83..f3d677ee9b0 100755
--- a/LArCalorimeter/LArCnv/LArIdCnv/src/LArElectrodeIDDetDescrCnv.cxx
+++ b/LArCalorimeter/LArCnv/LArIdCnv/src/LArElectrodeIDDetDescrCnv.cxx
@@ -17,7 +17,6 @@
#include "DetDescrCnvSvc/DetDescrConverter.h"
#include "DetDescrCnvSvc/DetDescrAddress.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/CnvFactory.h"
#include "StoreGate/StoreGate.h"
#include "IdDictDetDescr/IdDictManager.h"
diff --git a/LArCalorimeter/LArCnv/LArIdCnv/src/LArHVLineIDDetDescrCnv.cxx b/LArCalorimeter/LArCnv/LArIdCnv/src/LArHVLineIDDetDescrCnv.cxx
index 3bb58a3d59e..341faf9bf48 100755
--- a/LArCalorimeter/LArCnv/LArIdCnv/src/LArHVLineIDDetDescrCnv.cxx
+++ b/LArCalorimeter/LArCnv/LArIdCnv/src/LArHVLineIDDetDescrCnv.cxx
@@ -17,7 +17,6 @@
#include "DetDescrCnvSvc/DetDescrConverter.h"
#include "DetDescrCnvSvc/DetDescrAddress.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/CnvFactory.h"
#include "StoreGate/StoreGate.h"
#include "IdDictDetDescr/IdDictManager.h"
diff --git a/LArCalorimeter/LArCnv/LArIdCnv/src/LArIdCnv_entries.cxx b/LArCalorimeter/LArCnv/LArIdCnv/src/LArIdCnv_entries.cxx
index 1605dcef611..4bf87e9a6a7 100644
--- a/LArCalorimeter/LArCnv/LArIdCnv/src/LArIdCnv_entries.cxx
+++ b/LArCalorimeter/LArCnv/LArIdCnv/src/LArIdCnv_entries.cxx
@@ -4,9 +4,9 @@
#include "LArIdCnv/LArHVLineIDDetDescrCnv.h"
#include "LArIdCnv/LArElectrodeIDDetDescrCnv.h"
-DECLARE_CONVERTER_FACTORY( LArElectrodeIDDetDescrCnv )
-DECLARE_CONVERTER_FACTORY( LArHVLineIDDetDescrCnv )
-DECLARE_CONVERTER_FACTORY( LArIdMgrDetDescrCnv )
-DECLARE_CONVERTER_FACTORY( LArOnlineIDDetDescrCnv )
-DECLARE_CONVERTER_FACTORY( LArOnline_SuperCellIDDetDescrCnv )
+DECLARE_CONVERTER( LArElectrodeIDDetDescrCnv )
+DECLARE_CONVERTER( LArHVLineIDDetDescrCnv )
+DECLARE_CONVERTER( LArIdMgrDetDescrCnv )
+DECLARE_CONVERTER( LArOnlineIDDetDescrCnv )
+DECLARE_CONVERTER( LArOnline_SuperCellIDDetDescrCnv )
diff --git a/LArCalorimeter/LArCnv/LArIdCnv/src/LArIdMgrDetDescrCnv.cxx b/LArCalorimeter/LArCnv/LArIdCnv/src/LArIdMgrDetDescrCnv.cxx
index dafb2b283e5..7540c4757b0 100755
--- a/LArCalorimeter/LArCnv/LArIdCnv/src/LArIdMgrDetDescrCnv.cxx
+++ b/LArCalorimeter/LArCnv/LArIdCnv/src/LArIdMgrDetDescrCnv.cxx
@@ -25,7 +25,6 @@
#include "GaudiKernel/Bootstrap.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/IToolSvc.h"
diff --git a/LArCalorimeter/LArCnv/LArIdCnv/src/LArOnlineIDDetDescrCnv.cxx b/LArCalorimeter/LArCnv/LArIdCnv/src/LArOnlineIDDetDescrCnv.cxx
index 0b42d074bae..e11849d324a 100755
--- a/LArCalorimeter/LArCnv/LArIdCnv/src/LArOnlineIDDetDescrCnv.cxx
+++ b/LArCalorimeter/LArCnv/LArIdCnv/src/LArOnlineIDDetDescrCnv.cxx
@@ -17,7 +17,6 @@
#include "DetDescrCnvSvc/DetDescrConverter.h"
#include "DetDescrCnvSvc/DetDescrAddress.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/CnvFactory.h"
#include "StoreGate/StoreGate.h"
#include "IdDictDetDescr/IdDictManager.h"
diff --git a/LArCalorimeter/LArCnv/LArIdCnv/src/LArOnline_SuperCellIDDetDescrCnv.cxx b/LArCalorimeter/LArCnv/LArIdCnv/src/LArOnline_SuperCellIDDetDescrCnv.cxx
index e23e72d0606..80c50ca3da0 100755
--- a/LArCalorimeter/LArCnv/LArIdCnv/src/LArOnline_SuperCellIDDetDescrCnv.cxx
+++ b/LArCalorimeter/LArCnv/LArIdCnv/src/LArOnline_SuperCellIDDetDescrCnv.cxx
@@ -17,7 +17,6 @@
#include "DetDescrCnvSvc/DetDescrConverter.h"
#include "DetDescrCnvSvc/DetDescrAddress.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/CnvFactory.h"
#include "StoreGate/StoreGate.h"
#include "IdDictDetDescr/IdDictManager.h"
diff --git a/LArCalorimeter/LArCnv/LArSimEventAthenaPool/src/LArHitContainerCnv.h b/LArCalorimeter/LArCnv/LArSimEventAthenaPool/src/LArHitContainerCnv.h
old mode 100755
new mode 100644
index 42a8d320de4..9585de294f9
--- a/LArCalorimeter/LArCnv/LArSimEventAthenaPool/src/LArHitContainerCnv.h
+++ b/LArCalorimeter/LArCnv/LArSimEventAthenaPool/src/LArHitContainerCnv.h
@@ -17,7 +17,9 @@ typedef LArHitContainer_p2 LArHitContainer_PERS;
class LArHitContainerCnv : public T_AthenaPoolCustomCnv<LArHitContainer, LArHitContainer_PERS > {
friend class CnvFactory<LArHitContainerCnv>;
protected:
+public:
LArHitContainerCnv(ISvcLocator* svcloc) : T_AthenaPoolCustomCnv<LArHitContainer, LArHitContainer_PERS >( svcloc) {}
+protected:
LArHitContainer_PERS* createPersistent(LArHitContainer* transCont);
LArHitContainer* createTransient ();
};
diff --git a/LArCalorimeter/LArCnv/LArSimEventAthenaPool/src/LArHitFloatContainerCnv.h b/LArCalorimeter/LArCnv/LArSimEventAthenaPool/src/LArHitFloatContainerCnv.h
old mode 100755
new mode 100644
index cffaf3633c7..30447cab416
--- a/LArCalorimeter/LArCnv/LArSimEventAthenaPool/src/LArHitFloatContainerCnv.h
+++ b/LArCalorimeter/LArCnv/LArSimEventAthenaPool/src/LArHitFloatContainerCnv.h
@@ -19,7 +19,9 @@ class LArHitContainer;
class LArHitFloatContainerCnv : public T_AthenaPoolCustomCnv<LArHitFloatContainer, LArHitContainer_PERS > {
friend class CnvFactory<LArHitFloatContainerCnv>;
protected:
+public:
LArHitFloatContainerCnv(ISvcLocator* svcloc) : T_AthenaPoolCustomCnv<LArHitFloatContainer, LArHitContainer_PERS >( svcloc) {}
+protected:
LArHitContainer_PERS* createPersistent(LArHitFloatContainer* transCont);
LArHitFloatContainer* createTransient ();
LArHitFloatContainer* copyLArHitToFloat(const LArHitContainer* double_cont);
diff --git a/LArCalorimeter/LArExample/TestLArHardwareID/src/TestLArHWID_Algo.cxx b/LArCalorimeter/LArExample/TestLArHardwareID/src/TestLArHWID_Algo.cxx
index f22eb80e50a..255cbfe7e89 100755
--- a/LArCalorimeter/LArExample/TestLArHardwareID/src/TestLArHWID_Algo.cxx
+++ b/LArCalorimeter/LArExample/TestLArHardwareID/src/TestLArHWID_Algo.cxx
@@ -7,7 +7,6 @@
#include <fstream>
#include "TestLArHardwareID/TestLArHWID_Algo.h"
-#include "GaudiKernel/AlgFactory.h"
#include "GaudiKernel/IService.h"
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/Property.h"
diff --git a/LArCalorimeter/LArExample/TestLArHardwareID/src/initTTMap_Algo.cxx b/LArCalorimeter/LArExample/TestLArHardwareID/src/initTTMap_Algo.cxx
index ae4e7b35abf..990a7d3c3e7 100755
--- a/LArCalorimeter/LArExample/TestLArHardwareID/src/initTTMap_Algo.cxx
+++ b/LArCalorimeter/LArExample/TestLArHardwareID/src/initTTMap_Algo.cxx
@@ -8,7 +8,6 @@
#include <math.h>
#include "TestLArHardwareID/initTTMap_Algo.h"
-#include "GaudiKernel/AlgFactory.h"
#include "GaudiKernel/IService.h"
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/Property.h"
diff --git a/LArCalorimeter/LArExample/TestLArHardwareID/src/reinitTTMap_Algo.cxx b/LArCalorimeter/LArExample/TestLArHardwareID/src/reinitTTMap_Algo.cxx
index d4f38212060..e7df66a21b2 100644
--- a/LArCalorimeter/LArExample/TestLArHardwareID/src/reinitTTMap_Algo.cxx
+++ b/LArCalorimeter/LArExample/TestLArHardwareID/src/reinitTTMap_Algo.cxx
@@ -8,7 +8,6 @@
#include <math.h>
#include "TestLArHardwareID/reinitTTMap_Algo.h"
-#include "GaudiKernel/AlgFactory.h"
#include "GaudiKernel/IService.h"
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/Property.h"
diff --git a/LArCalorimeter/LArExample/TestLArHardwareID/src/testTTMap_Algo.cxx b/LArCalorimeter/LArExample/TestLArHardwareID/src/testTTMap_Algo.cxx
index 7a641dd03e3..8cacdae794d 100755
--- a/LArCalorimeter/LArExample/TestLArHardwareID/src/testTTMap_Algo.cxx
+++ b/LArCalorimeter/LArExample/TestLArHardwareID/src/testTTMap_Algo.cxx
@@ -7,7 +7,6 @@
#include <fstream>
#include "TestLArHardwareID/testTTMap_Algo.h"
-#include "GaudiKernel/AlgFactory.h"
#include "GaudiKernel/IService.h"
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/Property.h"
diff --git a/LArCalorimeter/LArExample/TestLArHardwareID/src/updateTTMap_Algo.cxx b/LArCalorimeter/LArExample/TestLArHardwareID/src/updateTTMap_Algo.cxx
index bfeb0be9a01..d7f3738cfae 100644
--- a/LArCalorimeter/LArExample/TestLArHardwareID/src/updateTTMap_Algo.cxx
+++ b/LArCalorimeter/LArExample/TestLArHardwareID/src/updateTTMap_Algo.cxx
@@ -7,7 +7,6 @@
#include <fstream>
#include "TestLArHardwareID/updateTTMap_Algo.h"
-#include "GaudiKernel/AlgFactory.h"
#include "GaudiKernel/IService.h"
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/Property.h"
diff --git a/LArCalorimeter/LArG4/LArG4MiniFCAL/src/MiniFCALAssignIdentifier.h b/LArCalorimeter/LArG4/LArG4MiniFCAL/src/MiniFCALAssignIdentifier.h
index 85a62823453..58674153d2e 100644
--- a/LArCalorimeter/LArG4/LArG4MiniFCAL/src/MiniFCALAssignIdentifier.h
+++ b/LArCalorimeter/LArG4/LArG4MiniFCAL/src/MiniFCALAssignIdentifier.h
@@ -13,7 +13,6 @@
#include "StoreGate/StoreGateSvc.h"
#include "StoreGate/DataHandle.h"
#include "GaudiKernel/Algorithm.h"
-#include "GaudiKernel/AlgFactory.h"
#include "G4TrackStatus.hh"
#include "G4ParticleDefinition.hh"
diff --git a/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/Other/LArTBH6BeamInfo.cc b/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/Other/LArTBH6BeamInfo.cc
index 370087dce85..f25679e28d4 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/Other/LArTBH6BeamInfo.cc
+++ b/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/Other/LArTBH6BeamInfo.cc
@@ -14,7 +14,6 @@
// Gaudi Includes
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/AlgFactory.h"
#include "GaudiKernel/IToolSvc.h"
static const AlgFactory<LArTBH6BeamInfo> s_factory;
diff --git a/LArCalorimeter/LArMonTools/src/LArFEBMon.cxx b/LArCalorimeter/LArMonTools/src/LArFEBMon.cxx
index ea7ea06c1d0..dafde3522f2 100755
--- a/LArCalorimeter/LArMonTools/src/LArFEBMon.cxx
+++ b/LArCalorimeter/LArMonTools/src/LArFEBMon.cxx
@@ -12,7 +12,6 @@
// 2007- : Algorithm fully rewritten and optimized by B.Trocme
// ********************************************************************
-//#include "GaudiKernel/AlgFactory.h"
//#include "GaudiKernel/SmartDataPtr.h"
//#include "GaudiKernel/IToolSvc.h"
diff --git a/LArCalorimeter/LArROD/src/ReadLArDigits.cxx b/LArCalorimeter/LArROD/src/ReadLArDigits.cxx
index 137917154e2..a456993b6bd 100755
--- a/LArCalorimeter/LArROD/src/ReadLArDigits.cxx
+++ b/LArCalorimeter/LArROD/src/ReadLArDigits.cxx
@@ -3,7 +3,6 @@
*/
#include "LArROD/ReadLArDigits.h"
-#include "GaudiKernel/AlgFactory.h"
#include "LArRawEvent/LArDigit.h"
#include <vector>
// #include "GaudiKernel/IToolSvc.h"
diff --git a/LArCalorimeter/LArRecUtils/src/LArADC2MeVTool.cxx b/LArCalorimeter/LArRecUtils/src/LArADC2MeVTool.cxx
index 4e5513ccda3..5fc3bc72d67 100755
--- a/LArCalorimeter/LArRecUtils/src/LArADC2MeVTool.cxx
+++ b/LArCalorimeter/LArRecUtils/src/LArADC2MeVTool.cxx
@@ -3,7 +3,6 @@
*/
#include "LArRecUtils/LArADC2MeVTool.h"
-#include "GaudiKernel/ToolFactory.h"
#include "GaudiKernel/MsgStream.h"
#include "AthenaKernel/errorcheck.h"
#include "GaudiKernel/IIncidentSvc.h"
diff --git a/LArCalorimeter/LArRecUtils/src/LArAutoCorrTotalTool.cxx b/LArCalorimeter/LArRecUtils/src/LArAutoCorrTotalTool.cxx
index 3cf5b44b0dd..6287bc261fc 100755
--- a/LArCalorimeter/LArRecUtils/src/LArAutoCorrTotalTool.cxx
+++ b/LArCalorimeter/LArRecUtils/src/LArAutoCorrTotalTool.cxx
@@ -3,7 +3,6 @@
*/
#include "LArRecUtils/LArAutoCorrTotalTool.h"
-#include "GaudiKernel/ToolFactory.h"
#include "GaudiKernel/IIncidentSvc.h"
#include "LArElecCalib/LArConditionsException.h"
#include "StoreGate/StoreGateSvc.h"
diff --git a/LArCalorimeter/LArRecUtils/src/LArHVCorrTool.cxx b/LArCalorimeter/LArRecUtils/src/LArHVCorrTool.cxx
index a031d49244b..f17a0f17de6 100755
--- a/LArCalorimeter/LArRecUtils/src/LArHVCorrTool.cxx
+++ b/LArCalorimeter/LArRecUtils/src/LArHVCorrTool.cxx
@@ -3,7 +3,6 @@
*/
#include "LArRecUtils/LArHVCorrTool.h"
-#include "GaudiKernel/ToolFactory.h"
#include "AthenaKernel/errorcheck.h"
#include "GaudiKernel/IIncidentSvc.h"
#include "CaloDetDescr/CaloDetDescrElement.h"
diff --git a/LArCalorimeter/LArRecUtils/src/LArOFCTool.cxx b/LArCalorimeter/LArRecUtils/src/LArOFCTool.cxx
index 2e4e1239426..e6c2a1fd67c 100755
--- a/LArCalorimeter/LArRecUtils/src/LArOFCTool.cxx
+++ b/LArCalorimeter/LArRecUtils/src/LArOFCTool.cxx
@@ -3,7 +3,6 @@
*/
#include "LArRecUtils/LArOFCTool.h"
-#include "GaudiKernel/ToolFactory.h"
#include "GaudiKernel/IToolSvc.h"
#include "GaudiKernel/IIncidentSvc.h"
#include "LArElecCalib/LArConditionsException.h"
diff --git a/LArCalorimeter/LArSim/src/LArFakeHitProducer.cxx b/LArCalorimeter/LArSim/src/LArFakeHitProducer.cxx
index 3715ede6ed4..1bfe59dbea9 100755
--- a/LArCalorimeter/LArSim/src/LArFakeHitProducer.cxx
+++ b/LArCalorimeter/LArSim/src/LArFakeHitProducer.cxx
@@ -4,7 +4,6 @@
#include "LArSim/LArFakeHitProducer.h"
-#include "GaudiKernel/AlgFactory.h"
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/Property.h"
#include "GaudiKernel/IDataProviderSvc.h"
diff --git a/LArCalorimeter/LArSim/src/LArHitMaker.cxx b/LArCalorimeter/LArSim/src/LArHitMaker.cxx
index 2ba57c9b6a3..6a1f599bc64 100755
--- a/LArCalorimeter/LArSim/src/LArHitMaker.cxx
+++ b/LArCalorimeter/LArSim/src/LArHitMaker.cxx
@@ -5,7 +5,6 @@
#include "LArSim/LArHitMaker.h"
#include "LArSim/LArHitProducer.h"
-#include "GaudiKernel/AlgFactory.h"
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/Property.h"
diff --git a/LArCalorimeter/LArSim/src/LArHitProducer.cxx b/LArCalorimeter/LArSim/src/LArHitProducer.cxx
index 175754e51b7..ee93a8e7757 100755
--- a/LArCalorimeter/LArSim/src/LArHitProducer.cxx
+++ b/LArCalorimeter/LArSim/src/LArHitProducer.cxx
@@ -4,7 +4,6 @@
#include "LArSim/LArHitProducer.h"
-#include "GaudiKernel/AlgFactory.h"
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/Property.h"
#include "GaudiKernel/IDataProviderSvc.h"
diff --git a/LArCalorimeter/LArSim/src/LArHitReader.cxx b/LArCalorimeter/LArSim/src/LArHitReader.cxx
index 62080ff05d2..8bf7c97538e 100755
--- a/LArCalorimeter/LArSim/src/LArHitReader.cxx
+++ b/LArCalorimeter/LArSim/src/LArHitReader.cxx
@@ -4,7 +4,6 @@
#include "LArSim/LArHitReader.h"
-#include "GaudiKernel/AlgFactory.h"
#include "GaudiKernel/Property.h"
#include "GaudiKernel/IDataProviderSvc.h"
diff --git a/LArCalorimeter/LArTest/LArCalibTest/src/LArCablingChecker.cxx b/LArCalorimeter/LArTest/LArCalibTest/src/LArCablingChecker.cxx
index 4a72d1794e4..443bbef409f 100755
--- a/LArCalorimeter/LArTest/LArCalibTest/src/LArCablingChecker.cxx
+++ b/LArCalorimeter/LArTest/LArCalibTest/src/LArCablingChecker.cxx
@@ -3,7 +3,6 @@
*/
#include "LArCalibTest/LArCablingChecker.h"
-#include "GaudiKernel/AlgFactory.h"
#include "LArRawEvent/LArDigit.h"
#include "CaloIdentifier/CaloIdManager.h"
#include "LArRawConditions/LArCalibParams.h"
diff --git a/LArCalorimeter/LArTest/LArEventTest/src/CheckLArFebHeader.cxx b/LArCalorimeter/LArTest/LArEventTest/src/CheckLArFebHeader.cxx
index 0503e3d6b8b..9ec03702ae4 100755
--- a/LArCalorimeter/LArTest/LArEventTest/src/CheckLArFebHeader.cxx
+++ b/LArCalorimeter/LArTest/LArEventTest/src/CheckLArFebHeader.cxx
@@ -3,7 +3,6 @@
*/
#include "LArEventTest/CheckLArFebHeader.h"
-#include "GaudiKernel/AlgFactory.h"
#include <vector>
#include "GaudiKernel/IToolSvc.h"
#include "LArRawEvent/LArFebHeaderContainer.h"
diff --git a/LumiBlock/LumiBlockComps/Root/LumiBlockMetaDataTool.cxx b/LumiBlock/LumiBlockComps/Root/LumiBlockMetaDataTool.cxx
index 41406a2e8c4..7ba71de8e58 100644
--- a/LumiBlock/LumiBlockComps/Root/LumiBlockMetaDataTool.cxx
+++ b/LumiBlock/LumiBlockComps/Root/LumiBlockMetaDataTool.cxx
@@ -14,7 +14,6 @@
#include "LumiBlockComps/ILumiCalcSvc.h"
#include "xAODLuminosity/SortLumiBlockRangeByStart.h"
-#include "GaudiKernel/ToolFactory.h"
#include "GaudiKernel/IIncidentSvc.h"
#include "GaudiKernel/FileIncident.h"
diff --git a/LumiBlock/LumiBlockComps/src/LumiCalcSvc.cxx b/LumiBlock/LumiBlockComps/src/LumiCalcSvc.cxx
index 28dbc3c437b..ef9530e468f 100644
--- a/LumiBlock/LumiBlockComps/src/LumiCalcSvc.cxx
+++ b/LumiBlock/LumiBlockComps/src/LumiCalcSvc.cxx
@@ -14,7 +14,6 @@
#include <cstddef>
// GaudiKernel includes
-#include "GaudiKernel/AlgFactory.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/GaudiException.h"
#include "GaudiKernel/IProperty.h"
diff --git a/LumiBlock/LumiBlockPers/LumiBlockAthenaPool/src/LumiBlockCollectionCnv.h b/LumiBlock/LumiBlockPers/LumiBlockAthenaPool/src/LumiBlockCollectionCnv.h
old mode 100755
new mode 100644
index 1e43e9a72af..c753371b4d9
--- a/LumiBlock/LumiBlockPers/LumiBlockAthenaPool/src/LumiBlockCollectionCnv.h
+++ b/LumiBlock/LumiBlockPers/LumiBlockAthenaPool/src/LumiBlockCollectionCnv.h
@@ -23,7 +23,9 @@ class LumiBlockCollectionCnv : public LumiBlockCollectionCnvBase
{
friend class CnvFactory<LumiBlockCollectionCnv >;
protected:
+public:
LumiBlockCollectionCnv (ISvcLocator* svcloc) : LumiBlockCollectionCnvBase(svcloc) {}
+protected:
virtual LumiBlockCollection_PERS* createPersistent (LumiBlockCollection* transCont);
virtual LumiBlockCollection* createTransient ();
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcDb/src/AmdcDb.cxx b/MuonSpectrometer/Amdcsimrec/AmdcDb/src/AmdcDb.cxx
index d29d686ef51..fc5dc78afb4 100755
--- a/MuonSpectrometer/Amdcsimrec/AmdcDb/src/AmdcDb.cxx
+++ b/MuonSpectrometer/Amdcsimrec/AmdcDb/src/AmdcDb.cxx
@@ -3,7 +3,6 @@
*/
#include "StoreGate/StoreGateSvc.h"
-#include "GaudiKernel/SvcFactory.h"
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/SmartDataPtr.h"
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcMGM/src/AmdcDumpGeoModel.cxx b/MuonSpectrometer/Amdcsimrec/AmdcMGM/src/AmdcDumpGeoModel.cxx
index ced994aa203..1181935928b 100644
--- a/MuonSpectrometer/Amdcsimrec/AmdcMGM/src/AmdcDumpGeoModel.cxx
+++ b/MuonSpectrometer/Amdcsimrec/AmdcMGM/src/AmdcDumpGeoModel.cxx
@@ -2,7 +2,6 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#include "GaudiKernel/AlgFactory.h"
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/SmartDataPtr.h"
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcOracle/src/AmdcDumpOracle.cxx b/MuonSpectrometer/Amdcsimrec/AmdcOracle/src/AmdcDumpOracle.cxx
index 677686acb80..f07a7e7de15 100755
--- a/MuonSpectrometer/Amdcsimrec/AmdcOracle/src/AmdcDumpOracle.cxx
+++ b/MuonSpectrometer/Amdcsimrec/AmdcOracle/src/AmdcDumpOracle.cxx
@@ -2,7 +2,6 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#include "GaudiKernel/AlgFactory.h"
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/SmartDataPtr.h"
diff --git a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibSvc/src/MdtCalibrationDbSvc.cxx b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibSvc/src/MdtCalibrationDbSvc.cxx
index 79797a87f6f..cc59fd78878 100644
--- a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibSvc/src/MdtCalibrationDbSvc.cxx
+++ b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibSvc/src/MdtCalibrationDbSvc.cxx
@@ -3,7 +3,6 @@
*/
#include "MdtCalibSvc/MdtCalibrationDbSvc.h"
-#include "GaudiKernel/SvcFactory.h"
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/Bootstrap.h"
#include "GaudiKernel/MsgStream.h"
diff --git a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibSvc/src/MdtCalibrationRegionSvc.cxx b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibSvc/src/MdtCalibrationRegionSvc.cxx
index 656bda855ff..1ee31955373 100644
--- a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibSvc/src/MdtCalibrationRegionSvc.cxx
+++ b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibSvc/src/MdtCalibrationRegionSvc.cxx
@@ -3,7 +3,6 @@
*/
// other packages
-#include "GaudiKernel/SvcFactory.h"
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/Bootstrap.h"
#include "GaudiKernel/IMessageSvc.h"
diff --git a/MuonSpectrometer/MuonCalib/RpcCalib/RpcCalibTools/src/RpcExtrapolationTool.cxx b/MuonSpectrometer/MuonCalib/RpcCalib/RpcCalibTools/src/RpcExtrapolationTool.cxx
index 204e2abd147..b8acbd1f17a 100644
--- a/MuonSpectrometer/MuonCalib/RpcCalib/RpcCalibTools/src/RpcExtrapolationTool.cxx
+++ b/MuonSpectrometer/MuonCalib/RpcCalib/RpcCalibTools/src/RpcExtrapolationTool.cxx
@@ -2,7 +2,6 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#include "GaudiKernel/ToolFactory.h"
#include "RpcCalibTools/RpcExtrapolationTool.h"
#include "TrkParameters/TrackParameters.h"
diff --git a/MuonSpectrometer/MuonCalib/RpcCalib/RpcCalibTools/src/RpcResidualsTool.cxx b/MuonSpectrometer/MuonCalib/RpcCalib/RpcCalibTools/src/RpcResidualsTool.cxx
index f1eda7f0178..7659c50baeb 100644
--- a/MuonSpectrometer/MuonCalib/RpcCalib/RpcCalibTools/src/RpcResidualsTool.cxx
+++ b/MuonSpectrometer/MuonCalib/RpcCalib/RpcCalibTools/src/RpcResidualsTool.cxx
@@ -2,7 +2,6 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#include "GaudiKernel/ToolFactory.h"
#include "RpcCalibTools/RpcExtrapolationTool.h"
#include "RpcCalibTools/RpcResidualsTool.h"
diff --git a/MuonSpectrometer/MuonCnv/MuonByteStream/MuonByteStream/CscRdoContByteStreamCnv.h b/MuonSpectrometer/MuonCnv/MuonByteStream/MuonByteStream/CscRdoContByteStreamCnv.h
index fa23a84bad2..943b1081f03 100644
--- a/MuonSpectrometer/MuonCnv/MuonByteStream/MuonByteStream/CscRdoContByteStreamCnv.h
+++ b/MuonSpectrometer/MuonCnv/MuonByteStream/MuonByteStream/CscRdoContByteStreamCnv.h
@@ -29,13 +29,12 @@ extern long ByteStream_StorageType;
*/
class CscRdoContByteStreamCnv: public Converter
{
- friend class CnvFactory<CscRdoContByteStreamCnv>;
protected:
- CscRdoContByteStreamCnv(ISvcLocator* svcloc);
~CscRdoContByteStreamCnv();
public:
+ CscRdoContByteStreamCnv(ISvcLocator* svcloc);
virtual StatusCode initialize();
virtual StatusCode createObj(IOpaqueAddress* /*pAddr*/, DataObject*& /*pObj*/){
diff --git a/MuonSpectrometer/MuonCnv/MuonByteStream/MuonByteStream/MdtCsmContByteStreamCnv.h b/MuonSpectrometer/MuonCnv/MuonByteStream/MuonByteStream/MdtCsmContByteStreamCnv.h
index ffd35018d61..707e869b1aa 100644
--- a/MuonSpectrometer/MuonCnv/MuonByteStream/MuonByteStream/MdtCsmContByteStreamCnv.h
+++ b/MuonSpectrometer/MuonCnv/MuonByteStream/MuonByteStream/MdtCsmContByteStreamCnv.h
@@ -33,13 +33,12 @@ template <class TYPE> class CnvFactory;
extern long ByteStream_StorageType;
class MdtCsmContByteStreamCnv: public Converter {
- friend class CnvFactory<MdtCsmContByteStreamCnv>;
protected:
- MdtCsmContByteStreamCnv(ISvcLocator* svcloc);
~MdtCsmContByteStreamCnv();
public:
+ MdtCsmContByteStreamCnv(ISvcLocator* svcloc);
typedef Muon::IMDT_RDOtoByteStreamTool BYTESTREAMTOOL ;
diff --git a/MuonSpectrometer/MuonCnv/MuonByteStream/MuonByteStream/RpcPadContByteStreamCnv.h b/MuonSpectrometer/MuonCnv/MuonByteStream/MuonByteStream/RpcPadContByteStreamCnv.h
index 6986c536b25..3422efca7c0 100644
--- a/MuonSpectrometer/MuonCnv/MuonByteStream/MuonByteStream/RpcPadContByteStreamCnv.h
+++ b/MuonSpectrometer/MuonCnv/MuonByteStream/MuonByteStream/RpcPadContByteStreamCnv.h
@@ -36,13 +36,12 @@ template <class TYPE> class CnvFactory;
extern long ByteStream_StorageType;
class RpcPadContByteStreamCnv: public Converter {
- friend class CnvFactory<RpcPadContByteStreamCnv>;
protected:
- RpcPadContByteStreamCnv(ISvcLocator* svcloc);
~RpcPadContByteStreamCnv();
public:
+ RpcPadContByteStreamCnv(ISvcLocator* svcloc);
typedef Muon::IRPC_RDOtoByteStreamTool BYTESTREAMTOOL ;
diff --git a/MuonSpectrometer/MuonCnv/MuonByteStream/MuonByteStream/TgcRdoContByteStreamCnv.h b/MuonSpectrometer/MuonCnv/MuonByteStream/MuonByteStream/TgcRdoContByteStreamCnv.h
index 84df4e6f693..803c666d804 100644
--- a/MuonSpectrometer/MuonCnv/MuonByteStream/MuonByteStream/TgcRdoContByteStreamCnv.h
+++ b/MuonSpectrometer/MuonCnv/MuonByteStream/MuonByteStream/TgcRdoContByteStreamCnv.h
@@ -34,14 +34,12 @@ extern long ByteStream_StorageType;
*/
class TgcRdoContByteStreamCnv: public Converter
{
- friend class CnvFactory<TgcRdoContByteStreamCnv>;
protected:
- TgcRdoContByteStreamCnv(ISvcLocator* svcloc);
~TgcRdoContByteStreamCnv();
public:
-
+ TgcRdoContByteStreamCnv(ISvcLocator* svcloc);
virtual StatusCode initialize();
diff --git a/MuonSpectrometer/MuonCnv/MuonByteStream/src/CscRdoContByteStreamCnv.cxx b/MuonSpectrometer/MuonCnv/MuonByteStream/src/CscRdoContByteStreamCnv.cxx
index 34ae2118105..25395d0240f 100644
--- a/MuonSpectrometer/MuonCnv/MuonByteStream/src/CscRdoContByteStreamCnv.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonByteStream/src/CscRdoContByteStreamCnv.cxx
@@ -12,7 +12,6 @@
#include "ByteStreamData/RawEvent.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IToolSvc.h"
diff --git a/MuonSpectrometer/MuonCnv/MuonByteStream/src/MdtCsmContByteStreamCnv.cxx b/MuonSpectrometer/MuonCnv/MuonByteStream/src/MdtCsmContByteStreamCnv.cxx
index dcc0ece1c8d..6a387db251c 100644
--- a/MuonSpectrometer/MuonCnv/MuonByteStream/src/MdtCsmContByteStreamCnv.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonByteStream/src/MdtCsmContByteStreamCnv.cxx
@@ -12,7 +12,6 @@
//using namespace EventFormat::RawMemory ;
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IRegistry.h"
diff --git a/MuonSpectrometer/MuonCnv/MuonByteStream/src/RpcPadContByteStreamCnv.cxx b/MuonSpectrometer/MuonCnv/MuonByteStream/src/RpcPadContByteStreamCnv.cxx
index ce13d970142..3e72b75a966 100644
--- a/MuonSpectrometer/MuonCnv/MuonByteStream/src/RpcPadContByteStreamCnv.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonByteStream/src/RpcPadContByteStreamCnv.cxx
@@ -12,7 +12,6 @@
//using namespace EventFormat::RawMemory ;
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IRegistry.h"
diff --git a/MuonSpectrometer/MuonCnv/MuonByteStream/src/TgcRdoContByteStreamCnv.cxx b/MuonSpectrometer/MuonCnv/MuonByteStream/src/TgcRdoContByteStreamCnv.cxx
index 8032ee8fce2..d4d74916e72 100644
--- a/MuonSpectrometer/MuonCnv/MuonByteStream/src/TgcRdoContByteStreamCnv.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonByteStream/src/TgcRdoContByteStreamCnv.cxx
@@ -10,7 +10,6 @@
#include "ByteStreamData/RawEvent.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IToolSvc.h"
diff --git a/MuonSpectrometer/MuonCnv/MuonByteStream/src/components/MuonByteStream_entries.cxx b/MuonSpectrometer/MuonCnv/MuonByteStream/src/components/MuonByteStream_entries.cxx
index ba384f1f5a1..ece6d4fdb11 100644
--- a/MuonSpectrometer/MuonCnv/MuonByteStream/src/components/MuonByteStream_entries.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonByteStream/src/components/MuonByteStream_entries.cxx
@@ -11,8 +11,8 @@ DECLARE_COMPONENT( Muon::MdtRawDataProvider )
DECLARE_COMPONENT( Muon::RpcRawDataProvider )
DECLARE_COMPONENT( Muon::TgcRawDataProvider )
DECLARE_COMPONENT( Muon::CscRawDataProvider )
-DECLARE_CONVERTER_FACTORY( MdtCsmContByteStreamCnv )
-DECLARE_CONVERTER_FACTORY( CscRdoContByteStreamCnv )
-DECLARE_CONVERTER_FACTORY( RpcPadContByteStreamCnv )
-DECLARE_CONVERTER_FACTORY( TgcRdoContByteStreamCnv )
+DECLARE_CONVERTER( MdtCsmContByteStreamCnv )
+DECLARE_CONVERTER( CscRdoContByteStreamCnv )
+DECLARE_CONVERTER( RpcPadContByteStreamCnv )
+DECLARE_CONVERTER( TgcRdoContByteStreamCnv )
diff --git a/MuonSpectrometer/MuonCnv/MuonByteStreamCnvTest/src/MuonRdoToMuonDigitTool.cxx b/MuonSpectrometer/MuonCnv/MuonByteStreamCnvTest/src/MuonRdoToMuonDigitTool.cxx
index e85f0980ba3..a611708bf34 100644
--- a/MuonSpectrometer/MuonCnv/MuonByteStreamCnvTest/src/MuonRdoToMuonDigitTool.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonByteStreamCnvTest/src/MuonRdoToMuonDigitTool.cxx
@@ -8,7 +8,6 @@
// algorithm to decode RDO into digits
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/AlgFactory.h"
#include "StoreGate/StoreGate.h"
#include "StoreGate/StoreGateSvc.h"
diff --git a/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/src/CscRdoContByteStreamTool.cxx b/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/src/CscRdoContByteStreamTool.cxx
index 8bcdc1cbc6d..eb1130c5819 100644
--- a/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/src/CscRdoContByteStreamTool.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/src/CscRdoContByteStreamTool.cxx
@@ -8,7 +8,6 @@
#include "MuonRDO/CscRawDataContainer.h"
#include "MuonIdHelpers/CscIdHelper.h"
-#include "GaudiKernel/ToolFactory.h"
#include "StoreGate/StoreGate.h"
#include "CLIDSvc/CLASS_DEF.h"
diff --git a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/ChamberT0sCnv.h b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/ChamberT0sCnv.h
index 6247e3c0d71..cbd7edcfe2c 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/ChamberT0sCnv.h
+++ b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/ChamberT0sCnv.h
@@ -16,7 +16,9 @@ typedef T_AthenaPoolCustomCnv<Muon::ChamberT0s, ChamberT0s_PERS > ChamberT0sC
class ChamberT0sCnv : public ChamberT0sCnvBase {
friend class CnvFactory<ChamberT0sCnv >;
protected:
+public:
ChamberT0sCnv (ISvcLocator* svcloc) : ChamberT0sCnvBase(svcloc) {}
+protected:
virtual ChamberT0s_PERS* createPersistent (Muon::ChamberT0s* transObj);
virtual Muon::ChamberT0s* createTransient ();
};
diff --git a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/CscPrepDataContainerCnv.cxx b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/CscPrepDataContainerCnv.cxx
index 9d9ff6facef..5ed52786b05 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/CscPrepDataContainerCnv.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/CscPrepDataContainerCnv.cxx
@@ -5,7 +5,6 @@
#include "CscPrepDataContainerCnv.h"
// Gaudi
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/IIncidentSvc.h"
diff --git a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/CscSimDataCollectionCnv.cxx b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/CscSimDataCollectionCnv.cxx
index 1a77aab81b3..d8fa4e644af 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/CscSimDataCollectionCnv.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/CscSimDataCollectionCnv.cxx
@@ -5,7 +5,6 @@
#include "CscSimDataCollectionCnv.h"
// Gaudi
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/MsgStream.h"
diff --git a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/CscStripPrepDataContainerCnv.cxx b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/CscStripPrepDataContainerCnv.cxx
index 0ec666cfcf9..e9f0b114361 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/CscStripPrepDataContainerCnv.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/CscStripPrepDataContainerCnv.cxx
@@ -5,7 +5,6 @@
#include "CscStripPrepDataContainerCnv.h"
// Gaudi
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/IIncidentSvc.h"
diff --git a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/MMPrepDataContainerCnv.cxx b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/MMPrepDataContainerCnv.cxx
index 9deecfb88f6..424657976f5 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/MMPrepDataContainerCnv.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/MMPrepDataContainerCnv.cxx
@@ -5,7 +5,6 @@
#include "MMPrepDataContainerCnv.h"
// Gaudi
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/IIncidentSvc.h"
diff --git a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/MdtPrepDataContainerCnv.cxx b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/MdtPrepDataContainerCnv.cxx
index c006b9377fa..8870ee3643e 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/MdtPrepDataContainerCnv.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/MdtPrepDataContainerCnv.cxx
@@ -7,7 +7,6 @@
#include "MdtPrepDataContainerCnv.h"
// Gaudi
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/IIncidentSvc.h"
diff --git a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/MmDigitContainerCnv.cxx b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/MmDigitContainerCnv.cxx
index f53a52e4aa2..74d45175834 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/MmDigitContainerCnv.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/MmDigitContainerCnv.cxx
@@ -5,7 +5,6 @@
#include "MmDigitContainerCnv.h"
// Gaudi
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/IIncidentSvc.h"
diff --git a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/MuonMeasurementsCnv.h b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/MuonMeasurementsCnv.h
index 395eb9492eb..3609a1c8e5d 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/MuonMeasurementsCnv.h
+++ b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/MuonMeasurementsCnv.h
@@ -28,7 +28,9 @@ class MuonMeasurementsCnv : public MuonMeasurementsCnvBase
friend class CnvFactory<MuonMeasurementsCnv>;
protected:
+public:
MuonMeasurementsCnv( ISvcLocator *svcloc );
+protected:
virtual AthenaPoolTopLevelTPCnvBase* getTopLevelTPCnv() { return &m_TPConverter_p2; }
diff --git a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/MuonRdoContainerCnv.icc b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/MuonRdoContainerCnv.icc
index fefa78d2671..6054bf0527d 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/MuonRdoContainerCnv.icc
+++ b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/MuonRdoContainerCnv.icc
@@ -3,7 +3,6 @@
*/
// Gaudi
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/IIncidentSvc.h"
diff --git a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/MuonRdoContainerTPCnv.h b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/MuonRdoContainerTPCnv.h
index 9f431495098..9aea56b4529 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/MuonRdoContainerTPCnv.h
+++ b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/MuonRdoContainerTPCnv.h
@@ -26,9 +26,10 @@ class MuonRdoContainerTPCnv
{
friend class CnvFactory<MuonRdoContainerTPCnv<T, P, CONV > >;
-protected:
+public:
MuonRdoContainerTPCnv(ISvcLocator* svcloc);
+protected:
/// Extend base-class conversion methods
virtual P* createPersistent(T* rdoC);
virtual T* createTransient ();
diff --git a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/MuonSimDataCollectionCnv.cxx b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/MuonSimDataCollectionCnv.cxx
index c90f83a8f14..563455f8a74 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/MuonSimDataCollectionCnv.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/MuonSimDataCollectionCnv.cxx
@@ -5,7 +5,6 @@
#include "MuonSimDataCollectionCnv.h"
// Gaudi
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/MsgStream.h"
diff --git a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/RpcCoinDataContainerCnv.cxx b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/RpcCoinDataContainerCnv.cxx
index e452a215ee6..7123a38f66a 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/RpcCoinDataContainerCnv.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/RpcCoinDataContainerCnv.cxx
@@ -5,7 +5,6 @@
#include "RpcCoinDataContainerCnv.h"
// Gaudi
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/IIncidentSvc.h"
diff --git a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/RpcPadContainerCnv_p1.cxx b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/RpcPadContainerCnv_p1.cxx
index 4f5f34682eb..a8ef7ea1e94 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/RpcPadContainerCnv_p1.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/RpcPadContainerCnv_p1.cxx
@@ -14,7 +14,6 @@
// Gaudi
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/Bootstrap.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/Service.h"
#include "GaudiKernel/MsgStream.h"
diff --git a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/RpcPadContainerCnv_p2.cxx b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/RpcPadContainerCnv_p2.cxx
index 193c1fc4cf6..da377d20829 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/RpcPadContainerCnv_p2.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/RpcPadContainerCnv_p2.cxx
@@ -14,7 +14,6 @@
// Gaudi
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/Bootstrap.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/Service.h"
#include "GaudiKernel/MsgStream.h"
diff --git a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/RpcPrepDataContainerCnv.cxx b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/RpcPrepDataContainerCnv.cxx
index 3deb9eb1d59..1af69811ae0 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/RpcPrepDataContainerCnv.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/RpcPrepDataContainerCnv.cxx
@@ -5,7 +5,6 @@
#include "RpcPrepDataContainerCnv.h"
// Gaudi
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/IIncidentSvc.h"
diff --git a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/RpcSectorLogicContainerCnv.h b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/RpcSectorLogicContainerCnv.h
index 5d4732b6751..4af0043dce2 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/RpcSectorLogicContainerCnv.h
+++ b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/RpcSectorLogicContainerCnv.h
@@ -16,7 +16,9 @@ typedef T_AthenaPoolCustomCnv<RpcSectorLogicContainer, PERS > RpcSectorLogicC
class RpcSectorLogicContainerCnv : public RpcSectorLogicContainerCnvBase {
friend class CnvFactory<RpcSectorLogicContainerCnv >;
protected:
+public:
RpcSectorLogicContainerCnv (ISvcLocator* svcloc) : RpcSectorLogicContainerCnvBase(svcloc) {}
+protected:
virtual PERS* createPersistent (RpcSectorLogicContainer* transObj);
virtual RpcSectorLogicContainer* createTransient ();
};
diff --git a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/RpcSectorLogicContainerCnv_p1.cxx b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/RpcSectorLogicContainerCnv_p1.cxx
index 821b694ed98..e3e858d50d6 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/RpcSectorLogicContainerCnv_p1.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/RpcSectorLogicContainerCnv_p1.cxx
@@ -14,7 +14,6 @@
// Gaudi
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/Bootstrap.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/Service.h"
#include "GaudiKernel/MsgStream.h"
diff --git a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/TgcCoinDataContainerCnv.cxx b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/TgcCoinDataContainerCnv.cxx
index b163652faef..fe31c859302 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/TgcCoinDataContainerCnv.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/TgcCoinDataContainerCnv.cxx
@@ -6,7 +6,6 @@
#include "TgcCoinDataContainerCnv.h"
// Gaudi
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/IIncidentSvc.h"
diff --git a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/TgcPrepDataContainerCnv.cxx b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/TgcPrepDataContainerCnv.cxx
index 1a4c15735c4..65d66ef3104 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/TgcPrepDataContainerCnv.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/TgcPrepDataContainerCnv.cxx
@@ -5,7 +5,6 @@
#include "TgcPrepDataContainerCnv.h"
// Gaudi
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/IIncidentSvc.h"
diff --git a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/sTgcDigitContainerCnv.cxx b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/sTgcDigitContainerCnv.cxx
index 7c2f1f2addf..1944c4d64e2 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/sTgcDigitContainerCnv.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/sTgcDigitContainerCnv.cxx
@@ -5,7 +5,6 @@
#include "sTgcDigitContainerCnv.h"
// Gaudi
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/IIncidentSvc.h"
diff --git a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/sTgcPrepDataContainerCnv.cxx b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/sTgcPrepDataContainerCnv.cxx
index 9477a44f7d5..2787a36a080 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/sTgcPrepDataContainerCnv.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/sTgcPrepDataContainerCnv.cxx
@@ -5,7 +5,6 @@
#include "sTgcPrepDataContainerCnv.h"
// Gaudi
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/IIncidentSvc.h"
diff --git a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/test/RpcPadContainerCnv_p1_test.cxx b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/test/RpcPadContainerCnv_p1_test.cxx
index 481e8ddab8d..6d5f6c5349a 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/test/RpcPadContainerCnv_p1_test.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/test/RpcPadContainerCnv_p1_test.cxx
@@ -16,7 +16,7 @@
#include "RPCcablingInterface/IRPCcablingSvc.h"
#include "RPCcablingInterface/RpcPadIdHash.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
+//#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TestTools/initGaudi.h"
#include "TestTools/leakcheck.h"
#include <cassert>
diff --git a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/test/RpcPadContainerCnv_p2_test.cxx b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/test/RpcPadContainerCnv_p2_test.cxx
index 781876b027b..e0c364409fd 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/test/RpcPadContainerCnv_p2_test.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/test/RpcPadContainerCnv_p2_test.cxx
@@ -16,7 +16,7 @@
#include "RPCcablingInterface/IRPCcablingSvc.h"
#include "RPCcablingInterface/RpcPadIdHash.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
+//#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TestTools/initGaudi.h"
#include "TestTools/leakcheck.h"
#include <cassert>
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonDigitContainer/MM_DigitContainerCnv_p1.cxx b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonDigitContainer/MM_DigitContainerCnv_p1.cxx
index 8005bb20f76..14bc53741ba 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonDigitContainer/MM_DigitContainerCnv_p1.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonDigitContainer/MM_DigitContainerCnv_p1.cxx
@@ -14,9 +14,6 @@
// Gaudi
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/Bootstrap.h"
-// #include "GaudiKernel/CnvFactory.h"
-// #include "GaudiKernel/StatusCode.h"
-// #include "GaudiKernel/Service.h"
// Athena
#include "StoreGate/StoreGateSvc.h"
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonDigitContainer/MM_DigitContainerCnv_p2.cxx b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonDigitContainer/MM_DigitContainerCnv_p2.cxx
index 0217c616a7f..8e6d8069bca 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonDigitContainer/MM_DigitContainerCnv_p2.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonDigitContainer/MM_DigitContainerCnv_p2.cxx
@@ -14,9 +14,6 @@
// Gaudi
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/Bootstrap.h"
-// #include "GaudiKernel/CnvFactory.h"
-// #include "GaudiKernel/StatusCode.h"
-// #include "GaudiKernel/Service.h"
// Athena
#include "StoreGate/StoreGateSvc.h"
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonDigitContainer/STGC_DigitContainerCnv_p1.cxx b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonDigitContainer/STGC_DigitContainerCnv_p1.cxx
index 60c3ebf8fd2..37cd1f75313 100755
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonDigitContainer/STGC_DigitContainerCnv_p1.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonDigitContainer/STGC_DigitContainerCnv_p1.cxx
@@ -14,9 +14,6 @@
// Gaudi
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/Bootstrap.h"
-// #include "GaudiKernel/CnvFactory.h"
-// #include "GaudiKernel/StatusCode.h"
-// #include "GaudiKernel/Service.h"
// Athena
#include "StoreGate/StoreGateSvc.h"
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonPrepRawData/CscPrepDataContainerCnv_p1.cxx b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonPrepRawData/CscPrepDataContainerCnv_p1.cxx
index 35847aa123c..b0bd6c56cdc 100755
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonPrepRawData/CscPrepDataContainerCnv_p1.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonPrepRawData/CscPrepDataContainerCnv_p1.cxx
@@ -15,7 +15,6 @@
// Gaudi
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/Bootstrap.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/Service.h"
#include "GaudiKernel/MsgStream.h"
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonPrepRawData/CscPrepDataContainerCnv_p2.cxx b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonPrepRawData/CscPrepDataContainerCnv_p2.cxx
index 601b17c8380..368da5314e8 100755
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonPrepRawData/CscPrepDataContainerCnv_p2.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonPrepRawData/CscPrepDataContainerCnv_p2.cxx
@@ -15,9 +15,6 @@
// Gaudi
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/Bootstrap.h"
-// #include "GaudiKernel/CnvFactory.h"
-// #include "GaudiKernel/StatusCode.h"
-// #include "GaudiKernel/Service.h"
// Athena
#include "StoreGate/StoreGateSvc.h"
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonPrepRawData/CscStripPrepDataContainerCnv_p1.cxx b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonPrepRawData/CscStripPrepDataContainerCnv_p1.cxx
index f818c381c16..51d8348b882 100755
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonPrepRawData/CscStripPrepDataContainerCnv_p1.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonPrepRawData/CscStripPrepDataContainerCnv_p1.cxx
@@ -15,7 +15,6 @@
// Gaudi
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/Bootstrap.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/Service.h"
#include "GaudiKernel/MsgStream.h"
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonPrepRawData/MMPrepDataContainerCnv_p1.cxx b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonPrepRawData/MMPrepDataContainerCnv_p1.cxx
index 701a872577f..59084b2887e 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonPrepRawData/MMPrepDataContainerCnv_p1.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonPrepRawData/MMPrepDataContainerCnv_p1.cxx
@@ -15,9 +15,6 @@
// Gaudi
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/Bootstrap.h"
-// #include "GaudiKernel/CnvFactory.h"
-// #include "GaudiKernel/StatusCode.h"
-// #include "GaudiKernel/Service.h"
// Athena
#include "StoreGate/StoreGateSvc.h"
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonPrepRawData/MdtPrepDataContainerCnv_p1.cxx b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonPrepRawData/MdtPrepDataContainerCnv_p1.cxx
index d339127ea31..cd3621fcda7 100755
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonPrepRawData/MdtPrepDataContainerCnv_p1.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonPrepRawData/MdtPrepDataContainerCnv_p1.cxx
@@ -15,7 +15,6 @@
// Gaudi
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/Bootstrap.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/Service.h"
#include "GaudiKernel/MsgStream.h"
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonPrepRawData/MdtPrepDataContainerCnv_p2.cxx b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonPrepRawData/MdtPrepDataContainerCnv_p2.cxx
index 980e0c5f5c8..f8dcc007fba 100755
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonPrepRawData/MdtPrepDataContainerCnv_p2.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonPrepRawData/MdtPrepDataContainerCnv_p2.cxx
@@ -15,9 +15,6 @@
// Gaudi
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/Bootstrap.h"
-// #include "GaudiKernel/CnvFactory.h"
-// #include "GaudiKernel/StatusCode.h"
-// #include "GaudiKernel/Service.h"
// Athena
#include "StoreGate/StoreGateSvc.h"
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonPrepRawData/RpcPrepDataContainerCnv_p1.cxx b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonPrepRawData/RpcPrepDataContainerCnv_p1.cxx
index 413647712c6..3fc0793f7df 100755
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonPrepRawData/RpcPrepDataContainerCnv_p1.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonPrepRawData/RpcPrepDataContainerCnv_p1.cxx
@@ -14,7 +14,6 @@
// Gaudi
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/Bootstrap.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/Service.h"
#include "GaudiKernel/MsgStream.h"
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonPrepRawData/RpcPrepDataContainerCnv_p2.cxx b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonPrepRawData/RpcPrepDataContainerCnv_p2.cxx
index 86b1f23f61f..eef947586bf 100755
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonPrepRawData/RpcPrepDataContainerCnv_p2.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonPrepRawData/RpcPrepDataContainerCnv_p2.cxx
@@ -14,7 +14,6 @@
// Gaudi
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/Bootstrap.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/Service.h"
#include "GaudiKernel/MsgStream.h"
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonPrepRawData/RpcPrepDataContainerCnv_p3.cxx b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonPrepRawData/RpcPrepDataContainerCnv_p3.cxx
index 0bcf6a3a2c2..36a98ecaa7b 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonPrepRawData/RpcPrepDataContainerCnv_p3.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonPrepRawData/RpcPrepDataContainerCnv_p3.cxx
@@ -15,9 +15,6 @@
// Gaudi
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/Bootstrap.h"
-// #include "GaudiKernel/CnvFactory.h"
-// #include "GaudiKernel/StatusCode.h"
-// #include "GaudiKernel/Service.h"
// Athena
#include "StoreGate/StoreGateSvc.h"
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonPrepRawData/TgcPrepDataContainerCnv_p1.cxx b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonPrepRawData/TgcPrepDataContainerCnv_p1.cxx
index a94435f3117..823e39d4f09 100755
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonPrepRawData/TgcPrepDataContainerCnv_p1.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonPrepRawData/TgcPrepDataContainerCnv_p1.cxx
@@ -15,7 +15,6 @@
// Gaudi
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/Bootstrap.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/Service.h"
#include "GaudiKernel/MsgStream.h"
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonPrepRawData/TgcPrepDataContainerCnv_p2.cxx b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonPrepRawData/TgcPrepDataContainerCnv_p2.cxx
index 9a541440879..ef3ec7303fa 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonPrepRawData/TgcPrepDataContainerCnv_p2.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonPrepRawData/TgcPrepDataContainerCnv_p2.cxx
@@ -15,9 +15,6 @@
// Gaudi
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/Bootstrap.h"
-// #include "GaudiKernel/CnvFactory.h"
-// #include "GaudiKernel/StatusCode.h"
-// #include "GaudiKernel/Service.h"
// Athena
#include "StoreGate/StoreGateSvc.h"
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonPrepRawData/TgcPrepDataContainerCnv_p3.cxx b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonPrepRawData/TgcPrepDataContainerCnv_p3.cxx
index dd081425de4..576872f6fc4 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonPrepRawData/TgcPrepDataContainerCnv_p3.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonPrepRawData/TgcPrepDataContainerCnv_p3.cxx
@@ -15,9 +15,6 @@
// Gaudi
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/Bootstrap.h"
-// #include "GaudiKernel/CnvFactory.h"
-// #include "GaudiKernel/StatusCode.h"
-// #include "GaudiKernel/Service.h"
// Athena
#include "StoreGate/StoreGateSvc.h"
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonPrepRawData/sTgcPrepDataContainerCnv_p1.cxx b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonPrepRawData/sTgcPrepDataContainerCnv_p1.cxx
index 33ccdc91b0a..b9354aedcc9 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonPrepRawData/sTgcPrepDataContainerCnv_p1.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonPrepRawData/sTgcPrepDataContainerCnv_p1.cxx
@@ -15,9 +15,6 @@
// Gaudi
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/Bootstrap.h"
-// #include "GaudiKernel/CnvFactory.h"
-// #include "GaudiKernel/StatusCode.h"
-// #include "GaudiKernel/Service.h"
// Athena
#include "StoreGate/StoreGateSvc.h"
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonTrigCoinData/RpcCoinDataContainerCnv_p1.cxx b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonTrigCoinData/RpcCoinDataContainerCnv_p1.cxx
index e8dcfbeeaec..440ec4d19c2 100755
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonTrigCoinData/RpcCoinDataContainerCnv_p1.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonTrigCoinData/RpcCoinDataContainerCnv_p1.cxx
@@ -18,11 +18,6 @@
// // Gaudi
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/Bootstrap.h"
-// #include "GaudiKernel/CnvFactory.h"
-// #include "GaudiKernel/StatusCode.h"
-// #include "GaudiKernel/Service.h"
-// #include "GaudiKernel/MsgStream.h"
-// #include "GaudiKernel/IIncidentSvc.h"
// Athena
#include "StoreGate/StoreGateSvc.h"
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonTrigCoinData/TgcCoinDataContainerCnv_p1.cxx b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonTrigCoinData/TgcCoinDataContainerCnv_p1.cxx
index e08ec18cfe8..aff1d492bd1 100755
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonTrigCoinData/TgcCoinDataContainerCnv_p1.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonTrigCoinData/TgcCoinDataContainerCnv_p1.cxx
@@ -15,7 +15,6 @@
// Gaudi
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/Bootstrap.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/Service.h"
#include "GaudiKernel/MsgStream.h"
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonTrigCoinData/TgcCoinDataContainerCnv_p2.cxx b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonTrigCoinData/TgcCoinDataContainerCnv_p2.cxx
index d6591a4a4a9..bb957a0b853 100755
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonTrigCoinData/TgcCoinDataContainerCnv_p2.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonTrigCoinData/TgcCoinDataContainerCnv_p2.cxx
@@ -15,7 +15,6 @@
// Gaudi
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/Bootstrap.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/Service.h"
#include "GaudiKernel/MsgStream.h"
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonTrigCoinData/TgcCoinDataContainerCnv_p3.cxx b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonTrigCoinData/TgcCoinDataContainerCnv_p3.cxx
index 1fa4f0dd58d..2d75254cb02 100755
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonTrigCoinData/TgcCoinDataContainerCnv_p3.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonTrigCoinData/TgcCoinDataContainerCnv_p3.cxx
@@ -14,7 +14,6 @@
// Gaudi
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/Bootstrap.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/Service.h"
#include "GaudiKernel/MsgStream.h"
diff --git a/MuonSpectrometer/MuonCnv/MuonIdCnv/src/CSC_IDDetDescrCnv.cxx b/MuonSpectrometer/MuonCnv/MuonIdCnv/src/CSC_IDDetDescrCnv.cxx
index 5accc28c50c..a091921a8f7 100755
--- a/MuonSpectrometer/MuonCnv/MuonIdCnv/src/CSC_IDDetDescrCnv.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonIdCnv/src/CSC_IDDetDescrCnv.cxx
@@ -17,7 +17,6 @@
#include "DetDescrCnvSvc/DetDescrConverter.h"
#include "DetDescrCnvSvc/DetDescrAddress.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/CnvFactory.h"
#include "StoreGate/StoreGate.h"
#include "IdDictDetDescr/IdDictManager.h"
#include "MuonIdHelpers/CscIdHelper.h"
diff --git a/MuonSpectrometer/MuonCnv/MuonIdCnv/src/CSC_IDDetDescrCnv.h b/MuonSpectrometer/MuonCnv/MuonIdCnv/src/CSC_IDDetDescrCnv.h
index f92f3956474..3aa33d766ca 100755
--- a/MuonSpectrometer/MuonCnv/MuonIdCnv/src/CSC_IDDetDescrCnv.h
+++ b/MuonSpectrometer/MuonCnv/MuonIdCnv/src/CSC_IDDetDescrCnv.h
@@ -33,7 +33,6 @@
**/
class CSC_IDDetDescrCnv: public DetDescrConverter {
- friend class CnvFactory<CSC_IDDetDescrCnv>;
public:
virtual long int repSvcType() const;
@@ -45,7 +44,6 @@ public:
static long storageType();
static const CLID& classID();
-protected:
CSC_IDDetDescrCnv(ISvcLocator* svcloc);
};
diff --git a/MuonSpectrometer/MuonCnv/MuonIdCnv/src/MDT_IDDetDescrCnv.cxx b/MuonSpectrometer/MuonCnv/MuonIdCnv/src/MDT_IDDetDescrCnv.cxx
index ff893f3c161..9bf7ae15d18 100755
--- a/MuonSpectrometer/MuonCnv/MuonIdCnv/src/MDT_IDDetDescrCnv.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonIdCnv/src/MDT_IDDetDescrCnv.cxx
@@ -17,7 +17,6 @@
#include "DetDescrCnvSvc/DetDescrConverter.h"
#include "DetDescrCnvSvc/DetDescrAddress.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/CnvFactory.h"
#include "StoreGate/StoreGate.h"
#include "IdDictDetDescr/IdDictManager.h"
#include "MuonIdHelpers/MdtIdHelper.h"
diff --git a/MuonSpectrometer/MuonCnv/MuonIdCnv/src/MDT_IDDetDescrCnv.h b/MuonSpectrometer/MuonCnv/MuonIdCnv/src/MDT_IDDetDescrCnv.h
index 919dab52a00..5a12431ade0 100755
--- a/MuonSpectrometer/MuonCnv/MuonIdCnv/src/MDT_IDDetDescrCnv.h
+++ b/MuonSpectrometer/MuonCnv/MuonIdCnv/src/MDT_IDDetDescrCnv.h
@@ -33,7 +33,6 @@
**/
class MDT_IDDetDescrCnv: public DetDescrConverter {
- friend class CnvFactory<MDT_IDDetDescrCnv>;
public:
virtual long int repSvcType() const;
@@ -45,7 +44,6 @@ public:
static long storageType();
static const CLID& classID();
-protected:
MDT_IDDetDescrCnv(ISvcLocator* svcloc);
};
diff --git a/MuonSpectrometer/MuonCnv/MuonIdCnv/src/MM_IDDetDescrCnv.cxx b/MuonSpectrometer/MuonCnv/MuonIdCnv/src/MM_IDDetDescrCnv.cxx
index d1d7dcd7468..d80dcecb5d0 100755
--- a/MuonSpectrometer/MuonCnv/MuonIdCnv/src/MM_IDDetDescrCnv.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonIdCnv/src/MM_IDDetDescrCnv.cxx
@@ -14,7 +14,6 @@
#include "DetDescrCnvSvc/DetDescrConverter.h"
#include "DetDescrCnvSvc/DetDescrAddress.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/CnvFactory.h"
#include "StoreGate/StoreGate.h"
#include "IdDictDetDescr/IdDictManager.h"
diff --git a/MuonSpectrometer/MuonCnv/MuonIdCnv/src/MM_IDDetDescrCnv.h b/MuonSpectrometer/MuonCnv/MuonIdCnv/src/MM_IDDetDescrCnv.h
index 0d6ac8daeff..682d0357346 100755
--- a/MuonSpectrometer/MuonCnv/MuonIdCnv/src/MM_IDDetDescrCnv.h
+++ b/MuonSpectrometer/MuonCnv/MuonIdCnv/src/MM_IDDetDescrCnv.h
@@ -30,7 +30,6 @@
**/
class MM_IDDetDescrCnv: public DetDescrConverter {
- friend class CnvFactory<MM_IDDetDescrCnv>;
public:
virtual long int repSvcType() const;
@@ -42,7 +41,6 @@ class MM_IDDetDescrCnv: public DetDescrConverter {
static long storageType();
static const CLID& classID();
- protected:
MM_IDDetDescrCnv(ISvcLocator* svcloc);
};
diff --git a/MuonSpectrometer/MuonCnv/MuonIdCnv/src/MuonIdCnv_entries.cxx b/MuonSpectrometer/MuonCnv/MuonIdCnv/src/MuonIdCnv_entries.cxx
index 7767e605abc..06bc5a2d6a7 100644
--- a/MuonSpectrometer/MuonCnv/MuonIdCnv/src/MuonIdCnv_entries.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonIdCnv/src/MuonIdCnv_entries.cxx
@@ -6,12 +6,12 @@
#include "sTGC_IDDetDescrCnv.h"
#include "MM_IDDetDescrCnv.h"
-DECLARE_CONVERTER_FACTORY( MDT_IDDetDescrCnv )
-DECLARE_CONVERTER_FACTORY( CSC_IDDetDescrCnv )
-DECLARE_CONVERTER_FACTORY( RPC_IDDetDescrCnv )
-DECLARE_CONVERTER_FACTORY( TGC_IDDetDescrCnv )
+DECLARE_CONVERTER( MDT_IDDetDescrCnv )
+DECLARE_CONVERTER( CSC_IDDetDescrCnv )
+DECLARE_CONVERTER( RPC_IDDetDescrCnv )
+DECLARE_CONVERTER( TGC_IDDetDescrCnv )
// for nSW
-DECLARE_CONVERTER_FACTORY( sTGC_IDDetDescrCnv )
-DECLARE_CONVERTER_FACTORY( MM_IDDetDescrCnv )
+DECLARE_CONVERTER( sTGC_IDDetDescrCnv )
+DECLARE_CONVERTER( MM_IDDetDescrCnv )
diff --git a/MuonSpectrometer/MuonCnv/MuonIdCnv/src/RPC_IDDetDescrCnv.cxx b/MuonSpectrometer/MuonCnv/MuonIdCnv/src/RPC_IDDetDescrCnv.cxx
index f0e2211ef9e..7660e19bbe6 100755
--- a/MuonSpectrometer/MuonCnv/MuonIdCnv/src/RPC_IDDetDescrCnv.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonIdCnv/src/RPC_IDDetDescrCnv.cxx
@@ -17,7 +17,6 @@
#include "DetDescrCnvSvc/DetDescrConverter.h"
#include "DetDescrCnvSvc/DetDescrAddress.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/CnvFactory.h"
#include "StoreGate/StoreGate.h"
#include "IdDictDetDescr/IdDictManager.h"
#include "MuonIdHelpers/RpcIdHelper.h"
diff --git a/MuonSpectrometer/MuonCnv/MuonIdCnv/src/RPC_IDDetDescrCnv.h b/MuonSpectrometer/MuonCnv/MuonIdCnv/src/RPC_IDDetDescrCnv.h
index 9da0a514619..e8cf805e67e 100755
--- a/MuonSpectrometer/MuonCnv/MuonIdCnv/src/RPC_IDDetDescrCnv.h
+++ b/MuonSpectrometer/MuonCnv/MuonIdCnv/src/RPC_IDDetDescrCnv.h
@@ -33,7 +33,6 @@
**/
class RPC_IDDetDescrCnv: public DetDescrConverter {
- friend class CnvFactory<RPC_IDDetDescrCnv>;
public:
virtual long int repSvcType() const;
@@ -45,7 +44,6 @@ public:
static long storageType();
static const CLID& classID();
-protected:
RPC_IDDetDescrCnv(ISvcLocator* svcloc);
};
diff --git a/MuonSpectrometer/MuonCnv/MuonIdCnv/src/TGC_IDDetDescrCnv.cxx b/MuonSpectrometer/MuonCnv/MuonIdCnv/src/TGC_IDDetDescrCnv.cxx
index 425aef88a58..d12b62b2c7b 100755
--- a/MuonSpectrometer/MuonCnv/MuonIdCnv/src/TGC_IDDetDescrCnv.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonIdCnv/src/TGC_IDDetDescrCnv.cxx
@@ -17,7 +17,6 @@
#include "DetDescrCnvSvc/DetDescrConverter.h"
#include "DetDescrCnvSvc/DetDescrAddress.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/CnvFactory.h"
#include "StoreGate/StoreGate.h"
#include "IdDictDetDescr/IdDictManager.h"
#include "MuonIdHelpers/TgcIdHelper.h"
diff --git a/MuonSpectrometer/MuonCnv/MuonIdCnv/src/TGC_IDDetDescrCnv.h b/MuonSpectrometer/MuonCnv/MuonIdCnv/src/TGC_IDDetDescrCnv.h
index f3c17f56b04..064444de745 100755
--- a/MuonSpectrometer/MuonCnv/MuonIdCnv/src/TGC_IDDetDescrCnv.h
+++ b/MuonSpectrometer/MuonCnv/MuonIdCnv/src/TGC_IDDetDescrCnv.h
@@ -33,7 +33,6 @@
**/
class TGC_IDDetDescrCnv: public DetDescrConverter {
- friend class CnvFactory<TGC_IDDetDescrCnv>;
public:
virtual long int repSvcType() const;
@@ -45,7 +44,6 @@ public:
static long storageType();
static const CLID& classID();
-protected:
TGC_IDDetDescrCnv(ISvcLocator* svcloc);
};
diff --git a/MuonSpectrometer/MuonCnv/MuonIdCnv/src/sTGC_IDDetDescrCnv.cxx b/MuonSpectrometer/MuonCnv/MuonIdCnv/src/sTGC_IDDetDescrCnv.cxx
index 63aaf52381f..73f0ba06323 100755
--- a/MuonSpectrometer/MuonCnv/MuonIdCnv/src/sTGC_IDDetDescrCnv.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonIdCnv/src/sTGC_IDDetDescrCnv.cxx
@@ -15,7 +15,6 @@
#include "DetDescrCnvSvc/DetDescrConverter.h"
#include "DetDescrCnvSvc/DetDescrAddress.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/CnvFactory.h"
#include "StoreGate/StoreGate.h"
#include "IdDictDetDescr/IdDictManager.h"
#include "MuonIdHelpers/sTgcIdHelper.h"
diff --git a/MuonSpectrometer/MuonCnv/MuonIdCnv/src/sTGC_IDDetDescrCnv.h b/MuonSpectrometer/MuonCnv/MuonIdCnv/src/sTGC_IDDetDescrCnv.h
index 4c03657b5fa..c33a0d70c6b 100755
--- a/MuonSpectrometer/MuonCnv/MuonIdCnv/src/sTGC_IDDetDescrCnv.h
+++ b/MuonSpectrometer/MuonCnv/MuonIdCnv/src/sTGC_IDDetDescrCnv.h
@@ -30,7 +30,6 @@
**/
class sTGC_IDDetDescrCnv: public DetDescrConverter {
- friend class CnvFactory<sTGC_IDDetDescrCnv>;
public:
virtual long int repSvcType() const;
@@ -42,7 +41,6 @@ class sTGC_IDDetDescrCnv: public DetDescrConverter {
static long storageType();
static const CLID& classID();
- protected:
sTGC_IDDetDescrCnv(ISvcLocator* svcloc);
};
diff --git a/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/src/MdtCsmContByteStreamTool.cxx b/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/src/MdtCsmContByteStreamTool.cxx
index 33e8d0749db..8252859543d 100755
--- a/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/src/MdtCsmContByteStreamTool.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/src/MdtCsmContByteStreamTool.cxx
@@ -10,7 +10,6 @@
#include "MuonRDO/MdtCsm.h"
#include "MuonRDO/MdtCsmContainer.h"
-#include "GaudiKernel/ToolFactory.h"
#include "GaudiKernel/MsgStream.h"
#include "StoreGate/StoreGate.h"
diff --git a/MuonSpectrometer/MuonCnv/MuonPrdSelector/src/MuonPrdSelectorAlg.cxx b/MuonSpectrometer/MuonCnv/MuonPrdSelector/src/MuonPrdSelectorAlg.cxx
index 0c80bb74312..a568aebe158 100644
--- a/MuonSpectrometer/MuonCnv/MuonPrdSelector/src/MuonPrdSelectorAlg.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonPrdSelector/src/MuonPrdSelectorAlg.cxx
@@ -13,7 +13,6 @@
#include "GaudiKernel/IToolSvc.h"
#include "GaudiKernel/MsgStream.h"
#include "StoreGate/StoreGate.h"
-#include "GaudiKernel/AlgFactory.h"
#include "StoreGate/StoreGateSvc.h"
#include "MuonReadoutGeometry/MuonDetectorManager.h"
#include "Identifier/IdentifierHash.h"
diff --git a/MuonSpectrometer/MuonCnv/MuonRPC_CnvTools/src/RpcPadContByteStreamTool.cxx b/MuonSpectrometer/MuonCnv/MuonRPC_CnvTools/src/RpcPadContByteStreamTool.cxx
index 815b30edfba..682932873db 100755
--- a/MuonSpectrometer/MuonCnv/MuonRPC_CnvTools/src/RpcPadContByteStreamTool.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonRPC_CnvTools/src/RpcPadContByteStreamTool.cxx
@@ -12,7 +12,6 @@
#include "MuonRDO/RpcPadContainer.h"
#include "MuonIdHelpers/RpcIdHelper.h"
-#include "GaudiKernel/ToolFactory.h"
#include "GaudiKernel/MsgStream.h"
//#include "StoreGate/StoreGate.h"
diff --git a/MuonSpectrometer/MuonCnv/MuonSimEventAthenaPool/src/CSCSimHitCollectionCnv.cxx b/MuonSpectrometer/MuonCnv/MuonSimEventAthenaPool/src/CSCSimHitCollectionCnv.cxx
index 23510001e45..8917fd0d873 100644
--- a/MuonSpectrometer/MuonCnv/MuonSimEventAthenaPool/src/CSCSimHitCollectionCnv.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonSimEventAthenaPool/src/CSCSimHitCollectionCnv.cxx
@@ -5,7 +5,6 @@
#include "CSCSimHitCollectionCnv.h"
// Gaudi
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/MsgStream.h"
diff --git a/MuonSpectrometer/MuonCnv/MuonSimEventAthenaPool/src/GenericMuonSimHitCollectionCnv.cxx b/MuonSpectrometer/MuonCnv/MuonSimEventAthenaPool/src/GenericMuonSimHitCollectionCnv.cxx
index e7c7017e055..579f351d338 100644
--- a/MuonSpectrometer/MuonCnv/MuonSimEventAthenaPool/src/GenericMuonSimHitCollectionCnv.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonSimEventAthenaPool/src/GenericMuonSimHitCollectionCnv.cxx
@@ -5,7 +5,6 @@
#include "GenericMuonSimHitCollectionCnv.h"
// Gaudi
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/MsgStream.h"
diff --git a/MuonSpectrometer/MuonCnv/MuonSimEventAthenaPool/src/MDTSimHitCollectionCnv.cxx b/MuonSpectrometer/MuonCnv/MuonSimEventAthenaPool/src/MDTSimHitCollectionCnv.cxx
index 4032949ce65..1229f30cc2b 100644
--- a/MuonSpectrometer/MuonCnv/MuonSimEventAthenaPool/src/MDTSimHitCollectionCnv.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonSimEventAthenaPool/src/MDTSimHitCollectionCnv.cxx
@@ -5,7 +5,6 @@
#include "MDTSimHitCollectionCnv.h"
// Gaudi
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/MsgStream.h"
diff --git a/MuonSpectrometer/MuonCnv/MuonSimEventAthenaPool/src/RPCSimHitCollectionCnv.cxx b/MuonSpectrometer/MuonCnv/MuonSimEventAthenaPool/src/RPCSimHitCollectionCnv.cxx
index 3a93da7cb0d..d10406a4aa1 100644
--- a/MuonSpectrometer/MuonCnv/MuonSimEventAthenaPool/src/RPCSimHitCollectionCnv.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonSimEventAthenaPool/src/RPCSimHitCollectionCnv.cxx
@@ -5,7 +5,6 @@
#include "RPCSimHitCollectionCnv.h"
// Gaudi
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/MsgStream.h"
diff --git a/MuonSpectrometer/MuonCnv/MuonSimEventAthenaPool/src/TGCSimHitCollectionCnv.cxx b/MuonSpectrometer/MuonCnv/MuonSimEventAthenaPool/src/TGCSimHitCollectionCnv.cxx
index b1c0bc10b6e..b92a05fa5c2 100644
--- a/MuonSpectrometer/MuonCnv/MuonSimEventAthenaPool/src/TGCSimHitCollectionCnv.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonSimEventAthenaPool/src/TGCSimHitCollectionCnv.cxx
@@ -5,7 +5,6 @@
#include "TGCSimHitCollectionCnv.h"
// Gaudi
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/MsgStream.h"
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondCool/src/CscCoolTest.cxx b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondCool/src/CscCoolTest.cxx
index 58b9ec74959..67a99eae032 100755
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondCool/src/CscCoolTest.cxx
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondCool/src/CscCoolTest.cxx
@@ -14,7 +14,6 @@
//#include "MuonCondData/CscCondParType.h"
-#include "GaudiKernel/SvcFactory.h"
#include "GaudiKernel/MsgStream.h"
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/CscCoolStrSvc.cxx b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/CscCoolStrSvc.cxx
index cfed3c56d73..b809191ed60 100755
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/CscCoolStrSvc.cxx
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/CscCoolStrSvc.cxx
@@ -15,7 +15,6 @@
#include <algorithm>//for transform
#include <cctype> //for toupper
#include <inttypes.h>
-#include "GaudiKernel/SvcFactory.h"
#include "GaudiKernel/MsgStream.h"
#include "AthenaPoolUtilities/AthenaAttributeList.h"
#include "AthenaPoolUtilities/CondAttrListCollection.h"
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/MdtCoolStrSvc.cxx b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/MdtCoolStrSvc.cxx
index d941089de01..9eace74305d 100755
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/MdtCoolStrSvc.cxx
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/MdtCoolStrSvc.cxx
@@ -2,7 +2,6 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#include "GaudiKernel/SvcFactory.h"
#include "GaudiKernel/MsgStream.h"
#include "AthenaPoolUtilities/AthenaAttributeList.h"
#include "AthenaPoolUtilities/CondAttrListCollection.h"
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/RpcCoolStrSvc.cxx b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/RpcCoolStrSvc.cxx
index e295483864d..22de77f0afa 100755
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/RpcCoolStrSvc.cxx
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/RpcCoolStrSvc.cxx
@@ -17,7 +17,6 @@
#include <vector>
#include <math.h>
#include <inttypes.h>
-#include "GaudiKernel/SvcFactory.h"
#include "GaudiKernel/MsgStream.h"
#include "AthenaPoolUtilities/AthenaAttributeList.h"
#include "AthenaPoolUtilities/CondAttrListCollection.h"
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/TriggerCoolSvc.cxx b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/TriggerCoolSvc.cxx
index 433c3b9bdb0..c31161daaec 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/TriggerCoolSvc.cxx
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/TriggerCoolSvc.cxx
@@ -9,7 +9,6 @@
#include <vector>
#include <math.h>
#include <inttypes.h>
-#include "GaudiKernel/SvcFactory.h"
#include "GaudiKernel/MsgStream.h"
#include "AthenaPoolUtilities/AthenaAttributeList.h"
#include "AthenaPoolUtilities/CondAttrListCollection.h"
diff --git a/MuonSpectrometer/MuonConditions/MuonConditionsAthenaPool/src/RpcByteStreamErrorContainerCnv.h b/MuonSpectrometer/MuonConditions/MuonConditionsAthenaPool/src/RpcByteStreamErrorContainerCnv.h
index 1fb3a75c3da..d0187a5dc16 100644
--- a/MuonSpectrometer/MuonConditions/MuonConditionsAthenaPool/src/RpcByteStreamErrorContainerCnv.h
+++ b/MuonSpectrometer/MuonConditions/MuonConditionsAthenaPool/src/RpcByteStreamErrorContainerCnv.h
@@ -15,8 +15,9 @@ typedef T_AthenaPoolCustomCnv<Muon::RpcByteStreamErrorContainer, RpcByteStreamE
class RpcByteStreamErrorContainerCnv : public RpcByteStreamErrorContainerCnvBase {
friend class CnvFactory<RpcByteStreamErrorContainerCnv >;
-protected:
+public:
RpcByteStreamErrorContainerCnv (ISvcLocator* svcloc) : RpcByteStreamErrorContainerCnvBase(svcloc) {}
+protected:
virtual RpcByteStreamErrorContainer_PERS* createPersistent (Muon::RpcByteStreamErrorContainer* transObj);
virtual Muon::RpcByteStreamErrorContainer* createTransient ();
};
diff --git a/MuonSpectrometer/MuonDetDescr/MuonAGDD/src/MuonAGDDToolHelper.cxx b/MuonSpectrometer/MuonDetDescr/MuonAGDD/src/MuonAGDDToolHelper.cxx
index 8f0ca68db1c..f7405e2af5c 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonAGDD/src/MuonAGDDToolHelper.cxx
+++ b/MuonSpectrometer/MuonDetDescr/MuonAGDD/src/MuonAGDDToolHelper.cxx
@@ -6,7 +6,6 @@
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/IToolSvc.h"
-#include "GaudiKernel/SvcFactory.h"
#include "GaudiKernel/IConversionSvc.h"
#include "GaudiKernel/ServiceHandle.h"
#include "AGDDControl/AGDDController.h"
diff --git a/MuonSpectrometer/MuonDigitization/MDT_Digitization/MDT_Digitization/chargeCalculator.h b/MuonSpectrometer/MuonDigitization/MDT_Digitization/MDT_Digitization/chargeCalculator.h
index 8529eba8c8c..389a4b8d8a5 100644
--- a/MuonSpectrometer/MuonDigitization/MDT_Digitization/MDT_Digitization/chargeCalculator.h
+++ b/MuonSpectrometer/MuonDigitization/MDT_Digitization/MDT_Digitization/chargeCalculator.h
@@ -20,7 +20,6 @@ to the third digit of decimal number of the pdgid.
#include "MuonSimData/MuonSimDataCollection.h"
#include "MuonSimData/MuonSimData.h"
-#include "GaudiKernel/AlgFactory.h"
#include "MuonIdHelpers/MdtIdHelper.h"
#include "MuonSimEvent/MdtHitIdHelper.h"
diff --git a/MuonSpectrometer/MuonDigitization/MDT_Digitization/MDT_Digitization/chargeCalculator_PileUp.h b/MuonSpectrometer/MuonDigitization/MDT_Digitization/MDT_Digitization/chargeCalculator_PileUp.h
index 64aa1571357..30bdaaa7deb 100644
--- a/MuonSpectrometer/MuonDigitization/MDT_Digitization/MDT_Digitization/chargeCalculator_PileUp.h
+++ b/MuonSpectrometer/MuonDigitization/MDT_Digitization/MDT_Digitization/chargeCalculator_PileUp.h
@@ -21,7 +21,6 @@ to the third digit of decimal number of the pdgid.
#include "MuonSimData/MuonSimData.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/AlgFactory.h"
#include "MuonIdHelpers/MdtIdHelper.h"
#include "MuonSimEvent/MdtHitIdHelper.h"
diff --git a/MuonSpectrometer/MuonDigitization/MDT_Digitization/MDT_Digitization/particleGamma.h b/MuonSpectrometer/MuonDigitization/MDT_Digitization/MDT_Digitization/particleGamma.h
index 87a017a047d..be821f2a4c9 100644
--- a/MuonSpectrometer/MuonDigitization/MDT_Digitization/MDT_Digitization/particleGamma.h
+++ b/MuonSpectrometer/MuonDigitization/MDT_Digitization/MDT_Digitization/particleGamma.h
@@ -15,7 +15,6 @@ Function particleGamma returns the value of gamma factor for Qball particle.
#include "MuonSimData/MuonSimDataCollection.h"
#include "MuonSimData/MuonSimData.h"
-#include "GaudiKernel/AlgFactory.h"
#include "MuonIdHelpers/MdtIdHelper.h"
#include "MuonSimEvent/MdtHitIdHelper.h"
diff --git a/MuonSpectrometer/MuonDigitization/MDT_Digitization/MDT_Digitization/particleGamma_PileUp.h b/MuonSpectrometer/MuonDigitization/MDT_Digitization/MDT_Digitization/particleGamma_PileUp.h
index eb90d149e35..3bd4982bf99 100644
--- a/MuonSpectrometer/MuonDigitization/MDT_Digitization/MDT_Digitization/particleGamma_PileUp.h
+++ b/MuonSpectrometer/MuonDigitization/MDT_Digitization/MDT_Digitization/particleGamma_PileUp.h
@@ -15,7 +15,6 @@ Function particleGamma returns the value of gamma factor for Qball particle.
#include "MuonSimData/MuonSimDataCollection.h"
#include "MuonSimData/MuonSimData.h"
-#include "GaudiKernel/AlgFactory.h"
#include "MuonIdHelpers/MdtIdHelper.h"
#include "MuonSimEvent/MdtHitIdHelper.h"
diff --git a/MuonSpectrometer/MuonDigitization/MDT_Digitization/src/RT_Relation_DB_DigiTool.cxx b/MuonSpectrometer/MuonDigitization/MDT_Digitization/src/RT_Relation_DB_DigiTool.cxx
index c04f26b9960..d521acaa47c 100644
--- a/MuonSpectrometer/MuonDigitization/MDT_Digitization/src/RT_Relation_DB_DigiTool.cxx
+++ b/MuonSpectrometer/MuonDigitization/MDT_Digitization/src/RT_Relation_DB_DigiTool.cxx
@@ -2,7 +2,6 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#include "GaudiKernel/ToolFactory.h"
#include "StoreGate/StoreGateSvc.h"
diff --git a/MuonSpectrometer/MuonDigitization/MM_Digitization/MM_Digitization/StripsResponse.h b/MuonSpectrometer/MuonDigitization/MM_Digitization/MM_Digitization/StripsResponse.h
index ca9968ebe43..c58710c0839 100644
--- a/MuonSpectrometer/MuonDigitization/MM_Digitization/MM_Digitization/StripsResponse.h
+++ b/MuonSpectrometer/MuonDigitization/MM_Digitization/MM_Digitization/StripsResponse.h
@@ -20,7 +20,6 @@ Comments to be added here...
*/
-#include "GaudiKernel/AlgFactory.h"
#include "GaudiKernel/IToolSvc.h"
#include "GaudiKernel/Service.h"
#include "AthenaKernel/MsgStreamMember.h"
diff --git a/MuonSpectrometer/MuonDigitization/MM_Digitization/src/MM_Response_DigitTool.cxx b/MuonSpectrometer/MuonDigitization/MM_Digitization/src/MM_Response_DigitTool.cxx
index 010f408a9c7..7451dfc4984 100644
--- a/MuonSpectrometer/MuonDigitization/MM_Digitization/src/MM_Response_DigitTool.cxx
+++ b/MuonSpectrometer/MuonDigitization/MM_Digitization/src/MM_Response_DigitTool.cxx
@@ -2,7 +2,6 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#include "GaudiKernel/ToolFactory.h"
#include "StoreGate/StoreGateSvc.h"
diff --git a/MuonSpectrometer/MuonDigitization/MM_Digitization/src/MmDigitizationTool.cxx b/MuonSpectrometer/MuonDigitization/MM_Digitization/src/MmDigitizationTool.cxx
index 3ff4fd177a4..49c677b2a23 100644
--- a/MuonSpectrometer/MuonDigitization/MM_Digitization/src/MmDigitizationTool.cxx
+++ b/MuonSpectrometer/MuonDigitization/MM_Digitization/src/MmDigitizationTool.cxx
@@ -36,7 +36,6 @@
//Gaudi - Core
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/AlgFactory.h"
#include "StoreGate/StoreGateSvc.h"
#include "PathResolver/PathResolver.h"
#include "AIDA/IHistogram1D.h"
diff --git a/MuonSpectrometer/MuonDigitization/sTGC_Digitization/src/sTgcDigitizationTool.cxx b/MuonSpectrometer/MuonDigitization/sTGC_Digitization/src/sTgcDigitizationTool.cxx
index 6c174239c90..0a839af8f8f 100644
--- a/MuonSpectrometer/MuonDigitization/sTGC_Digitization/src/sTgcDigitizationTool.cxx
+++ b/MuonSpectrometer/MuonDigitization/sTGC_Digitization/src/sTgcDigitizationTool.cxx
@@ -24,7 +24,6 @@
//Gaudi - Core
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/AlgFactory.h"
#include "GaudiKernel/IToolSvc.h"
#include "GaudiKernel/SystemOfUnits.h"
#include "StoreGate/StoreGateSvc.h"
diff --git a/MuonSpectrometer/MuonReconstruction/MuonPatternFinders/MuonPatternFinderTools/MuonCombinePatternTools/src/MuonCombinePatternTool.cxx b/MuonSpectrometer/MuonReconstruction/MuonPatternFinders/MuonPatternFinderTools/MuonCombinePatternTools/src/MuonCombinePatternTool.cxx
index 318d624820c..da901a3bdda 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonPatternFinders/MuonPatternFinderTools/MuonCombinePatternTools/src/MuonCombinePatternTool.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonPatternFinders/MuonPatternFinderTools/MuonCombinePatternTools/src/MuonCombinePatternTool.cxx
@@ -4,7 +4,6 @@
#include "MuonCombinePatternTools/MuonCombinePatternTool.h"
-#include "GaudiKernel/ToolFactory.h"
#include "StoreGate/StoreGateSvc.h"
#include "CxxUtils/sincos.h"
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRIO_OnTrackCreators/MdtDriftCircleOnTrackCreator/src/AdjustableT0Tool.cxx b/MuonSpectrometer/MuonReconstruction/MuonRIO_OnTrackCreators/MdtDriftCircleOnTrackCreator/src/AdjustableT0Tool.cxx
index ce8e4453dd0..b26759fafaf 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRIO_OnTrackCreators/MdtDriftCircleOnTrackCreator/src/AdjustableT0Tool.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonRIO_OnTrackCreators/MdtDriftCircleOnTrackCreator/src/AdjustableT0Tool.cxx
@@ -2,7 +2,6 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#include "GaudiKernel/ToolFactory.h"
#include "GaudiKernel/SmartDataPtr.h"
#include "GaudiKernel/IDataProviderSvc.h"
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonTGRecTools/src/MuonHolesOnTrackTool.cxx b/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonTGRecTools/src/MuonHolesOnTrackTool.cxx
index 56cb43a4dac..79132619968 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonTGRecTools/src/MuonHolesOnTrackTool.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonTGRecTools/src/MuonHolesOnTrackTool.cxx
@@ -13,8 +13,6 @@
// Gaudi includes
#include "StoreGate/StoreGate.h"
-#include "GaudiKernel/AlgFactory.h"
-#include "GaudiKernel/ToolFactory.h"
#include "GaudiKernel/ListItem.h"
#include "StoreGate/StoreGateSvc.h"
#include "GaudiKernel/IToolSvc.h"
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonTGRecTools/src/MuonTGMeasurementTool.cxx b/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonTGRecTools/src/MuonTGMeasurementTool.cxx
index c4b081c5857..bb462013747 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonTGRecTools/src/MuonTGMeasurementTool.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonTGRecTools/src/MuonTGMeasurementTool.cxx
@@ -13,8 +13,6 @@
// Gaudi includes
#include "StoreGate/StoreGate.h"
-#include "GaudiKernel/AlgFactory.h"
-#include "GaudiKernel/ToolFactory.h"
#include "GaudiKernel/ListItem.h"
#include "StoreGate/StoreGateSvc.h"
#include "GaudiKernel/IToolSvc.h"
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonAlignMonitoring/MuonAlignMonitoring/MuonAlignSegment.h b/MuonSpectrometer/MuonValidation/MuonDQA/MuonAlignMonitoring/MuonAlignMonitoring/MuonAlignSegment.h
index 84fd51bc38c..9208b25a4a9 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonAlignMonitoring/MuonAlignMonitoring/MuonAlignSegment.h
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonAlignMonitoring/MuonAlignMonitoring/MuonAlignSegment.h
@@ -8,7 +8,6 @@
/* // Gaudi Tools */
/* #include "GaudiKernel/MsgStream.h" */
/* #include "GaudiKernel/Algorithm.h" */
-/* #include "GaudiKernel/AlgFactory.h" */
/* #include "GaudiKernel/IToolSvc.h" */
/* #include "GaudiKernel/ToolHandle.h" */
/* #include "GaudiKernel/ITHistSvc.h" */
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonAlignMonitoring/MuonAlignMonitoring/MuonAlignValidation.h b/MuonSpectrometer/MuonValidation/MuonDQA/MuonAlignMonitoring/MuonAlignMonitoring/MuonAlignValidation.h
index 6d3dda657fb..a63858c99a3 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonAlignMonitoring/MuonAlignMonitoring/MuonAlignValidation.h
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonAlignMonitoring/MuonAlignMonitoring/MuonAlignValidation.h
@@ -8,7 +8,6 @@
/* // Gaudi Tools */
/* #include "GaudiKernel/MsgStream.h" */
/* #include "GaudiKernel/Algorithm.h" */
-/* #include "GaudiKernel/AlgFactory.h" */
/* #include "GaudiKernel/IToolSvc.h" */
/* #include "GaudiKernel/ToolHandle.h" */
/* #include "GaudiKernel/ITHistSvc.h" */
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonAlignMonitoring/src/MuonAlignValidation.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonAlignMonitoring/src/MuonAlignValidation.cxx
index c83a7210def..f5c028bf12c 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonAlignMonitoring/src/MuonAlignValidation.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonAlignMonitoring/src/MuonAlignValidation.cxx
@@ -16,7 +16,6 @@
// //Gaudi
// #include "GaudiKernel/MsgStream.h"
-// #include "GaudiKernel/AlgFactory.h"
// #include "GaudiKernel/IToolSvc.h"
// #include "GaudiKernel/ITHistSvc.h"
// #include "GaudiKernel/IChronoStatSvc.h"
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAUtils/MuonDQAUtils/InnerDetProbeCollectorTool.h b/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAUtils/MuonDQAUtils/InnerDetProbeCollectorTool.h
index 636b89529b5..3fc72ff28c5 100755
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAUtils/MuonDQAUtils/InnerDetProbeCollectorTool.h
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAUtils/MuonDQAUtils/InnerDetProbeCollectorTool.h
@@ -18,7 +18,6 @@
/// Gaudi Tools
#include "AthenaBaseComps/AthAlgTool.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/AlgFactory.h"
#include "GaudiKernel/IToolSvc.h"
#include "GaudiKernel/ToolHandle.h"
#include "GaudiKernel/ITHistSvc.h"
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAUtils/MuonDQAUtils/InsituTrackTools.h b/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAUtils/MuonDQAUtils/InsituTrackTools.h
index 219f067c5f9..158cb8b3aaf 100755
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAUtils/MuonDQAUtils/InsituTrackTools.h
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAUtils/MuonDQAUtils/InsituTrackTools.h
@@ -18,7 +18,6 @@
/// Gaudi Tools
#include "AthenaBaseComps/AthAlgTool.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/AlgFactory.h"
#include "GaudiKernel/IToolSvc.h"
#include "GaudiKernel/ToolHandle.h"
#include "GaudiKernel/ITHistSvc.h"
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAUtils/MuonDQAUtils/MuonSpectrometerProbeCollectorTool.h b/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAUtils/MuonDQAUtils/MuonSpectrometerProbeCollectorTool.h
index 983b1c7fc5b..ba5963b2b6f 100755
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAUtils/MuonDQAUtils/MuonSpectrometerProbeCollectorTool.h
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAUtils/MuonDQAUtils/MuonSpectrometerProbeCollectorTool.h
@@ -18,7 +18,6 @@
/// Gaudi Tools
#include "AthenaBaseComps/AthAlgTool.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/AlgFactory.h"
#include "GaudiKernel/IToolSvc.h"
#include "GaudiKernel/ToolHandle.h"
#include "GaudiKernel/ITHistSvc.h"
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsRpcRawDataMonitoring/src/MdtVsRpcRawDataValAlg.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsRpcRawDataMonitoring/src/MdtVsRpcRawDataValAlg.cxx
index a50fdc285de..e8de798a1f0 100755
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsRpcRawDataMonitoring/src/MdtVsRpcRawDataValAlg.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsRpcRawDataMonitoring/src/MdtVsRpcRawDataValAlg.cxx
@@ -12,7 +12,6 @@
///////////////////////////////////////////////////////////////////////////
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/AlgFactory.h"
#include "StoreGate/StoreGate.h"
#include "MuonRDO/RpcFiredChannel.h"
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsTgcRawDataMonitoring/src/MdtVsTgcRawDataValAlg.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsTgcRawDataMonitoring/src/MdtVsTgcRawDataValAlg.cxx
index 3e9d553648c..bf7eb62af63 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsTgcRawDataMonitoring/src/MdtVsTgcRawDataValAlg.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsTgcRawDataMonitoring/src/MdtVsTgcRawDataValAlg.cxx
@@ -12,7 +12,6 @@
/////////////////////////////////////////////////////////////////////////////////////////////////////////////
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/AlgFactory.h"
#include "GaudiKernel/ToolHandle.h"
#include "MuonRDO/TgcRdo.h"
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsTgcRawDataMonitoring/src/MdtVsTgcRawData_correlation.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsTgcRawDataMonitoring/src/MdtVsTgcRawData_correlation.cxx
index ea3aca90e29..1843ea587f4 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsTgcRawDataMonitoring/src/MdtVsTgcRawData_correlation.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsTgcRawDataMonitoring/src/MdtVsTgcRawData_correlation.cxx
@@ -12,7 +12,6 @@
////////////////////////////////////////////////////////////////////////////////////
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/AlgFactory.h"
// MuonDetDesc
#include "MuonReadoutGeometry/MuonDetectorManager.h"
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsTgcRawDataMonitoring/src/MdtVsTgcRawData_functions.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsTgcRawDataMonitoring/src/MdtVsTgcRawData_functions.cxx
index 13743a2dae1..31b867ec335 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsTgcRawDataMonitoring/src/MdtVsTgcRawData_functions.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsTgcRawDataMonitoring/src/MdtVsTgcRawData_functions.cxx
@@ -12,7 +12,6 @@
/////////////////////////////////////////////////////////////////////////////////////////////////////////////
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/AlgFactory.h"
#include "Identifier/Identifier.h"
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/src/RPCStandaloneTracksMon.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/src/RPCStandaloneTracksMon.cxx
index 1c9da2c033f..22c442f0bc8 100755
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/src/RPCStandaloneTracksMon.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/src/RPCStandaloneTracksMon.cxx
@@ -13,7 +13,6 @@
/////////////////////////////////////////////////////////////////////////////////////////////////////////////
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/AlgFactory.h"
#include "MuonReadoutGeometry/RpcReadoutSet.h"
#include "MuonReadoutGeometry/MuonDetectorManager.h"
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/src/RpcLv1RawDataEfficiency.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/src/RpcLv1RawDataEfficiency.cxx
index ce2cb42f80a..64b823e113b 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/src/RpcLv1RawDataEfficiency.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/src/RpcLv1RawDataEfficiency.cxx
@@ -12,7 +12,6 @@
/////////////////////////////////////////////////////////////////////////
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/AlgFactory.h"
#include "StoreGate/DataHandle.h"
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/src/RpcLv1RawDataSectorLogic.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/src/RpcLv1RawDataSectorLogic.cxx
index 3a96fbd299f..d68e4dac493 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/src/RpcLv1RawDataSectorLogic.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/src/RpcLv1RawDataSectorLogic.cxx
@@ -12,7 +12,6 @@
/////////////////////////////////////////////////////////////////////////
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/AlgFactory.h"
#include "MuonDQAUtils/MuonChamberNameConverter.h"
#include "MuonDQAUtils/MuonChambersRange.h"
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/src/RpcLv1RawDataValAlg.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/src/RpcLv1RawDataValAlg.cxx
index b26f5b77f33..d50bc8e832a 100755
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/src/RpcLv1RawDataValAlg.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/src/RpcLv1RawDataValAlg.cxx
@@ -12,7 +12,6 @@
/////////////////////////////////////////////////////////////////////////////////////////////////////////////
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/AlgFactory.h"
#include "MuonDQAUtils/MuonChamberNameConverter.h"
#include "MuonDQAUtils/MuonChambersRange.h"
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/src/RpcRawDataValAlg.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/src/RpcRawDataValAlg.cxx
index e5555a53836..c23371a9198 100755
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/src/RpcRawDataValAlg.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/src/RpcRawDataValAlg.cxx
@@ -15,7 +15,6 @@
/////////////////////////////////////////////////////////////////////////////////////////////////////////////
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/AlgFactory.h"
#include "EventPrimitives/EventPrimitivesHelpers.h"
#include "EventPrimitives/EventPrimitives.h"
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcLv1RawDataValAlg.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcLv1RawDataValAlg.cxx
index 25f571a2bce..381234fa9a4 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcLv1RawDataValAlg.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcLv1RawDataValAlg.cxx
@@ -13,7 +13,6 @@
/////////////////////////////////////////////////////////////////////////////////////////////////////////////
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/AlgFactory.h"
#include "StoreGate/DataHandle.h"
#include "MuonRDO/TgcRdo.h"
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcLv1RawDataValAlg_CoincidenceWindow.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcLv1RawDataValAlg_CoincidenceWindow.cxx
index a5dd56c7ace..ec51192d5f1 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcLv1RawDataValAlg_CoincidenceWindow.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcLv1RawDataValAlg_CoincidenceWindow.cxx
@@ -13,7 +13,6 @@
/////////////////////////////////////////////////////////////////////////////////////////////////////////////
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/AlgFactory.h"
#include "StoreGate/DataHandle.h"
#include "MuonRDO/TgcRdo.h"
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcLv1RawDataValAlg_Efficiency.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcLv1RawDataValAlg_Efficiency.cxx
index e25e4d85e70..8c109c29e92 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcLv1RawDataValAlg_Efficiency.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcLv1RawDataValAlg_Efficiency.cxx
@@ -13,7 +13,6 @@
/////////////////////////////////////////////////////////////////////////////////////////////////////////////
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/AlgFactory.h"
#include "StoreGate/DataHandle.h"
#include "MuonRDO/TgcRdo.h"
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcLv1RawDataValAlg_Functions.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcLv1RawDataValAlg_Functions.cxx
index 8f6efd6015d..e61c6cd460f 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcLv1RawDataValAlg_Functions.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcLv1RawDataValAlg_Functions.cxx
@@ -13,7 +13,6 @@
/////////////////////////////////////////////////////////////////////////////////////////////////////////////
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/AlgFactory.h"
#include "StoreGate/DataHandle.h"
#include "MuonDQAUtils/MuonChamberNameConverter.h"
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcLv1RawDataValAlg_NumberOfTrigger.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcLv1RawDataValAlg_NumberOfTrigger.cxx
index 4eebbaecee8..4f7e8c7170d 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcLv1RawDataValAlg_NumberOfTrigger.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcLv1RawDataValAlg_NumberOfTrigger.cxx
@@ -13,7 +13,6 @@
/////////////////////////////////////////////////////////////////////////////////////////////////////////////
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/AlgFactory.h"
#include "StoreGate/DataHandle.h"
// GeoModel
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcLv1RawDataValAlg_ReadContainer.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcLv1RawDataValAlg_ReadContainer.cxx
index c47696ac418..388a96604dd 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcLv1RawDataValAlg_ReadContainer.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcLv1RawDataValAlg_ReadContainer.cxx
@@ -13,7 +13,6 @@
/////////////////////////////////////////////////////////////////////////////////////////////////////////////
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/AlgFactory.h"
#include "StoreGate/DataHandle.h"
#include "xAODEventInfo/EventInfo.h"
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcLv1RawDataValAlg_Summary_LowStat.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcLv1RawDataValAlg_Summary_LowStat.cxx
index 3baea0c9bf7..404e3d89d83 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcLv1RawDataValAlg_Summary_LowStat.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcLv1RawDataValAlg_Summary_LowStat.cxx
@@ -13,7 +13,6 @@
/////////////////////////////////////////////////////////////////////////////////////////////////////////////
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/AlgFactory.h"
#include "StoreGate/DataHandle.h"
#include "MuonRDO/TgcRdo.h"
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcLv1RawDataValAlg_TriggerTiming.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcLv1RawDataValAlg_TriggerTiming.cxx
index 9dc1afec1c5..c7dde6a2f47 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcLv1RawDataValAlg_TriggerTiming.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcLv1RawDataValAlg_TriggerTiming.cxx
@@ -13,7 +13,6 @@
/////////////////////////////////////////////////////////////////////////////////////////////////////////////
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/AlgFactory.h"
#include "StoreGate/DataHandle.h"
// GeoModel
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataValAlg.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataValAlg.cxx
index 89e2fd08041..ddf4c2d7626 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataValAlg.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataValAlg.cxx
@@ -13,7 +13,6 @@
/////////////////////////////////////////////////////////////////////////////////////////////////////////////
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/AlgFactory.h"
// GeoModel
#include "MuonReadoutGeometry/TgcReadoutParams.h"
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataValAlg_Efficiency.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataValAlg_Efficiency.cxx
index 351580d0fbf..ad24776b414 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataValAlg_Efficiency.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataValAlg_Efficiency.cxx
@@ -13,7 +13,6 @@
/////////////////////////////////////////////////////////////////////////////////////////////////////////////
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/AlgFactory.h"
// GeoModel
#include "MuonReadoutGeometry/TgcReadoutParams.h"
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataValAlg_Functions.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataValAlg_Functions.cxx
index 8875b3f76d0..fb8210a1837 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataValAlg_Functions.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataValAlg_Functions.cxx
@@ -13,7 +13,6 @@
/////////////////////////////////////////////////////////////////////////////////////////////////////////////
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/AlgFactory.h"
// GeoModel
#include "MuonReadoutGeometry/TgcReadoutParams.h"
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataValAlg_NumberOfHits.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataValAlg_NumberOfHits.cxx
index 5cb22ee766e..7eb2590672a 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataValAlg_NumberOfHits.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataValAlg_NumberOfHits.cxx
@@ -13,7 +13,6 @@
/////////////////////////////////////////////////////////////////////////////////////////////////////////////
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/AlgFactory.h"
// GeoModel
#include "MuonReadoutGeometry/TgcReadoutParams.h"
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataValAlg_Profile.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataValAlg_Profile.cxx
index 03735622efc..c14054c5f1d 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataValAlg_Profile.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataValAlg_Profile.cxx
@@ -13,7 +13,6 @@
/////////////////////////////////////////////////////////////////////////////////////////////////////////////
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/AlgFactory.h"
// GeoModel
#include "MuonReadoutGeometry/TgcReadoutParams.h"
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataValAlg_ReadContainer.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataValAlg_ReadContainer.cxx
index b08dbc95460..ea7862e94cd 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataValAlg_ReadContainer.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataValAlg_ReadContainer.cxx
@@ -13,7 +13,6 @@
/////////////////////////////////////////////////////////////////////////////////////////////////////////////
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/AlgFactory.h"
// GeoModel
#include "MuonReadoutGeometry/TgcReadoutParams.h"
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataValAlg_SetOffset.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataValAlg_SetOffset.cxx
index af5a2f36bca..5c1df67066e 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataValAlg_SetOffset.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataValAlg_SetOffset.cxx
@@ -13,7 +13,6 @@
/////////////////////////////////////////////////////////////////////////////////////////////////////////////
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/AlgFactory.h"
// GeoModel
#include "MuonReadoutGeometry/TgcReadoutParams.h"
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataValAlg_Summary_LowStat.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataValAlg_Summary_LowStat.cxx
index 5535b72ec3a..a5056b77a12 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataValAlg_Summary_LowStat.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataValAlg_Summary_LowStat.cxx
@@ -13,7 +13,6 @@
/////////////////////////////////////////////////////////////////////////////////////////////////////////////
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/AlgFactory.h"
// GeoModel
#include "MuonReadoutGeometry/TgcReadoutParams.h"
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataValAlg_XYView.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataValAlg_XYView.cxx
index 60bfd635b14..13ea3e1f570 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataValAlg_XYView.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataValAlg_XYView.cxx
@@ -13,7 +13,6 @@
/////////////////////////////////////////////////////////////////////////////////////////////////////////////
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/AlgFactory.h"
// GeoModel
#include "MuonReadoutGeometry/TgcReadoutParams.h"
diff --git a/Offloading/OffloadSvc/src/OffloadSvc.cxx b/Offloading/OffloadSvc/src/OffloadSvc.cxx
index 6d9d2a542fb..83c8d6898b9 100644
--- a/Offloading/OffloadSvc/src/OffloadSvc.cxx
+++ b/Offloading/OffloadSvc/src/OffloadSvc.cxx
@@ -11,7 +11,6 @@
// FrameWork includes
#include "GaudiKernel/Property.h"
-#include "GaudiKernel/SvcFactory.h"
#include "GaudiKernel/IIncidentSvc.h"
// OffloadManagerSvc includes
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/JetTagAna.cxx b/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/JetTagAna.cxx
index bae4ff90946..a05259cd980 100644
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/JetTagAna.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/JetTagAna.cxx
@@ -18,7 +18,6 @@
#include "JetTagAna.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/AlgFactory.h"
#include "StoreGate/StoreGateSvc.h"
#include "StoreGate/DataHandle.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/MiscellaneousExamples.cxx b/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/MiscellaneousExamples.cxx
index 078b9a1dc59..d227593bdfd 100644
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/MiscellaneousExamples.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/MiscellaneousExamples.cxx
@@ -6,7 +6,6 @@
#include "MiscellaneousExamples.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/AlgFactory.h"
#include "GaudiKernel/IToolSvc.h"
#include "StoreGate/StoreGateSvc.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/ReadTruthParticles.cxx b/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/ReadTruthParticles.cxx
index d257579296e..ef1993324fc 100644
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/ReadTruthParticles.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/ReadTruthParticles.cxx
@@ -17,7 +17,6 @@
// Framework includes
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/AlgFactory.h"
#include "GaudiKernel/IToolSvc.h"
#include "StoreGate/StoreGateSvc.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/VFitZmmOnAOD.cxx b/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/VFitZmmOnAOD.cxx
index c1627ae98bd..c9531cac564 100644
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/VFitZmmOnAOD.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/VFitZmmOnAOD.cxx
@@ -3,7 +3,6 @@
*/
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/AlgFactory.h"
#include "GaudiKernel/IToolSvc.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/ZeeOnESD.cxx b/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/ZeeOnESD.cxx
index 71095304f17..0d7a05f0a14 100644
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/ZeeOnESD.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/ZeeOnESD.cxx
@@ -3,7 +3,6 @@
*/
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/AlgFactory.h"
#include "GaudiKernel/IToolSvc.h"
#include "StoreGate/StoreGateSvc.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisTools/src/AANTEventSelector.cxx b/PhysicsAnalysis/AnalysisCommon/AnalysisTools/src/AANTEventSelector.cxx
index a445101be52..f3233371344 100644
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisTools/src/AANTEventSelector.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisTools/src/AANTEventSelector.cxx
@@ -11,7 +11,6 @@
#include "AnalysisTools/AANTEventSelector.h"
#include "AnalysisTools/AANTEventContext.h"
-#include "GaudiKernel/SvcFactory.h"
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/MsgStream.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisTools/src/AANTupleStream.cxx b/PhysicsAnalysis/AnalysisCommon/AnalysisTools/src/AANTupleStream.cxx
index 342ddc392c8..c6199a7623b 100644
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisTools/src/AANTupleStream.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisTools/src/AANTupleStream.cxx
@@ -9,7 +9,6 @@
#include "AthenaPoolUtilities/AthenaAttributeList.h"
-#include "GaudiKernel/AlgFactory.h"
#include "GaudiKernel/IAlgManager.h"
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/IAddressCreator.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/ParticleEventAthenaPool/src/CompositeParticleContainerCnv.h b/PhysicsAnalysis/AnalysisCommon/ParticleEventAthenaPool/src/CompositeParticleContainerCnv.h
old mode 100755
new mode 100644
index ac8769eb794..a9555042aa3
--- a/PhysicsAnalysis/AnalysisCommon/ParticleEventAthenaPool/src/CompositeParticleContainerCnv.h
+++ b/PhysicsAnalysis/AnalysisCommon/ParticleEventAthenaPool/src/CompositeParticleContainerCnv.h
@@ -45,7 +45,9 @@ class CompositeParticleContainerCnv: public T_AthenaPoolCustomCnv<
/** Create the converter from the service locator
*/
+public:
CompositeParticleContainerCnv(ISvcLocator* svcloc);
+protected:
/** Build the persistent representation from the transient one.
*/
diff --git a/PhysicsAnalysis/AnalysisCommon/ParticleEventAthenaPool/src/INav4MomToTrackParticleAssocsCnv.h b/PhysicsAnalysis/AnalysisCommon/ParticleEventAthenaPool/src/INav4MomToTrackParticleAssocsCnv.h
index ccb9d813599..db1a2745461 100755
--- a/PhysicsAnalysis/AnalysisCommon/ParticleEventAthenaPool/src/INav4MomToTrackParticleAssocsCnv.h
+++ b/PhysicsAnalysis/AnalysisCommon/ParticleEventAthenaPool/src/INav4MomToTrackParticleAssocsCnv.h
@@ -39,14 +39,16 @@ class INav4MomToTrackParticleAssocsCnv
// make the factory for this converter our friend
friend class CnvFactory<INav4MomToTrackParticleAssocsCnv>;
+public:
+ /** Create the converter from the service locator
+ */
+ INav4MomToTrackParticleAssocsCnv(ISvcLocator* svcloc);
+
///////////////////////////////////////////////////////////////////
// Protected methods:
///////////////////////////////////////////////////////////////////
protected:
- /** Create the converter from the service locator
- */
- INav4MomToTrackParticleAssocsCnv(ISvcLocator* svcloc);
/** Build the persistent representation from the transient one.
*/
diff --git a/PhysicsAnalysis/AnalysisCommon/ParticleEventAthenaPool/src/NeutrinoContainerCnv.h b/PhysicsAnalysis/AnalysisCommon/ParticleEventAthenaPool/src/NeutrinoContainerCnv.h
old mode 100755
new mode 100644
index 4c032bddf7d..7fd9ff2473c
--- a/PhysicsAnalysis/AnalysisCommon/ParticleEventAthenaPool/src/NeutrinoContainerCnv.h
+++ b/PhysicsAnalysis/AnalysisCommon/ParticleEventAthenaPool/src/NeutrinoContainerCnv.h
@@ -44,7 +44,9 @@ class NeutrinoContainerCnv: public T_AthenaPoolCustomCnv<
/** Create the converter from the service locator
*/
+public:
NeutrinoContainerCnv(ISvcLocator* svcloc);
+protected:
/** Build the persistent representation from the transient one.
*/
diff --git a/PhysicsAnalysis/AnalysisCommon/ParticleEventAthenaPool/src/ParticleShallowCloneContainerCnv.h b/PhysicsAnalysis/AnalysisCommon/ParticleEventAthenaPool/src/ParticleShallowCloneContainerCnv.h
old mode 100755
new mode 100644
index 28378af5aea..57b11fbf07c
--- a/PhysicsAnalysis/AnalysisCommon/ParticleEventAthenaPool/src/ParticleShallowCloneContainerCnv.h
+++ b/PhysicsAnalysis/AnalysisCommon/ParticleEventAthenaPool/src/ParticleShallowCloneContainerCnv.h
@@ -44,7 +44,9 @@ class ParticleShallowCloneContainerCnv : public T_AthenaPoolCustomCnv< ParticleS
/** Create the converter from the service locator
*/
+public:
ParticleShallowCloneContainerCnv(ISvcLocator* svcloc);
+protected:
/** Build the persistent representation from the transient one.
*/
diff --git a/PhysicsAnalysis/AnalysisCommon/ParticleEventAthenaPool/src/SelectedParticlesCnv.h b/PhysicsAnalysis/AnalysisCommon/ParticleEventAthenaPool/src/SelectedParticlesCnv.h
index d4961a6f7be..09c1e6362e9 100644
--- a/PhysicsAnalysis/AnalysisCommon/ParticleEventAthenaPool/src/SelectedParticlesCnv.h
+++ b/PhysicsAnalysis/AnalysisCommon/ParticleEventAthenaPool/src/SelectedParticlesCnv.h
@@ -48,7 +48,9 @@ class SelectedParticlesCnv: public T_AthenaPoolCustomCnv<
/** Create the converter from the service locator
*/
+public:
SelectedParticlesCnv(ISvcLocator* svcloc);
+protected:
/** Build the persistent representation from the transient one.
*/
diff --git a/PhysicsAnalysis/AnalysisCommon/ParticleEventAthenaPool/src/TrackParticleAssocsCnv.h b/PhysicsAnalysis/AnalysisCommon/ParticleEventAthenaPool/src/TrackParticleAssocsCnv.h
old mode 100755
new mode 100644
index 575cb992113..8454b473250
--- a/PhysicsAnalysis/AnalysisCommon/ParticleEventAthenaPool/src/TrackParticleAssocsCnv.h
+++ b/PhysicsAnalysis/AnalysisCommon/ParticleEventAthenaPool/src/TrackParticleAssocsCnv.h
@@ -47,7 +47,9 @@ class TrackParticleAssocsCnv: public T_AthenaPoolCustomCnv<
/** Create the converter from the service locator
*/
+public:
TrackParticleAssocsCnv(ISvcLocator* svcloc);
+protected:
/** Build the persistent representation from the transient one.
*/
diff --git a/PhysicsAnalysis/AnalysisCommon/UserAnalysis/src/AnalysisSkeleton.cxx b/PhysicsAnalysis/AnalysisCommon/UserAnalysis/src/AnalysisSkeleton.cxx
index a9228188483..3f6e2a7efcd 100755
--- a/PhysicsAnalysis/AnalysisCommon/UserAnalysis/src/AnalysisSkeleton.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/UserAnalysis/src/AnalysisSkeleton.cxx
@@ -30,7 +30,6 @@
// the first two come for free when using AthAlgorithm
//#include "GaudiKernel/MsgStream.h"
//#include "StoreGate/StoreGateSvc.h"
-#include "GaudiKernel/AlgFactory.h"
#include "GaudiKernel/IToolSvc.h"
diff --git a/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/TrackParticleRetriever.cxx b/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/TrackParticleRetriever.cxx
index fc6c4577ee0..b23242a4845 100755
--- a/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/TrackParticleRetriever.cxx
+++ b/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/TrackParticleRetriever.cxx
@@ -3,7 +3,6 @@
*/
#include "AnalysisJiveXML/TrackParticleRetriever.h"
-#include "GaudiKernel/ToolFactory.h"
#include "GaudiKernel/IToolSvc.h"
#include "GaudiKernel/ListItem.h"
diff --git a/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEventAthenaPool/src/CTP_DecisionCnv.h b/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEventAthenaPool/src/CTP_DecisionCnv.h
old mode 100755
new mode 100644
index 2eb0d987f3a..04e21e8bb66
--- a/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEventAthenaPool/src/CTP_DecisionCnv.h
+++ b/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEventAthenaPool/src/CTP_DecisionCnv.h
@@ -33,7 +33,9 @@ class CTP_DecisionCnv : public CTP_DecisionCnvBase {
friend class CnvFactory< CTP_DecisionCnv >;
protected:
+public:
CTP_DecisionCnv( ISvcLocator* svcloc ) : CTP_DecisionCnvBase( svcloc ) {}
+protected:
virtual CTP_Decision_PERS* createPersistent( CTP_Decision* transObj );
virtual CTP_Decision* createTransient();
diff --git a/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEventAthenaPool/src/LVL1_ROICnv.h b/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEventAthenaPool/src/LVL1_ROICnv.h
old mode 100755
new mode 100644
index c81311ed0ae..0eb183265db
--- a/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEventAthenaPool/src/LVL1_ROICnv.h
+++ b/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEventAthenaPool/src/LVL1_ROICnv.h
@@ -34,7 +34,9 @@ class LVL1_ROICnv : public LVL1_ROICnvBase {
friend class CnvFactory< LVL1_ROICnv >;
protected:
+public:
LVL1_ROICnv( ISvcLocator* svcloc ) : LVL1_ROICnvBase( svcloc ) {}
+protected:
virtual LVL1_ROI_PERS* createPersistent( LVL1_ROI* transObj );
virtual LVL1_ROI* createTransient();
diff --git a/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerTools/src/MuonTriggerAnalysisTool.cxx b/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerTools/src/MuonTriggerAnalysisTool.cxx
index f823fcbe6ce..5d1a8c71eab 100755
--- a/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerTools/src/MuonTriggerAnalysisTool.cxx
+++ b/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerTools/src/MuonTriggerAnalysisTool.cxx
@@ -3,7 +3,6 @@
*/
#include "AnalysisTriggerTools/MuonTriggerAnalysisTool.h"
-#include "GaudiKernel/ToolFactory.h"
#include "GaudiKernel/MsgStream.h"
#include "StoreGate/StoreGate.h"
diff --git a/PhysicsAnalysis/D2PDMaker/src/CheckD2PD.cxx b/PhysicsAnalysis/D2PDMaker/src/CheckD2PD.cxx
index 2e948099090..cc09408b966 100644
--- a/PhysicsAnalysis/D2PDMaker/src/CheckD2PD.cxx
+++ b/PhysicsAnalysis/D2PDMaker/src/CheckD2PD.cxx
@@ -17,7 +17,6 @@
#define XXX std::cout << "I am here: " << __FILE__ << ":" << __LINE__ << std::endl;
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/AlgFactory.h"
#include "GaudiKernel/IToolSvc.h"
#include "StoreGate/StoreGateSvc.h"
diff --git a/PhysicsAnalysis/D2PDMaker/src/D2PDINavigable4MomentumSelector.cxx b/PhysicsAnalysis/D2PDMaker/src/D2PDINavigable4MomentumSelector.cxx
index 0e54b304a79..9b7a6e8586d 100644
--- a/PhysicsAnalysis/D2PDMaker/src/D2PDINavigable4MomentumSelector.cxx
+++ b/PhysicsAnalysis/D2PDMaker/src/D2PDINavigable4MomentumSelector.cxx
@@ -32,7 +32,6 @@
#include <cfloat>
// Gaudi stuff
-#include "GaudiKernel/AlgFactory.h"
#include "GaudiKernel/IToolSvc.h"
#include "GaudiKernel/ListItem.h"
diff --git a/PhysicsAnalysis/D2PDMaker/src/D2PDJetSelector.cxx b/PhysicsAnalysis/D2PDMaker/src/D2PDJetSelector.cxx
index d0e97c8d713..463291fdd91 100644
--- a/PhysicsAnalysis/D2PDMaker/src/D2PDJetSelector.cxx
+++ b/PhysicsAnalysis/D2PDMaker/src/D2PDJetSelector.cxx
@@ -30,7 +30,6 @@
#include <cfloat>
// Gaudi stuff
-#include "GaudiKernel/AlgFactory.h"
#include "GaudiKernel/IToolSvc.h"
#include "GaudiKernel/ListItem.h"
diff --git a/PhysicsAnalysis/D2PDMaker/src/D2PDMuonSelector.cxx b/PhysicsAnalysis/D2PDMaker/src/D2PDMuonSelector.cxx
index a6b3687c20d..10cb0ec0f3d 100644
--- a/PhysicsAnalysis/D2PDMaker/src/D2PDMuonSelector.cxx
+++ b/PhysicsAnalysis/D2PDMaker/src/D2PDMuonSelector.cxx
@@ -30,7 +30,6 @@
#include <cfloat>
// Gaudi stuff
-#include "GaudiKernel/AlgFactory.h"
#include "GaudiKernel/IToolSvc.h"
#include "GaudiKernel/ListItem.h"
diff --git a/PhysicsAnalysis/D2PDMaker/src/D2PDTauSelector.cxx b/PhysicsAnalysis/D2PDMaker/src/D2PDTauSelector.cxx
index 8b274bd8e83..a493d4bba9d 100644
--- a/PhysicsAnalysis/D2PDMaker/src/D2PDTauSelector.cxx
+++ b/PhysicsAnalysis/D2PDMaker/src/D2PDTauSelector.cxx
@@ -30,7 +30,6 @@
#include <cfloat>
// Gaudi stuff
-#include "GaudiKernel/AlgFactory.h"
#include "GaudiKernel/IToolSvc.h"
#include "GaudiKernel/ListItem.h"
diff --git a/PhysicsAnalysis/D2PDMaker/src/D2PDTrackParticleSelector.cxx b/PhysicsAnalysis/D2PDMaker/src/D2PDTrackParticleSelector.cxx
index c6fd70ea11f..1bdc22a31dd 100644
--- a/PhysicsAnalysis/D2PDMaker/src/D2PDTrackParticleSelector.cxx
+++ b/PhysicsAnalysis/D2PDMaker/src/D2PDTrackParticleSelector.cxx
@@ -32,7 +32,6 @@
#include <cfloat>
// Gaudi stuff
-#include "GaudiKernel/AlgFactory.h"
#include "GaudiKernel/IToolSvc.h"
#include "GaudiKernel/ListItem.h"
diff --git a/PhysicsAnalysis/D2PDMaker/src/D2PDVertexSelector.cxx b/PhysicsAnalysis/D2PDMaker/src/D2PDVertexSelector.cxx
index fd36c40d846..33b83ac8c5e 100644
--- a/PhysicsAnalysis/D2PDMaker/src/D2PDVertexSelector.cxx
+++ b/PhysicsAnalysis/D2PDMaker/src/D2PDVertexSelector.cxx
@@ -27,7 +27,6 @@
#include <climits>
// Gaudi stuff
-#include "GaudiKernel/AlgFactory.h"
#include "GaudiKernel/IToolSvc.h"
#include "GaudiKernel/ListItem.h"
diff --git a/PhysicsAnalysis/D2PDMaker/src/FilterTool.cxx b/PhysicsAnalysis/D2PDMaker/src/FilterTool.cxx
index cf25e2f8c5b..4e7a13133b2 100644
--- a/PhysicsAnalysis/D2PDMaker/src/FilterTool.cxx
+++ b/PhysicsAnalysis/D2PDMaker/src/FilterTool.cxx
@@ -30,7 +30,6 @@
#include <iostream>
// DataModel
-#include "GaudiKernel/ToolFactory.h"
#include "AthLinks/ElementLink.h"
#include "AthenaKernel/CLASS_DEF.h"
diff --git a/PhysicsAnalysis/D3PDMaker/TileD3PDMaker/src/TileEventFillerTool.h b/PhysicsAnalysis/D3PDMaker/TileD3PDMaker/src/TileEventFillerTool.h
index bd743742dae..08a8fb9b1e0 100644
--- a/PhysicsAnalysis/D3PDMaker/TileD3PDMaker/src/TileEventFillerTool.h
+++ b/PhysicsAnalysis/D3PDMaker/TileD3PDMaker/src/TileEventFillerTool.h
@@ -18,7 +18,6 @@
// GENERIC INCLUDES
#include "StoreGate/StoreGateSvc.h"
-#include "GaudiKernel/AlgFactory.h"
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/IToolSvc.h"
#include "GaudiKernel/ITHistSvc.h"
diff --git a/PhysicsAnalysis/JetTagging/JetTagInfoAthenaPool/src/JetTagInfoCnv.h b/PhysicsAnalysis/JetTagging/JetTagInfoAthenaPool/src/JetTagInfoCnv.h
index d3c1f25c2c5..48177e36b92 100644
--- a/PhysicsAnalysis/JetTagging/JetTagInfoAthenaPool/src/JetTagInfoCnv.h
+++ b/PhysicsAnalysis/JetTagging/JetTagInfoAthenaPool/src/JetTagInfoCnv.h
@@ -28,7 +28,9 @@ class JetTagInfoCnv : public JetTagInfoCnvBase {
protected:
+public:
JetTagInfoCnv (ISvcLocator *svcloc);
+protected:
StatusCode initialize(void);
inline AthenaPoolTopLevelTPCnvBase *getTopLevelTPCnv(void)
{
diff --git a/PhysicsAnalysis/JpsiUpsilonTools/src/JpsiEEFinder.cxx_noCompile b/PhysicsAnalysis/JpsiUpsilonTools/src/JpsiEEFinder.cxx_noCompile
index d71981c1cf6..4acf7ff1083 100644
--- a/PhysicsAnalysis/JpsiUpsilonTools/src/JpsiEEFinder.cxx_noCompile
+++ b/PhysicsAnalysis/JpsiUpsilonTools/src/JpsiEEFinder.cxx_noCompile
@@ -24,8 +24,7 @@
#include "TrkToolInterfaces/ITrackSelectorTool.h"
#include "EventPrimitives/EventPrimitives.h"
#include "CaloEvent/CaloCluster.h"
-#include "GaudiKernel/ToolFactory.h"
-#include "GaudiKernel/IPartPropSvc.h"
+
#include "GaudiKernel/IPartPropSvc.h"
#include "AthLinks/ElementLink.h"
#include "egammaAnalysisUtils/EnergyRescaler.h"
#include "egammaAnalysisUtils/IsEMPlusPlusHelper.h"
diff --git a/PhysicsAnalysis/JpsiUpsilonTools/src/JpsiFinder.cxx b/PhysicsAnalysis/JpsiUpsilonTools/src/JpsiFinder.cxx
index 3fca7cd3d81..a9504828808 100644
--- a/PhysicsAnalysis/JpsiUpsilonTools/src/JpsiFinder.cxx
+++ b/PhysicsAnalysis/JpsiUpsilonTools/src/JpsiFinder.cxx
@@ -29,7 +29,6 @@
#include "InDetConversionFinderTools/VertexPointEstimator.h"
#include "TrkToolInterfaces/ITrackSelectorTool.h"
#include "EventPrimitives/EventPrimitives.h"
-#include "GaudiKernel/ToolFactory.h"
#include "GaudiKernel/IPartPropSvc.h"
#include "AthLinks/ElementLink.h"
diff --git a/PhysicsAnalysis/JpsiUpsilonTools/src/JpsiPlus1Track.cxx b/PhysicsAnalysis/JpsiUpsilonTools/src/JpsiPlus1Track.cxx
index 318a6cd1b11..5db1afa7a59 100644
--- a/PhysicsAnalysis/JpsiUpsilonTools/src/JpsiPlus1Track.cxx
+++ b/PhysicsAnalysis/JpsiUpsilonTools/src/JpsiPlus1Track.cxx
@@ -15,7 +15,6 @@
#include "TrkVertexFitterInterfaces/IVertexFitter.h"
#include "TrkVKalVrtFitter/TrkVKalVrtFitter.h"
#include "TrkToolInterfaces/ITrackSelectorTool.h"
-#include "GaudiKernel/ToolFactory.h"
#include "GaudiKernel/IPartPropSvc.h"
#include "AthLinks/ElementLink.h"
#include "xAODTracking/TrackParticleContainer.h"
diff --git a/PhysicsAnalysis/JpsiUpsilonTools/src/JpsiPlus2Tracks.cxx b/PhysicsAnalysis/JpsiUpsilonTools/src/JpsiPlus2Tracks.cxx
index d8d85a22039..90db5389b3e 100644
--- a/PhysicsAnalysis/JpsiUpsilonTools/src/JpsiPlus2Tracks.cxx
+++ b/PhysicsAnalysis/JpsiUpsilonTools/src/JpsiPlus2Tracks.cxx
@@ -16,7 +16,6 @@
#include "TrkVertexFitterInterfaces/IVertexFitter.h"
#include "TrkVKalVrtFitter/TrkVKalVrtFitter.h"
#include "TrkToolInterfaces/ITrackSelectorTool.h"
-#include "GaudiKernel/ToolFactory.h"
#include "GaudiKernel/IPartPropSvc.h"
#include "AthLinks/ElementLink.h"
#include "InDetConversionFinderTools/VertexPointEstimator.h"
diff --git a/PhysicsAnalysis/JpsiUpsilonTools/src/PrimaryVertexRefitter.cxx b/PhysicsAnalysis/JpsiUpsilonTools/src/PrimaryVertexRefitter.cxx
index 2dc3d9623c1..56465f1d39b 100644
--- a/PhysicsAnalysis/JpsiUpsilonTools/src/PrimaryVertexRefitter.cxx
+++ b/PhysicsAnalysis/JpsiUpsilonTools/src/PrimaryVertexRefitter.cxx
@@ -13,8 +13,7 @@
#include "JpsiUpsilonTools/PrimaryVertexRefitter.h"
#include "TrkVertexFitterUtils/TrackToVertexIPEstimator.h"
-#include "GaudiKernel/ToolFactory.h"
-#include "xAODTracking/Vertex.h"
+
#include "xAODTracking/Vertex.h"
#include "xAODTracking/TrackParticle.h"
namespace Analysis {
diff --git a/PhysicsAnalysis/PrimaryDPDMaker/src/PrimaryDPDPrescaler.cxx b/PhysicsAnalysis/PrimaryDPDMaker/src/PrimaryDPDPrescaler.cxx
index f5394ba2f46..567e83a4bb4 100644
--- a/PhysicsAnalysis/PrimaryDPDMaker/src/PrimaryDPDPrescaler.cxx
+++ b/PhysicsAnalysis/PrimaryDPDMaker/src/PrimaryDPDPrescaler.cxx
@@ -12,7 +12,6 @@
// the user data-class defintions
-#include "GaudiKernel/ToolFactory.h"
#include "GaudiKernel/IAlgManager.h"
#include "GaudiKernel/IIncidentSvc.h"
#include "GaudiKernel/ISvcLocator.h"
diff --git a/PhysicsAnalysis/PrimaryDPDMaker/src/ThinContainers.cxx b/PhysicsAnalysis/PrimaryDPDMaker/src/ThinContainers.cxx
index 993b8021b62..c2434e36e86 100644
--- a/PhysicsAnalysis/PrimaryDPDMaker/src/ThinContainers.cxx
+++ b/PhysicsAnalysis/PrimaryDPDMaker/src/ThinContainers.cxx
@@ -18,7 +18,6 @@
// This class' header
#include "PrimaryDPDMaker/ThinContainers.h"
-#include "GaudiKernel/ToolFactory.h"
#include "GaudiKernel/IAlgManager.h"
#include "GaudiKernel/ISvcLocator.h"
#include "AthLinks/ElementLink.h"
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleEventAthenaPool/src/TruthEtIsolationsContainerCnv.h b/PhysicsAnalysis/TruthParticleID/McParticleEventAthenaPool/src/TruthEtIsolationsContainerCnv.h
old mode 100755
new mode 100644
index 3a6bdad019a..2781a475aa4
--- a/PhysicsAnalysis/TruthParticleID/McParticleEventAthenaPool/src/TruthEtIsolationsContainerCnv.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleEventAthenaPool/src/TruthEtIsolationsContainerCnv.h
@@ -45,7 +45,9 @@ class TruthEtIsolationsContainerCnv: public T_AthenaPoolCustomCnv<
/** Create the converter from the service locator
*/
+public:
TruthEtIsolationsContainerCnv(ISvcLocator* svcloc);
+protected:
/** Build the persistent representation from the transient one.
*/
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleEventAthenaPool/src/TruthParticleContainerCnv.h b/PhysicsAnalysis/TruthParticleID/McParticleEventAthenaPool/src/TruthParticleContainerCnv.h
old mode 100755
new mode 100644
index 006005e947d..b7a0124396c
--- a/PhysicsAnalysis/TruthParticleID/McParticleEventAthenaPool/src/TruthParticleContainerCnv.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleEventAthenaPool/src/TruthParticleContainerCnv.h
@@ -47,7 +47,9 @@ class TruthParticleContainerCnv: public T_AthenaPoolCustomCnv<
/** Create the converter from the service locator
*/
+public:
TruthParticleContainerCnv(ISvcLocator* svcloc);
+protected:
/** Build the persistent representation from the transient one.
*/
diff --git a/Projects/AthSimulation/externals.txt b/Projects/AthSimulation/externals.txt
index 67e394a7e12..b175ef493ea 100644
--- a/Projects/AthSimulation/externals.txt
+++ b/Projects/AthSimulation/externals.txt
@@ -6,7 +6,7 @@
# forbidden.
# The version of atlas/atlasexternals to use:
-AthSimulationExternalsVersion = 2.0.2
+AthSimulationExternalsVersion = 8bb3de80
# The version of atlas/Gaudi to use:
-GaudiVersion = v30r1.011
+GaudiVersion = v30r2.001
diff --git a/Projects/Athena/externals.txt b/Projects/Athena/externals.txt
index 3814f53db19..94bb6efd3e4 100644
--- a/Projects/Athena/externals.txt
+++ b/Projects/Athena/externals.txt
@@ -6,7 +6,7 @@
# forbidden.
# The version of atlas/atlasexternals to use:
-AthenaExternalsVersion = 2.0.2
+AthenaExternalsVersion = 8bb3de80
-# The version of atlas/Gaudi to use:
-GaudiVersion = v30r1.011
+# The version of atlas/Gaudi to use:
+GaudiVersion = v30r2.001
diff --git a/Reconstruction/EventShapes/EventShapeAthenaPool/src/EventShapeStoreCnv.h b/Reconstruction/EventShapes/EventShapeAthenaPool/src/EventShapeStoreCnv.h
index a5f8fa52073..157116f0004 100644
--- a/Reconstruction/EventShapes/EventShapeAthenaPool/src/EventShapeStoreCnv.h
+++ b/Reconstruction/EventShapes/EventShapeAthenaPool/src/EventShapeStoreCnv.h
@@ -26,7 +26,9 @@ class EventShapeStoreCnv : public EventShapeStoreCnvBase
protected:
+public:
EventShapeStoreCnv (ISvcLocator* svcloc) : EventShapeStoreCnvBase(svcloc) {};
+protected:
virtual EventShapeStore_PERS* createPersistent (EventShapeStore* transObj);
virtual EventShapeStore* createTransient ();
diff --git a/Reconstruction/Jet/JetEventAthenaPool/src/JetCollectionCnv.h b/Reconstruction/Jet/JetEventAthenaPool/src/JetCollectionCnv.h
old mode 100755
new mode 100644
index 4ed814a201a..c11c68cf92c
--- a/Reconstruction/Jet/JetEventAthenaPool/src/JetCollectionCnv.h
+++ b/Reconstruction/Jet/JetEventAthenaPool/src/JetCollectionCnv.h
@@ -72,7 +72,9 @@ class JetCollectionCnv: public JetCollectionCnvBase,
/** Create the converter from the service locator
*/
+public:
JetCollectionCnv(ISvcLocator* svcloc);
+protected:
/** Build the persistent representation from the transient one.
*/
diff --git a/Reconstruction/Jet/JetEventAthenaPool/src/JetKeyDescriptorCnv.h b/Reconstruction/Jet/JetEventAthenaPool/src/JetKeyDescriptorCnv.h
index 254fee6b923..247518938a9 100644
--- a/Reconstruction/Jet/JetEventAthenaPool/src/JetKeyDescriptorCnv.h
+++ b/Reconstruction/Jet/JetEventAthenaPool/src/JetKeyDescriptorCnv.h
@@ -23,7 +23,9 @@ class JetKeyDescriptorCnv : public JetKeyDescriptorCnvBase
protected:
+public:
JetKeyDescriptorCnv (ISvcLocator* svcloc) : JetKeyDescriptorCnvBase(svcloc) {};
+protected:
virtual JetKeyDescriptor_PERS* createPersistent (JetKeyDescriptor* transObj);
virtual JetKeyDescriptor* createTransient ();
};
diff --git a/Reconstruction/Jet/JetEventAthenaPool/src/JetMomentMapCnv.h b/Reconstruction/Jet/JetEventAthenaPool/src/JetMomentMapCnv.h
index d3661b33b97..088cf963009 100644
--- a/Reconstruction/Jet/JetEventAthenaPool/src/JetMomentMapCnv.h
+++ b/Reconstruction/Jet/JetEventAthenaPool/src/JetMomentMapCnv.h
@@ -25,7 +25,9 @@ class JetMomentMapCnv : public JetMomentMapCnvBase
protected:
+public:
JetMomentMapCnv (ISvcLocator* svcloc) : JetMomentMapCnvBase(svcloc) {};
+protected:
virtual JetMomentMap_PERS* createPersistent (JetMomentMap* transObj);
virtual JetMomentMap* createTransient ();
diff --git a/Reconstruction/Jet/JetEventAthenaPool/src/JetSamplingCollectionCnv.h b/Reconstruction/Jet/JetEventAthenaPool/src/JetSamplingCollectionCnv.h
index 6321a289aa1..eacd0482290 100644
--- a/Reconstruction/Jet/JetEventAthenaPool/src/JetSamplingCollectionCnv.h
+++ b/Reconstruction/Jet/JetEventAthenaPool/src/JetSamplingCollectionCnv.h
@@ -47,7 +47,9 @@ class JetSamplingCollectionCnv: public T_AthenaPoolCustomCnv<
/** Create the converter from the service locator
*/
+public:
JetSamplingCollectionCnv(ISvcLocator* svcloc);
+protected:
/** Build the persistent representation from the transient one.
*/
diff --git a/Reconstruction/MissingETGoodness/src/JetGoodiesFiller.cxx b/Reconstruction/MissingETGoodness/src/JetGoodiesFiller.cxx
index 2274fcf4de7..82b1af9b893 100644
--- a/Reconstruction/MissingETGoodness/src/JetGoodiesFiller.cxx
+++ b/Reconstruction/MissingETGoodness/src/JetGoodiesFiller.cxx
@@ -5,7 +5,6 @@
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/GaudiException.h"
#include "GaudiKernel/Property.h"
-#include "GaudiKernel/AlgFactory.h"
#include "MissingETGoodness/JetGoodiesFiller.h"
#include "MissingETGoodness/MissingETUtils.h"
diff --git a/Reconstruction/MissingETGoodness/src/MuonGoodiesFiller.cxx b/Reconstruction/MissingETGoodness/src/MuonGoodiesFiller.cxx
index 438fe6ac1eb..69fe8b5d178 100644
--- a/Reconstruction/MissingETGoodness/src/MuonGoodiesFiller.cxx
+++ b/Reconstruction/MissingETGoodness/src/MuonGoodiesFiller.cxx
@@ -5,7 +5,6 @@
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/GaudiException.h"
#include "GaudiKernel/Property.h"
-#include "GaudiKernel/AlgFactory.h"
#include "muonEvent/MuonContainer.h"
#include "MissingETGoodness/MuonGoodiesFiller.h"
#include "MissingETGoodness/MuonSpShowerHelper.h"
diff --git a/Reconstruction/MissingETPerformance/src/BasicPlotsTool.cxx b/Reconstruction/MissingETPerformance/src/BasicPlotsTool.cxx
index 29b9382e785..5a5817e8e8d 100755
--- a/Reconstruction/MissingETPerformance/src/BasicPlotsTool.cxx
+++ b/Reconstruction/MissingETPerformance/src/BasicPlotsTool.cxx
@@ -5,7 +5,6 @@
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/GaudiException.h"
#include "GaudiKernel/Property.h"
-#include "GaudiKernel/AlgFactory.h"
#include "xAODEventInfo/EventInfo.h"
diff --git a/Reconstruction/MissingETPerformance/src/ContainerComparatorTool.cxx b/Reconstruction/MissingETPerformance/src/ContainerComparatorTool.cxx
index e8d55c6b224..e3914cc625d 100755
--- a/Reconstruction/MissingETPerformance/src/ContainerComparatorTool.cxx
+++ b/Reconstruction/MissingETPerformance/src/ContainerComparatorTool.cxx
@@ -5,7 +5,6 @@
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/GaudiException.h"
#include "GaudiKernel/Property.h"
-#include "GaudiKernel/AlgFactory.h"
//#include "CLHEP/Units/PhysicalConstants.h"
diff --git a/Reconstruction/MissingETPerformance/src/EtaRingsTool.cxx b/Reconstruction/MissingETPerformance/src/EtaRingsTool.cxx
index 66b27a02f16..08f93810944 100755
--- a/Reconstruction/MissingETPerformance/src/EtaRingsTool.cxx
+++ b/Reconstruction/MissingETPerformance/src/EtaRingsTool.cxx
@@ -5,7 +5,6 @@
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/GaudiException.h"
#include "GaudiKernel/Property.h"
-#include "GaudiKernel/AlgFactory.h"
//#include "CLHEP/Units/PhysicalConstants.h"
diff --git a/Reconstruction/MissingETPerformance/src/FakeMissingETTool.cxx b/Reconstruction/MissingETPerformance/src/FakeMissingETTool.cxx
index 0d8a35dea03..729b0580971 100755
--- a/Reconstruction/MissingETPerformance/src/FakeMissingETTool.cxx
+++ b/Reconstruction/MissingETPerformance/src/FakeMissingETTool.cxx
@@ -5,7 +5,6 @@
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/GaudiException.h"
#include "GaudiKernel/Property.h"
-#include "GaudiKernel/AlgFactory.h"
//#include "CLHEP/Units/PhysicalConstants.h"
#include "TLorentzVector.h"
diff --git a/Reconstruction/MissingETPerformance/src/LinearityTool.cxx b/Reconstruction/MissingETPerformance/src/LinearityTool.cxx
index c97a1065c9b..958605f398c 100755
--- a/Reconstruction/MissingETPerformance/src/LinearityTool.cxx
+++ b/Reconstruction/MissingETPerformance/src/LinearityTool.cxx
@@ -5,7 +5,6 @@
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/GaudiException.h"
#include "GaudiKernel/Property.h"
-#include "GaudiKernel/AlgFactory.h"
//#include "CLHEP/Units/PhysicalConstants.h"
diff --git a/Reconstruction/MissingETPerformance/src/MissingETCompositionTool.cxx b/Reconstruction/MissingETPerformance/src/MissingETCompositionTool.cxx
index 9f93525b000..00dca0b206b 100755
--- a/Reconstruction/MissingETPerformance/src/MissingETCompositionTool.cxx
+++ b/Reconstruction/MissingETPerformance/src/MissingETCompositionTool.cxx
@@ -5,7 +5,6 @@
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/GaudiException.h"
#include "GaudiKernel/Property.h"
-#include "GaudiKernel/AlgFactory.h"
#include "xAODEventInfo/EventInfo.h"
diff --git a/Reconstruction/MissingETPerformance/src/MissingETPerformance.cxx b/Reconstruction/MissingETPerformance/src/MissingETPerformance.cxx
index 4dfc756521d..3d942e9f930 100755
--- a/Reconstruction/MissingETPerformance/src/MissingETPerformance.cxx
+++ b/Reconstruction/MissingETPerformance/src/MissingETPerformance.cxx
@@ -3,7 +3,6 @@
*/
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/AlgFactory.h"
#include "GaudiKernel/IToolSvc.h"
#include "StoreGate/StoreGateSvc.h"
diff --git a/Reconstruction/MissingETPerformance/src/MissingETScaleTool.cxx b/Reconstruction/MissingETPerformance/src/MissingETScaleTool.cxx
index 216311860df..f094e873564 100755
--- a/Reconstruction/MissingETPerformance/src/MissingETScaleTool.cxx
+++ b/Reconstruction/MissingETPerformance/src/MissingETScaleTool.cxx
@@ -5,7 +5,6 @@
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/GaudiException.h"
#include "GaudiKernel/Property.h"
-#include "GaudiKernel/AlgFactory.h"
#include "egammaEvent/ElectronContainer.h"
diff --git a/Reconstruction/MissingETPerformance/src/MuonTool.cxx b/Reconstruction/MissingETPerformance/src/MuonTool.cxx
index afadcb953ee..1c4a7af0c38 100644
--- a/Reconstruction/MissingETPerformance/src/MuonTool.cxx
+++ b/Reconstruction/MissingETPerformance/src/MuonTool.cxx
@@ -5,7 +5,6 @@
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/GaudiException.h"
#include "GaudiKernel/Property.h"
-#include "GaudiKernel/AlgFactory.h"
#include "MissingETPerformance/MuonTool.h"
diff --git a/Reconstruction/MissingETPerformance/src/ResolutionTool.cxx b/Reconstruction/MissingETPerformance/src/ResolutionTool.cxx
index 83720c5a7f6..a5d0cf2863f 100755
--- a/Reconstruction/MissingETPerformance/src/ResolutionTool.cxx
+++ b/Reconstruction/MissingETPerformance/src/ResolutionTool.cxx
@@ -5,7 +5,6 @@
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/GaudiException.h"
#include "GaudiKernel/Property.h"
-#include "GaudiKernel/AlgFactory.h"
#include "CLHEP/Units/PhysicalConstants.h"
#include "AthenaKernel/Units.h"
diff --git a/Reconstruction/MissingETPerformance/src/ZMuMuTool.cxx b/Reconstruction/MissingETPerformance/src/ZMuMuTool.cxx
index e1d20d66419..aa5c9b17468 100755
--- a/Reconstruction/MissingETPerformance/src/ZMuMuTool.cxx
+++ b/Reconstruction/MissingETPerformance/src/ZMuMuTool.cxx
@@ -5,7 +5,6 @@
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/GaudiException.h"
#include "GaudiKernel/Property.h"
-#include "GaudiKernel/AlgFactory.h"
//#include "CLHEP/Units/PhysicalConstants.h"
#include <vector>
diff --git a/Reconstruction/MissingETPerformance/src/ZeeSequencer.cxx b/Reconstruction/MissingETPerformance/src/ZeeSequencer.cxx
index 880886bcb89..cf7b05790f7 100644
--- a/Reconstruction/MissingETPerformance/src/ZeeSequencer.cxx
+++ b/Reconstruction/MissingETPerformance/src/ZeeSequencer.cxx
@@ -5,7 +5,6 @@
#include "MissingETPerformance/ZeeSequencer.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/AlgFactory.h"
#include "GaudiKernel/IToolSvc.h"
#include "StoreGate/StoreGateSvc.h"
#include "StoreGate/DataHandle.h"
diff --git a/Reconstruction/MissingETPerformance/src/ZeeTool.cxx b/Reconstruction/MissingETPerformance/src/ZeeTool.cxx
index 5fab092976d..6b2212cfb20 100755
--- a/Reconstruction/MissingETPerformance/src/ZeeTool.cxx
+++ b/Reconstruction/MissingETPerformance/src/ZeeTool.cxx
@@ -5,7 +5,6 @@
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/GaudiException.h"
#include "GaudiKernel/Property.h"
-#include "GaudiKernel/AlgFactory.h"
#include "egammaEvent/ElectronContainer.h"
diff --git a/Reconstruction/MuonIdentification/MuonSegmentTaggers/MuonSegmentTaggerTools/src/MuTagAmbiguitySolverTool.cxx b/Reconstruction/MuonIdentification/MuonSegmentTaggers/MuonSegmentTaggerTools/src/MuTagAmbiguitySolverTool.cxx
index efabf0e9570..0a22cc9190a 100644
--- a/Reconstruction/MuonIdentification/MuonSegmentTaggers/MuonSegmentTaggerTools/src/MuTagAmbiguitySolverTool.cxx
+++ b/Reconstruction/MuonIdentification/MuonSegmentTaggers/MuonSegmentTaggerTools/src/MuTagAmbiguitySolverTool.cxx
@@ -5,7 +5,6 @@
#include "MuTagAmbiguitySolverTool.h"
#include "StoreGate/StoreGateSvc.h"
-#include "GaudiKernel/ToolFactory.h"
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/SmartDataPtr.h"
diff --git a/Reconstruction/MuonIdentification/MuonSegmentTaggers/MuonSegmentTaggerTools/src/MuTagMatchingTool.cxx b/Reconstruction/MuonIdentification/MuonSegmentTaggers/MuonSegmentTaggerTools/src/MuTagMatchingTool.cxx
index 30d5e218016..07a4c24cead 100644
--- a/Reconstruction/MuonIdentification/MuonSegmentTaggers/MuonSegmentTaggerTools/src/MuTagMatchingTool.cxx
+++ b/Reconstruction/MuonIdentification/MuonSegmentTaggers/MuonSegmentTaggerTools/src/MuTagMatchingTool.cxx
@@ -7,7 +7,6 @@
#include "MuTagMatchingTool.h"
#include "StoreGate/StoreGateSvc.h"
-#include "GaudiKernel/ToolFactory.h"
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/SmartDataPtr.h"
diff --git a/Reconstruction/RecAthenaPool/src/MissingETCnv.h b/Reconstruction/RecAthenaPool/src/MissingETCnv.h
old mode 100755
new mode 100644
index 4ab7395c0fa..b6b42df01c3
--- a/Reconstruction/RecAthenaPool/src/MissingETCnv.h
+++ b/Reconstruction/RecAthenaPool/src/MissingETCnv.h
@@ -37,7 +37,9 @@ class MissingETCnv: public T_AthenaPoolCustomCnv< MissingET, MissingET_PERS >
/** Create the converter from the service locator
*/
+public:
MissingETCnv(ISvcLocator* svcloc);
+protected:
/** Build the persistent representation from the transient one.
*/
diff --git a/Reconstruction/RecAthenaPool/src/MissingETCompositionCnv.h b/Reconstruction/RecAthenaPool/src/MissingETCompositionCnv.h
index d6ca026ff72..93dc752d581 100644
--- a/Reconstruction/RecAthenaPool/src/MissingETCompositionCnv.h
+++ b/Reconstruction/RecAthenaPool/src/MissingETCompositionCnv.h
@@ -22,12 +22,12 @@ class MissingETCompositionCnv : public MissingETCompositionCnvBase
{
friend class CnvFactory<MissingETCompositionCnv>;
- protected:
-
+ public:
MissingETCompositionCnv (ISvcLocator* svcloc) : MissingETCompositionCnvBase(svcloc)
, m_TPconverter_p2(0)
{ };
+ protected:
virtual ~MissingETCompositionCnv() { delete m_TPconverter_p2; };
virtual MissingETComposition_PERS* createPersistent (MissingETComposition* transObj);
diff --git a/Reconstruction/RecAthenaPool/src/MissingEtCaloCnv.h b/Reconstruction/RecAthenaPool/src/MissingEtCaloCnv.h
old mode 100755
new mode 100644
index a2724e19e1e..e790f2cf563
--- a/Reconstruction/RecAthenaPool/src/MissingEtCaloCnv.h
+++ b/Reconstruction/RecAthenaPool/src/MissingEtCaloCnv.h
@@ -31,7 +31,9 @@ class MissingEtCaloCnv: public T_AthenaPoolCustomCnv< MissingEtCalo, MissingEtCa
/** Create the converter from the service locator
*/
+public:
MissingEtCaloCnv(ISvcLocator* svcloc);
+protected:
/** Build the persistent representation from the transient one.
*/
diff --git a/Reconstruction/RecAthenaPool/src/MissingEtTruthCnv.h b/Reconstruction/RecAthenaPool/src/MissingEtTruthCnv.h
old mode 100755
new mode 100644
index 8c7c64bc8d4..79b9445474a
--- a/Reconstruction/RecAthenaPool/src/MissingEtTruthCnv.h
+++ b/Reconstruction/RecAthenaPool/src/MissingEtTruthCnv.h
@@ -41,7 +41,9 @@ class MissingEtTruthCnv: public T_AthenaPoolCustomCnv<
/** Create the converter from the service locator
*/
+public:
MissingEtTruthCnv(ISvcLocator* svcloc);
+protected:
/** Build the persistent representation from the transient one.
*/
diff --git a/Reconstruction/RecAthenaPool/src/MuonCaloEnergiesCnv.h b/Reconstruction/RecAthenaPool/src/MuonCaloEnergiesCnv.h
index 9fcaacdede3..ee866fa5ddc 100644
--- a/Reconstruction/RecAthenaPool/src/MuonCaloEnergiesCnv.h
+++ b/Reconstruction/RecAthenaPool/src/MuonCaloEnergiesCnv.h
@@ -30,7 +30,9 @@ class MuonCaloEnergiesCnv : public MuonCaloEnergiesCnvBase
friend class CnvFactory<MuonCaloEnergiesCnv>;
protected:
+public:
MuonCaloEnergiesCnv( ISvcLocator *svcloc );
+protected:
virtual StatusCode initialize();
diff --git a/Reconstruction/RecAthenaPool/src/MuonCaloEnergyContainerCnv.h b/Reconstruction/RecAthenaPool/src/MuonCaloEnergyContainerCnv.h
old mode 100755
new mode 100644
index 911ca717e3b..8ce204ad89c
--- a/Reconstruction/RecAthenaPool/src/MuonCaloEnergyContainerCnv.h
+++ b/Reconstruction/RecAthenaPool/src/MuonCaloEnergyContainerCnv.h
@@ -22,7 +22,9 @@ class MuonCaloEnergyContainerCnv: public T_AthenaPoolCustomCnv< MuonCaloEnergyC
protected:
+public:
MuonCaloEnergyContainerCnv(ISvcLocator* svcloc);
+protected:
virtual MuonCaloEnergyContainer_PERS* createPersistent( MuonCaloEnergyContainer* transCont );
diff --git a/Reconstruction/RecAthenaPool/src/MuonContainerCnv.h b/Reconstruction/RecAthenaPool/src/MuonContainerCnv.h
old mode 100755
new mode 100644
index d2fffacaed1..28fdaf32e92
--- a/Reconstruction/RecAthenaPool/src/MuonContainerCnv.h
+++ b/Reconstruction/RecAthenaPool/src/MuonContainerCnv.h
@@ -55,7 +55,9 @@ class MuonContainerCnv: public T_AthenaPoolCustomCnv<
/** Create the converter from the service locator
*/
+public:
MuonContainerCnv(ISvcLocator* svcloc);
+protected:
/** Build the persistent representation from the transient one.
*/
diff --git a/Reconstruction/RecAthenaPool/src/MuonSpShowerContainerCnv.h b/Reconstruction/RecAthenaPool/src/MuonSpShowerContainerCnv.h
index 059af1e6d42..4f2815e0df1 100644
--- a/Reconstruction/RecAthenaPool/src/MuonSpShowerContainerCnv.h
+++ b/Reconstruction/RecAthenaPool/src/MuonSpShowerContainerCnv.h
@@ -32,7 +32,9 @@ class MuonSpShowerContainerCnv :
protected:
/** Create the converter from the service locator*/
+public:
MuonSpShowerContainerCnv(ISvcLocator* svcloc);
+protected:
/** Build the persistent representation from the transient one.*/
virtual MuonSpShowerContainer_PERS*
diff --git a/Reconstruction/RecEventAthenaPool/src/RecoTimingObjCnv.h b/Reconstruction/RecEventAthenaPool/src/RecoTimingObjCnv.h
old mode 100755
new mode 100644
index 6f513d2fef2..f545ed632ce
--- a/Reconstruction/RecEventAthenaPool/src/RecoTimingObjCnv.h
+++ b/Reconstruction/RecEventAthenaPool/src/RecoTimingObjCnv.h
@@ -31,7 +31,9 @@ class RecoTimingObjCnv: public T_AthenaPoolCustomCnv< RecoTimingObj, RecoTimingO
/** Create the converter from the service locator
*/
+public:
RecoTimingObjCnv(ISvcLocator* svcloc);
+protected:
/** Build the persistent representation from the transient one.
*/
diff --git a/Reconstruction/TrackParticleAthenaPool/src/TrackParticleContainerCnv.h b/Reconstruction/TrackParticleAthenaPool/src/TrackParticleContainerCnv.h
index 83253ba468c..50abb13ae6b 100644
--- a/Reconstruction/TrackParticleAthenaPool/src/TrackParticleContainerCnv.h
+++ b/Reconstruction/TrackParticleAthenaPool/src/TrackParticleContainerCnv.h
@@ -43,7 +43,9 @@ class TrackParticleContainerCnv : public TrackParticleContainerCnvBase
protected:
+public:
TrackParticleContainerCnv( ISvcLocator *svcloc );
+protected:
~TrackParticleContainerCnv();
virtual StatusCode initialize();
diff --git a/Reconstruction/TrackParticleTruthAthenaPool/src/TrackParticleTruthCollectionCnv.h b/Reconstruction/TrackParticleTruthAthenaPool/src/TrackParticleTruthCollectionCnv.h
old mode 100755
new mode 100644
index b13ba77ce00..8176190bd99
--- a/Reconstruction/TrackParticleTruthAthenaPool/src/TrackParticleTruthCollectionCnv.h
+++ b/Reconstruction/TrackParticleTruthAthenaPool/src/TrackParticleTruthCollectionCnv.h
@@ -21,7 +21,9 @@ class TrackParticleTruthCollectionCnv : public TrackParticleTruthCollectionCnvBa
{
friend class CnvFactory<TrackParticleTruthCollectionCnv>;
protected:
+public:
TrackParticleTruthCollectionCnv(ISvcLocator* svcloc);
+protected:
virtual TrackParticleTruthCollection* createTransient();
virtual TrackParticleTruthCollectionPERS* createPersistent(TrackParticleTruthCollection*);
private:
diff --git a/Reconstruction/TrackParticleTruthAthenaPool/src/TrackParticleTruthCollectionContainerCnv.h b/Reconstruction/TrackParticleTruthAthenaPool/src/TrackParticleTruthCollectionContainerCnv.h
index a4d9216c82b..a578d67c2cf 100644
--- a/Reconstruction/TrackParticleTruthAthenaPool/src/TrackParticleTruthCollectionContainerCnv.h
+++ b/Reconstruction/TrackParticleTruthAthenaPool/src/TrackParticleTruthCollectionContainerCnv.h
@@ -27,7 +27,9 @@ class TrackParticleTruthCollectionContainerCnv : public TrackParticleTruthCollec
{
friend class CnvFactory<TrackParticleTruthCollectionContainerCnv>;
protected:
+public:
TrackParticleTruthCollectionContainerCnv(ISvcLocator* svcloc);
+protected:
~TrackParticleTruthCollectionContainerCnv();
virtual TrackParticleTruthCollectionContainer* createTransient();
virtual TrackParticleTruthCollectionContainerPERS* createPersistent(TrackParticleTruthCollectionContainer*);
diff --git a/Reconstruction/eflowAthenaPool/src/eflowObjectContainerCnv.h b/Reconstruction/eflowAthenaPool/src/eflowObjectContainerCnv.h
index 953f031747a..ddc822586c7 100644
--- a/Reconstruction/eflowAthenaPool/src/eflowObjectContainerCnv.h
+++ b/Reconstruction/eflowAthenaPool/src/eflowObjectContainerCnv.h
@@ -31,7 +31,9 @@ class eflowObjectContainerCnv: public T_AthenaPoolCustomCnv<eflowObjectContainer
/** Create the converter from the service locator
*/
+public:
eflowObjectContainerCnv(ISvcLocator* svcloc);
+protected:
/** Build the persistent representation from the transient one.
*/
diff --git a/Reconstruction/egamma/egammaAthenaPool/src/CaloRingsContainerCnv.h b/Reconstruction/egamma/egammaAthenaPool/src/CaloRingsContainerCnv.h
old mode 100755
new mode 100644
index 93d92bed075..1705c4792b3
--- a/Reconstruction/egamma/egammaAthenaPool/src/CaloRingsContainerCnv.h
+++ b/Reconstruction/egamma/egammaAthenaPool/src/CaloRingsContainerCnv.h
@@ -45,7 +45,9 @@ class CaloRingsContainerCnv: public T_AthenaPoolCustomCnv<
/** Create the converter from the service locator
*/
+public:
CaloRingsContainerCnv(ISvcLocator* svcloc);
+protected:
/** Build the persistent representation from the transient one.
*/
diff --git a/Reconstruction/egamma/egammaAthenaPool/src/ElectronContainerCnv.h b/Reconstruction/egamma/egammaAthenaPool/src/ElectronContainerCnv.h
old mode 100755
new mode 100644
index fd4eec0cb2f..3d0c720d9f2
--- a/Reconstruction/egamma/egammaAthenaPool/src/ElectronContainerCnv.h
+++ b/Reconstruction/egamma/egammaAthenaPool/src/ElectronContainerCnv.h
@@ -50,7 +50,9 @@ class ElectronContainerCnv: public T_AthenaPoolCustomCnv<
/** Create the converter from the service locator
*/
+public:
ElectronContainerCnv(ISvcLocator* svcloc);
+protected:
/** Build the persistent representation from the transient one.
*/
diff --git a/Reconstruction/egamma/egammaAthenaPool/src/PhotonContainerCnv.h b/Reconstruction/egamma/egammaAthenaPool/src/PhotonContainerCnv.h
old mode 100755
new mode 100644
index 3da66ce04d0..84c59c788f5
--- a/Reconstruction/egamma/egammaAthenaPool/src/PhotonContainerCnv.h
+++ b/Reconstruction/egamma/egammaAthenaPool/src/PhotonContainerCnv.h
@@ -50,7 +50,9 @@ class PhotonContainerCnv: public T_AthenaPoolCustomCnv<
/** Create the converter from the service locator
*/
+public:
PhotonContainerCnv(ISvcLocator* svcloc);
+protected:
/** Build the persistent representation from the transient one.
*/
diff --git a/Reconstruction/egamma/egammaAthenaPool/src/egDetailContainerCnv.h b/Reconstruction/egamma/egammaAthenaPool/src/egDetailContainerCnv.h
index ad0a40387c4..26b9e4c4447 100644
--- a/Reconstruction/egamma/egammaAthenaPool/src/egDetailContainerCnv.h
+++ b/Reconstruction/egamma/egammaAthenaPool/src/egDetailContainerCnv.h
@@ -47,7 +47,9 @@ class egDetailContainerCnv: public T_AthenaPoolCustomCnv<
/** Create the converter from the service locator
*/
+public:
egDetailContainerCnv(ISvcLocator* svcloc);
+protected:
/** Build the persistent representation from the transient one.
*/
diff --git a/Reconstruction/egamma/egammaAthenaPool/src/egammaContainerCnv.h b/Reconstruction/egamma/egammaAthenaPool/src/egammaContainerCnv.h
old mode 100755
new mode 100644
index 8f2a82cf569..40323b94ab0
--- a/Reconstruction/egamma/egammaAthenaPool/src/egammaContainerCnv.h
+++ b/Reconstruction/egamma/egammaAthenaPool/src/egammaContainerCnv.h
@@ -50,7 +50,9 @@ class egammaContainerCnv: public T_AthenaPoolCustomCnv<
/** Create the converter from the service locator
*/
+public:
egammaContainerCnv(ISvcLocator* svcloc);
+protected:
/** Build the persistent representation from the transient one.
*/
diff --git a/Reconstruction/egamma/egammaValidation/src/components/egammaValidation_entries.cxx b/Reconstruction/egamma/egammaValidation/src/components/egammaValidation_entries.cxx
index a47fce75d21..0e1ccb3b12a 100644
--- a/Reconstruction/egamma/egammaValidation/src/components/egammaValidation_entries.cxx
+++ b/Reconstruction/egamma/egammaValidation/src/components/egammaValidation_entries.cxx
@@ -2,8 +2,6 @@
* Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
*/
-#include <GaudiKernel/DeclareFactoryEntries.h>
-
#include "../../egammaValidation/EgammaMonitoring.h"
DECLARE_COMPONENT( EgammaMonitoring )
diff --git a/Reconstruction/tauEventAthenaPool/src/TauDetailsContainerCnv.h b/Reconstruction/tauEventAthenaPool/src/TauDetailsContainerCnv.h
index 149db076588..4f413f6e931 100644
--- a/Reconstruction/tauEventAthenaPool/src/TauDetailsContainerCnv.h
+++ b/Reconstruction/tauEventAthenaPool/src/TauDetailsContainerCnv.h
@@ -25,7 +25,9 @@ class TauDetailsContainerCnv: public T_AthenaPoolCustomCnv<
{
friend class CnvFactory<TauDetailsContainerCnv>;
protected:
+public:
TauDetailsContainerCnv( ISvcLocator* svcloc );
+protected:
virtual TauDetailsContainer_PERS *createPersistent( Analysis :: TauDetailsContainer *transCont );
virtual Analysis :: TauDetailsContainer *createTransient();
};
diff --git a/Reconstruction/tauEventAthenaPool/src/TauJetContainerCnv.h b/Reconstruction/tauEventAthenaPool/src/TauJetContainerCnv.h
index 5e777faf0a1..8b3457fb76c 100644
--- a/Reconstruction/tauEventAthenaPool/src/TauJetContainerCnv.h
+++ b/Reconstruction/tauEventAthenaPool/src/TauJetContainerCnv.h
@@ -29,7 +29,9 @@ class TauJetContainerCnv: public T_AthenaPoolCustomCnv<
{
friend class CnvFactory<TauJetContainerCnv>;
protected:
+public:
TauJetContainerCnv( ISvcLocator* svcloc );
+protected:
virtual TauJetContainer_PERS *createPersistent( Analysis :: TauJetContainer *transCont );
virtual Analysis :: TauJetContainer *createTransient();
};
diff --git a/Simulation/G4SimCnv/G4SimAthenaPOOL/src/TrackRecordCollectionCnv.h b/Simulation/G4SimCnv/G4SimAthenaPOOL/src/TrackRecordCollectionCnv.h
index aa00078056e..8a07e5dc01f 100755
--- a/Simulation/G4SimCnv/G4SimAthenaPOOL/src/TrackRecordCollectionCnv.h
+++ b/Simulation/G4SimCnv/G4SimAthenaPOOL/src/TrackRecordCollectionCnv.h
@@ -16,9 +16,10 @@ typedef TrackRecordCollection_p2 TrackRecordCollection_PERS;
class TrackRecordCollectionCnv : public T_AthenaPoolCustomCnv<TrackRecordCollection, TrackRecordCollection_PERS > {
friend class CnvFactory<TrackRecordCollectionCnv>;
-protected:
+public:
TrackRecordCollectionCnv(ISvcLocator* svcloc) :
T_AthenaPoolCustomCnv<TrackRecordCollection, TrackRecordCollection_PERS >( svcloc) {}
+protected:
TrackRecordCollection_PERS* createPersistent(TrackRecordCollection* transCont);
TrackRecordCollection* createTransient ();
};
diff --git a/Simulation/ISF/ISF_Core/ISF_Services/test/InputConverter_test.cxx b/Simulation/ISF/ISF_Core/ISF_Services/test/InputConverter_test.cxx
index eee4410313a..2affadff16c 100644
--- a/Simulation/ISF/ISF_Core/ISF_Services/test/InputConverter_test.cxx
+++ b/Simulation/ISF/ISF_Core/ISF_Services/test/InputConverter_test.cxx
@@ -15,7 +15,7 @@
// Framework
#include "GaudiKernel/PhysicalConstants.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
+//#include "GaudiKernel/DeclareFactoryEntries.h"
#include "GaudiKernel/Bootstrap.h"
#include "GaudiKernel/IProperty.h"
#include "GaudiKernel/ISvcManager.h"
diff --git a/Simulation/ISF/ISF_Core/ISF_Services/test/TruthSvc_test.cxx b/Simulation/ISF/ISF_Core/ISF_Services/test/TruthSvc_test.cxx
index 4ecd9a4b88a..2648007c85f 100644
--- a/Simulation/ISF/ISF_Core/ISF_Services/test/TruthSvc_test.cxx
+++ b/Simulation/ISF/ISF_Core/ISF_Services/test/TruthSvc_test.cxx
@@ -15,7 +15,6 @@
// Framework
#include "GaudiKernel/PhysicalConstants.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "GaudiKernel/Bootstrap.h"
#include "GaudiKernel/IProperty.h"
#include "GaudiKernel/ISvcManager.h"
@@ -65,7 +64,7 @@ namespace ISFTesting {
MOCK_CONST_METHOD1(pass, bool(ISF::ITruthIncident&));
};
- DECLARE_TOOL_FACTORY( MockTruthStrategy )
+ DECLARE_COMPONENT( MockTruthStrategy )
class DummyTruthIncident : public ISF::ITruthIncident {
public:
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/src/ISF_HitAnalysis.cxx b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/src/ISF_HitAnalysis.cxx
index bca378a1c5d..4c8301cb79b 100755
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/src/ISF_HitAnalysis.cxx
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/src/ISF_HitAnalysis.cxx
@@ -30,7 +30,6 @@
#include "CaloEvent/CaloCellContainer.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/AlgFactory.h"
#include "GaudiKernel/IToolSvc.h"
#include "GaudiKernel/ITHistSvc.h"
diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasEventAthenaPool/src/PlanarClusterContainerCnv.h b/Simulation/ISF/ISF_Fatras/ISF_FatrasEventAthenaPool/src/PlanarClusterContainerCnv.h
index 96d8e25a9fd..a9323392445 100644
--- a/Simulation/ISF/ISF_Fatras/ISF_FatrasEventAthenaPool/src/PlanarClusterContainerCnv.h
+++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasEventAthenaPool/src/PlanarClusterContainerCnv.h
@@ -30,7 +30,9 @@ class PlanarClusterContainerCnv : public PlanarClusterContainerCnvBase
// Thus they can't be local
protected:
+public:
PlanarClusterContainerCnv (ISvcLocator* svcloc);
+protected:
virtual ~PlanarClusterContainerCnv() override;
virtual PlanarClusterContainer_PERS* createPersistent (iFatras::PlanarClusterContainer* transCont) override;
virtual iFatras::PlanarClusterContainer* createTransient () override;
diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasEventTPCnv/src/PlanarClusterContainerCnv_p1.cxx b/Simulation/ISF/ISF_Fatras/ISF_FatrasEventTPCnv/src/PlanarClusterContainerCnv_p1.cxx
index 84756c425ce..369c5f6e595 100644
--- a/Simulation/ISF/ISF_Fatras/ISF_FatrasEventTPCnv/src/PlanarClusterContainerCnv_p1.cxx
+++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasEventTPCnv/src/PlanarClusterContainerCnv_p1.cxx
@@ -17,7 +17,6 @@
// Gaudi
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/Bootstrap.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/Service.h"
#include "GaudiKernel/MsgStream.h"
diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasEventTPCnv/src/PlanarClusterContainerCnv_p2.cxx b/Simulation/ISF/ISF_Fatras/ISF_FatrasEventTPCnv/src/PlanarClusterContainerCnv_p2.cxx
index be85b7c72a3..64ab9a7ffad 100644
--- a/Simulation/ISF/ISF_Fatras/ISF_FatrasEventTPCnv/src/PlanarClusterContainerCnv_p2.cxx
+++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasEventTPCnv/src/PlanarClusterContainerCnv_p2.cxx
@@ -18,7 +18,6 @@
// Gaudi
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/Bootstrap.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/Service.h"
#include "GaudiKernel/MsgStream.h"
diff --git a/TestBeam/TBCnv/TBCnv/TBDataCnv.h b/TestBeam/TBCnv/TBCnv/TBDataCnv.h
index 4adf8f71859..48fe7668afb 100644
--- a/TestBeam/TBCnv/TBCnv/TBDataCnv.h
+++ b/TestBeam/TBCnv/TBCnv/TBDataCnv.h
@@ -19,13 +19,9 @@ extern unsigned char ByteStream_StorageType;
template< class DATATYPE >
class TBDataCnv: public Converter {
- friend class CnvFactory<TBDataCnv>;
-
- protected:
- TBDataCnv(ISvcLocator* svcloc);
-
public:
+ TBDataCnv(ISvcLocator* svcloc);
virtual StatusCode initialize();
virtual StatusCode createObj(IOpaqueAddress* pAddr, DataObject*& pObj);
diff --git a/TestBeam/TBCnv/TBCnv/TBDataCnv.icc b/TestBeam/TBCnv/TBCnv/TBDataCnv.icc
index 86f58aeb060..94ec96e12a9 100644
--- a/TestBeam/TBCnv/TBCnv/TBDataCnv.icc
+++ b/TestBeam/TBCnv/TBCnv/TBDataCnv.icc
@@ -5,7 +5,6 @@
*/
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/CnvFactory.h"
#include <string>
diff --git a/TestBeam/TBCnv/src/ReadTBLArCalibDigits.cxx b/TestBeam/TBCnv/src/ReadTBLArCalibDigits.cxx
index 073eb8cc197..4c95ddc9461 100644
--- a/TestBeam/TBCnv/src/ReadTBLArCalibDigits.cxx
+++ b/TestBeam/TBCnv/src/ReadTBLArCalibDigits.cxx
@@ -4,7 +4,6 @@
#include "TBCnv/ReadTBLArCalibDigits.h"
#include "LArIdentifier/LArOnlineID.h"
-#include "GaudiKernel/AlgFactory.h"
#include <vector>
ReadTBLArCalibDigits::ReadTBLArCalibDigits(const std::string& name, ISvcLocator* pSvcLocator)
diff --git a/TestBeam/TBCnv/src/ReadTBLArDigits.cxx b/TestBeam/TBCnv/src/ReadTBLArDigits.cxx
index fa9ea046662..9629f050281 100644
--- a/TestBeam/TBCnv/src/ReadTBLArDigits.cxx
+++ b/TestBeam/TBCnv/src/ReadTBLArDigits.cxx
@@ -3,7 +3,6 @@
*/
#include "TBCnv/ReadTBLArDigits.h"
-#include "GaudiKernel/AlgFactory.h"
#include "LArRawEvent/LArDigit.h"
#include <vector>
#include "GaudiKernel/IToolSvc.h"
diff --git a/TestBeam/TBCnv/src/TBCheckBCIDs.cxx b/TestBeam/TBCnv/src/TBCheckBCIDs.cxx
index 6e03273ea38..2c20b8a4f83 100644
--- a/TestBeam/TBCnv/src/TBCheckBCIDs.cxx
+++ b/TestBeam/TBCnv/src/TBCheckBCIDs.cxx
@@ -7,7 +7,6 @@
#include "TBCnv/TBCheckBCIDs.h"
-#include "GaudiKernel/ToolFactory.h"
#include "GaudiKernel/MsgStream.h"
#include "ByteStreamData/RawEvent.h"
#include "ByteStreamCnvSvcBase/FullEventAssembler.h"
diff --git a/TestBeam/TBCnv/src/components/TBCnv_entries.cxx b/TestBeam/TBCnv/src/components/TBCnv_entries.cxx
index b9ac61b6b81..c9f8ace5c28 100644
--- a/TestBeam/TBCnv/src/components/TBCnv_entries.cxx
+++ b/TestBeam/TBCnv/src/components/TBCnv_entries.cxx
@@ -28,16 +28,18 @@ typedef TBDataCnv<TBTailCatcherRaw> TBTailCatcherRawCnv;
typedef TBDataCnv<TBEventInfo> TBEventInfoCnv;
DECLARE_COMPONENT( TBByteStreamCnvTool )
-DECLARE_CONVERTER_FACTORY( TBTDCCnv )
-DECLARE_CONVERTER_FACTORY( TBTDCRawContCnv )
-DECLARE_CONVERTER_FACTORY( TBLArDigitContainerCnv )
-DECLARE_CONVERTER_FACTORY( TBLArCalibDigitContainerCnv )
-DECLARE_CONVERTER_FACTORY( TBADCRawContCnv )
-DECLARE_CONVERTER_FACTORY( TBBPCRawContCnv )
-DECLARE_CONVERTER_FACTORY( TBScintillatorRawContCnv )
-DECLARE_CONVERTER_FACTORY( TBTriggerPatternUnitCnv )
-DECLARE_CONVERTER_FACTORY( TBTailCatcherRawCnv )
-DECLARE_CONVERTER_FACTORY( TBEventInfoCnv )
+
+DECLARE_CONVERTER( TBTDCCnv )
+DECLARE_CONVERTER( TBTDCRawContCnv )
+DECLARE_CONVERTER( TBLArDigitContainerCnv )
+DECLARE_CONVERTER( TBLArCalibDigitContainerCnv )
+DECLARE_CONVERTER( TBADCRawContCnv )
+DECLARE_CONVERTER( TBBPCRawContCnv )
+DECLARE_CONVERTER( TBScintillatorRawContCnv )
+DECLARE_CONVERTER( TBTriggerPatternUnitCnv )
+DECLARE_CONVERTER( TBTailCatcherRawCnv )
+DECLARE_CONVERTER( TBEventInfoCnv )
+
DECLARE_COMPONENT( ReadTBLArDigits )
DECLARE_COMPONENT( ReadTBLArCalibDigits )
DECLARE_COMPONENT( TBCheckBCIDs )
diff --git a/TestBeam/TBConditions/TBCaloConditions/src/TBCaloCoolPosTool.cxx b/TestBeam/TBConditions/TBCaloConditions/src/TBCaloCoolPosTool.cxx
index e0daeb7db6d..cb02e03983c 100755
--- a/TestBeam/TBConditions/TBCaloConditions/src/TBCaloCoolPosTool.cxx
+++ b/TestBeam/TBConditions/TBCaloConditions/src/TBCaloCoolPosTool.cxx
@@ -4,7 +4,6 @@
#include "TBCaloCoolPosTool.h"
-#include "GaudiKernel/ToolFactory.h"
// Gaudi includes
#include "GaudiKernel/MsgStream.h"
diff --git a/TestBeam/TBConditions/TBCaloConditions/src/TBCaloPosTool.cxx b/TestBeam/TBConditions/TBCaloConditions/src/TBCaloPosTool.cxx
index c351d5eaaed..343563d4103 100755
--- a/TestBeam/TBConditions/TBCaloConditions/src/TBCaloPosTool.cxx
+++ b/TestBeam/TBConditions/TBCaloConditions/src/TBCaloPosTool.cxx
@@ -4,7 +4,6 @@
#include "TBCaloPosTool.h"
-#include "GaudiKernel/ToolFactory.h"
// Gaudi includes
#include "GaudiKernel/MsgStream.h"
diff --git a/TestBeam/TBConditions/TBCondRunPar/src/TBCondRunParTool.cxx b/TestBeam/TBConditions/TBCondRunPar/src/TBCondRunParTool.cxx
index 5618c5eb14c..91177eafe47 100755
--- a/TestBeam/TBConditions/TBCondRunPar/src/TBCondRunParTool.cxx
+++ b/TestBeam/TBConditions/TBCondRunPar/src/TBCondRunParTool.cxx
@@ -5,7 +5,6 @@
// TBCondRunParTool.cxx
// Richard Hawkings, started 2/7/04
-#include "GaudiKernel/ToolFactory.h"
#include "GaudiKernel/SmartDataPtr.h"
#include "StoreGate/StoreGateSvc.h"
#include "EventInfo/EventID.h"
diff --git a/TestBeam/TBDetDescrCnv/TBDetDescrCnv/TBDetDescrCnv.h b/TestBeam/TBDetDescrCnv/TBDetDescrCnv/TBDetDescrCnv.h
index 881cbb898e2..8730509cc2d 100755
--- a/TestBeam/TBDetDescrCnv/TBDetDescrCnv/TBDetDescrCnv.h
+++ b/TestBeam/TBDetDescrCnv/TBDetDescrCnv/TBDetDescrCnv.h
@@ -23,7 +23,6 @@
class TBDetDescrCnv: public DetDescrConverter {
- friend class CnvFactory<TBDetDescrCnv>;
public:
@@ -36,8 +35,6 @@ public:
static long storageType();
static const CLID& classID();
-protected:
-
TBDetDescrCnv(ISvcLocator* svcloc);
private:
diff --git a/TestBeam/TBDetDescrCnv/src/TBDetDescrCnv.cxx b/TestBeam/TBDetDescrCnv/src/TBDetDescrCnv.cxx
index 712eb5f7c3b..3b256e29471 100755
--- a/TestBeam/TBDetDescrCnv/src/TBDetDescrCnv.cxx
+++ b/TestBeam/TBDetDescrCnv/src/TBDetDescrCnv.cxx
@@ -13,7 +13,6 @@
#include "DetDescrCnvSvc/DetDescrConverter.h"
#include "DetDescrCnvSvc/DetDescrAddress.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/Bootstrap.h"
#include "GaudiKernel/ISvcLocator.h"
#include "StoreGate/StoreGate.h"
diff --git a/TestBeam/TBDetDescrCnv/src/TBDetDescrCnv_entries.cxx b/TestBeam/TBDetDescrCnv/src/TBDetDescrCnv_entries.cxx
index 3e672a92ad2..4c117cc8915 100644
--- a/TestBeam/TBDetDescrCnv/src/TBDetDescrCnv_entries.cxx
+++ b/TestBeam/TBDetDescrCnv/src/TBDetDescrCnv_entries.cxx
@@ -1,4 +1,4 @@
#include "TBDetDescrCnv/TBDetDescrCnv.h"
-DECLARE_CONVERTER_FACTORY( TBDetDescrCnv )
+DECLARE_CONVERTER( TBDetDescrCnv )
diff --git a/TestBeam/TBEventAthenaPool/src/TBADCRawContCnv.h b/TestBeam/TBEventAthenaPool/src/TBADCRawContCnv.h
old mode 100755
new mode 100644
index 36844e27576..4d7b56c55e7
--- a/TestBeam/TBEventAthenaPool/src/TBADCRawContCnv.h
+++ b/TestBeam/TBEventAthenaPool/src/TBADCRawContCnv.h
@@ -23,7 +23,9 @@ typedef T_AthenaPoolCustomCnv<TBADCRawCont, TBADCRawCont_PERS > TBADCRawContC
class TBADCRawContCnv : public TBADCRawContCnvBase {
friend class CnvFactory<TBADCRawContCnv >;
protected:
+public:
TBADCRawContCnv (ISvcLocator* svcloc) : TBADCRawContCnvBase(svcloc) {}
+protected:
virtual TBADCRawCont_PERS* createPersistent (TBADCRawCont* transCont);
virtual TBADCRawCont* createTransient ();
diff --git a/TestBeam/TBEventAthenaPool/src/TBBPCContCnv.h b/TestBeam/TBEventAthenaPool/src/TBBPCContCnv.h
old mode 100755
new mode 100644
index d119c53568c..3dbb1fd733d
--- a/TestBeam/TBEventAthenaPool/src/TBBPCContCnv.h
+++ b/TestBeam/TBEventAthenaPool/src/TBBPCContCnv.h
@@ -23,7 +23,9 @@ typedef T_AthenaPoolCustomCnv<TBBPCCont, TBBPCCont_PERS > TBBPCContCnvBase;
class TBBPCContCnv : public TBBPCContCnvBase {
friend class CnvFactory<TBBPCContCnv >;
protected:
+public:
TBBPCContCnv (ISvcLocator* svcloc) : TBBPCContCnvBase(svcloc) {}
+protected:
virtual TBBPCCont_PERS* createPersistent (TBBPCCont* transCont);
virtual TBBPCCont* createTransient ();
diff --git a/TestBeam/TBEventAthenaPool/src/TBEventInfoCnv.h b/TestBeam/TBEventAthenaPool/src/TBEventInfoCnv.h
old mode 100755
new mode 100644
index cc133747a32..78b125ac69f
--- a/TestBeam/TBEventAthenaPool/src/TBEventInfoCnv.h
+++ b/TestBeam/TBEventAthenaPool/src/TBEventInfoCnv.h
@@ -23,7 +23,9 @@ typedef T_AthenaPoolCustomCnv<TBEventInfo, TBEventInfo_PERS > TBEventInfoCnvB
class TBEventInfoCnv : public TBEventInfoCnvBase {
friend class CnvFactory<TBEventInfoCnv >;
protected:
+public:
TBEventInfoCnv (ISvcLocator* svcloc) : TBEventInfoCnvBase(svcloc) {}
+protected:
virtual TBEventInfo_PERS* createPersistent (TBEventInfo* transCont);
virtual TBEventInfo* createTransient ();
diff --git a/TestBeam/TBEventAthenaPool/src/TBLArDigitContainerCnv.h b/TestBeam/TBEventAthenaPool/src/TBLArDigitContainerCnv.h
old mode 100755
new mode 100644
index 143882965aa..7fab00d1c0a
--- a/TestBeam/TBEventAthenaPool/src/TBLArDigitContainerCnv.h
+++ b/TestBeam/TBEventAthenaPool/src/TBLArDigitContainerCnv.h
@@ -27,7 +27,9 @@ class TBLArDigitContainerCnv : public TBLArDigitContainerCnvBase
{
friend class CnvFactory<TBLArDigitContainerCnv>;
protected:
+public:
TBLArDigitContainerCnv(ISvcLocator*);
+protected:
virtual TBLArDigitContainer* createTransient();
virtual TBLArDigitContainerPERS* createPersistent(TBLArDigitContainer*);
private:
diff --git a/TestBeam/TBEventAthenaPool/src/TBMWPCContCnv.h b/TestBeam/TBEventAthenaPool/src/TBMWPCContCnv.h
old mode 100755
new mode 100644
index 15aa6d91b1c..bc56efa3e94
--- a/TestBeam/TBEventAthenaPool/src/TBMWPCContCnv.h
+++ b/TestBeam/TBEventAthenaPool/src/TBMWPCContCnv.h
@@ -23,7 +23,9 @@ typedef T_AthenaPoolCustomCnv<TBMWPCCont, TBMWPCCont_PERS > TBMWPCContCnvBase
class TBMWPCContCnv : public TBMWPCContCnvBase {
friend class CnvFactory<TBMWPCContCnv >;
protected:
+public:
TBMWPCContCnv (ISvcLocator* svcloc) : TBMWPCContCnvBase(svcloc) {}
+protected:
virtual TBMWPCCont_PERS* createPersistent (TBMWPCCont* transCont);
virtual TBMWPCCont* createTransient ();
diff --git a/TestBeam/TBEventAthenaPool/src/TBPhaseCnv.h b/TestBeam/TBEventAthenaPool/src/TBPhaseCnv.h
old mode 100755
new mode 100644
index c1df6a607a7..dd9d9731583
--- a/TestBeam/TBEventAthenaPool/src/TBPhaseCnv.h
+++ b/TestBeam/TBEventAthenaPool/src/TBPhaseCnv.h
@@ -23,7 +23,9 @@ typedef T_AthenaPoolCustomCnv<TBPhase, TBPhase_PERS > TBPhaseCnvBase;
class TBPhaseCnv : public TBPhaseCnvBase {
friend class CnvFactory<TBPhaseCnv >;
protected:
+public:
TBPhaseCnv (ISvcLocator* svcloc) : TBPhaseCnvBase(svcloc) {}
+protected:
virtual TBPhase_PERS* createPersistent (TBPhase* transCont);
virtual TBPhase* createTransient ();
diff --git a/TestBeam/TBEventAthenaPool/src/TBScintillatorContCnv.h b/TestBeam/TBEventAthenaPool/src/TBScintillatorContCnv.h
old mode 100755
new mode 100644
index 95eebca4004..cc32d70db5f
--- a/TestBeam/TBEventAthenaPool/src/TBScintillatorContCnv.h
+++ b/TestBeam/TBEventAthenaPool/src/TBScintillatorContCnv.h
@@ -23,7 +23,9 @@ typedef T_AthenaPoolCustomCnv<TBScintillatorCont, TBScintillatorCont_PERS > T
class TBScintillatorContCnv : public TBScintillatorContCnvBase {
friend class CnvFactory<TBScintillatorContCnv >;
protected:
+public:
TBScintillatorContCnv (ISvcLocator* svcloc) : TBScintillatorContCnvBase(svcloc) {}
+protected:
virtual TBScintillatorCont_PERS* createPersistent (TBScintillatorCont* transCont);
virtual TBScintillatorCont* createTransient ();
diff --git a/TestBeam/TBEventAthenaPool/src/TBTDCCnv.h b/TestBeam/TBEventAthenaPool/src/TBTDCCnv.h
old mode 100755
new mode 100644
index e2594237941..12332c970ee
--- a/TestBeam/TBEventAthenaPool/src/TBTDCCnv.h
+++ b/TestBeam/TBEventAthenaPool/src/TBTDCCnv.h
@@ -23,7 +23,9 @@ typedef T_AthenaPoolCustomCnv<TBTDC, TBTDC_PERS > TBTDCCnvBase;
class TBTDCCnv : public TBTDCCnvBase {
friend class CnvFactory<TBTDCCnv >;
protected:
+public:
TBTDCCnv (ISvcLocator* svcloc) : TBTDCCnvBase(svcloc) {}
+protected:
virtual TBTDC_PERS* createPersistent (TBTDC* transCont);
virtual TBTDC* createTransient ();
diff --git a/TestBeam/TBEventAthenaPool/src/TBTDCRawContCnv.h b/TestBeam/TBEventAthenaPool/src/TBTDCRawContCnv.h
old mode 100755
new mode 100644
index 75f31a8852a..2c37755255d
--- a/TestBeam/TBEventAthenaPool/src/TBTDCRawContCnv.h
+++ b/TestBeam/TBEventAthenaPool/src/TBTDCRawContCnv.h
@@ -24,7 +24,9 @@ typedef T_AthenaPoolCustomCnv<TBTDCRawCont, TBTDCRawCont_PERS > TBTDCRawContC
class TBTDCRawContCnv : public TBTDCRawContCnvBase {
friend class CnvFactory<TBTDCRawContCnv >;
protected:
+public:
TBTDCRawContCnv (ISvcLocator* svcloc) : TBTDCRawContCnvBase(svcloc) {}
+protected:
virtual TBTDCRawCont_PERS* createPersistent (TBTDCRawCont* transCont);
virtual TBTDCRawCont* createTransient ();
diff --git a/TestBeam/TBEventAthenaPool/src/TBTailCatcherCnv.h b/TestBeam/TBEventAthenaPool/src/TBTailCatcherCnv.h
old mode 100755
new mode 100644
index 5cf2ae37c0e..2ab33182efe
--- a/TestBeam/TBEventAthenaPool/src/TBTailCatcherCnv.h
+++ b/TestBeam/TBEventAthenaPool/src/TBTailCatcherCnv.h
@@ -23,7 +23,9 @@ typedef T_AthenaPoolCustomCnv<TBTailCatcher, TBTailCatcher_PERS > TBTailCatch
class TBTailCatcherCnv : public TBTailCatcherCnvBase {
friend class CnvFactory<TBTailCatcherCnv >;
protected:
+public:
TBTailCatcherCnv (ISvcLocator* svcloc) : TBTailCatcherCnvBase(svcloc) {}
+protected:
virtual TBTailCatcher_PERS* createPersistent (TBTailCatcher* transCont);
virtual TBTailCatcher* createTransient ();
diff --git a/TestBeam/TBEventAthenaPool/src/TBTrackCnv.h b/TestBeam/TBEventAthenaPool/src/TBTrackCnv.h
old mode 100755
new mode 100644
index 055ca8f0edc..80cd6a657f6
--- a/TestBeam/TBEventAthenaPool/src/TBTrackCnv.h
+++ b/TestBeam/TBEventAthenaPool/src/TBTrackCnv.h
@@ -23,7 +23,9 @@ typedef T_AthenaPoolCustomCnv<TBTrack, TBTrack_PERS > TBTrackCnvBase;
class TBTrackCnv : public TBTrackCnvBase {
friend class CnvFactory<TBTrackCnv >;
protected:
+public:
TBTrackCnv (ISvcLocator* svcloc) : TBTrackCnvBase(svcloc) {}
+protected:
virtual TBTrack_PERS* createPersistent (TBTrack* transCont);
virtual TBTrack* createTransient ();
diff --git a/TestBeam/TBEventAthenaPool/src/TBTrackInfoCnv.h b/TestBeam/TBEventAthenaPool/src/TBTrackInfoCnv.h
old mode 100755
new mode 100644
index 89ba5be48c4..f4040473f29
--- a/TestBeam/TBEventAthenaPool/src/TBTrackInfoCnv.h
+++ b/TestBeam/TBEventAthenaPool/src/TBTrackInfoCnv.h
@@ -23,7 +23,9 @@ typedef T_AthenaPoolCustomCnv<TBTrackInfo, TBTrackInfo_PERS > TBTrackInfoCnvB
class TBTrackInfoCnv : public TBTrackInfoCnvBase {
friend class CnvFactory<TBTrackInfoCnv >;
protected:
+public:
TBTrackInfoCnv (ISvcLocator* svcloc) : TBTrackInfoCnvBase(svcloc) {}
+protected:
virtual TBTrackInfo_PERS* createPersistent (TBTrackInfo* transCont);
virtual TBTrackInfo* createTransient ();
diff --git a/TestBeam/TBEventAthenaPool/src/TBTriggerPatternUnitCnv.h b/TestBeam/TBEventAthenaPool/src/TBTriggerPatternUnitCnv.h
old mode 100755
new mode 100644
index a593480753c..ffd16961f1f
--- a/TestBeam/TBEventAthenaPool/src/TBTriggerPatternUnitCnv.h
+++ b/TestBeam/TBEventAthenaPool/src/TBTriggerPatternUnitCnv.h
@@ -23,7 +23,9 @@ typedef T_AthenaPoolCustomCnv<TBTriggerPatternUnit, TBTriggerPatternUnit_PERS >
class TBTriggerPatternUnitCnv : public TBTriggerPatternUnitCnvBase {
friend class CnvFactory<TBTriggerPatternUnitCnv >;
protected:
+public:
TBTriggerPatternUnitCnv (ISvcLocator* svcloc) : TBTriggerPatternUnitCnvBase(svcloc) {}
+protected:
virtual TBTriggerPatternUnit_PERS* createPersistent (TBTriggerPatternUnit* transCont);
virtual TBTriggerPatternUnit* createTransient ();
diff --git a/TestBeam/TBRec/src/CBNTAA_BeamInstrumentation.cxx b/TestBeam/TBRec/src/CBNTAA_BeamInstrumentation.cxx
index f614ed02d32..9442df20423 100755
--- a/TestBeam/TBRec/src/CBNTAA_BeamInstrumentation.cxx
+++ b/TestBeam/TBRec/src/CBNTAA_BeamInstrumentation.cxx
@@ -4,7 +4,6 @@
#include "TBRec/CBNTAA_BeamInstrumentation.h"
#include "StoreGate/StoreGateSvc.h"
-#include "GaudiKernel/AlgFactory.h"
#include "GaudiKernel/IToolSvc.h"
#include "GaudiKernel/INTupleSvc.h"
diff --git a/TestBeam/TBRec/src/CBNTAA_TBADCRaw.cxx b/TestBeam/TBRec/src/CBNTAA_TBADCRaw.cxx
index 67c2b45bf5a..9f222c13379 100755
--- a/TestBeam/TBRec/src/CBNTAA_TBADCRaw.cxx
+++ b/TestBeam/TBRec/src/CBNTAA_TBADCRaw.cxx
@@ -4,7 +4,6 @@
#include "TBRec/CBNTAA_TBADCRaw.h"
#include "StoreGate/StoreGateSvc.h"
-#include "GaudiKernel/AlgFactory.h"
#include "GaudiKernel/IToolSvc.h"
#include "GaudiKernel/INTupleSvc.h"
#include "GaudiKernel/MsgStream.h"
diff --git a/TestBeam/TBRec/src/CBNTAA_TBScint.cxx b/TestBeam/TBRec/src/CBNTAA_TBScint.cxx
index 76c51cf0cf7..bd7cf6c8560 100644
--- a/TestBeam/TBRec/src/CBNTAA_TBScint.cxx
+++ b/TestBeam/TBRec/src/CBNTAA_TBScint.cxx
@@ -4,7 +4,6 @@
#include "TBRec/CBNTAA_TBScint.h"
#include "StoreGate/StoreGateSvc.h"
-#include "GaudiKernel/AlgFactory.h"
#include "GaudiKernel/IToolSvc.h"
#include "GaudiKernel/INTupleSvc.h"
diff --git a/TestBeam/TBRec/src/CBNTAA_TBTDCRaw.cxx b/TestBeam/TBRec/src/CBNTAA_TBTDCRaw.cxx
index 45382ce4dcb..2bd9a1c9722 100755
--- a/TestBeam/TBRec/src/CBNTAA_TBTDCRaw.cxx
+++ b/TestBeam/TBRec/src/CBNTAA_TBTDCRaw.cxx
@@ -4,7 +4,6 @@
#include "TBRec/CBNTAA_TBTDCRaw.h"
#include "StoreGate/StoreGateSvc.h"
-#include "GaudiKernel/AlgFactory.h"
#include "GaudiKernel/IToolSvc.h"
#include "GaudiKernel/INTupleSvc.h"
diff --git a/TestBeam/TBRec/src/CBNTAA_TBTPValidation.cxx b/TestBeam/TBRec/src/CBNTAA_TBTPValidation.cxx
index 68ce3e38a95..ccc5cc79375 100755
--- a/TestBeam/TBRec/src/CBNTAA_TBTPValidation.cxx
+++ b/TestBeam/TBRec/src/CBNTAA_TBTPValidation.cxx
@@ -4,7 +4,6 @@
#include "TBRec/CBNTAA_TBTPValidation.h"
#include "StoreGate/StoreGateSvc.h"
-#include "GaudiKernel/AlgFactory.h"
#include "GaudiKernel/IToolSvc.h"
#include "GaudiKernel/INTupleSvc.h"
diff --git a/TestBeam/TBRec/src/CBNTAA_TBTrack.cxx b/TestBeam/TBRec/src/CBNTAA_TBTrack.cxx
index 294e707cc86..a4a623f1a64 100644
--- a/TestBeam/TBRec/src/CBNTAA_TBTrack.cxx
+++ b/TestBeam/TBRec/src/CBNTAA_TBTrack.cxx
@@ -4,7 +4,6 @@
#include "TBRec/CBNTAA_TBTrack.h"
#include "StoreGate/StoreGateSvc.h"
-#include "GaudiKernel/AlgFactory.h"
#include "GaudiKernel/IToolSvc.h"
#include "GaudiKernel/INTupleSvc.h"
diff --git a/TestBeam/TBRec/src/CBNT_BeamInstrumentation.cxx b/TestBeam/TBRec/src/CBNT_BeamInstrumentation.cxx
index 38f91ebcdb9..eeb0646b0ca 100755
--- a/TestBeam/TBRec/src/CBNT_BeamInstrumentation.cxx
+++ b/TestBeam/TBRec/src/CBNT_BeamInstrumentation.cxx
@@ -4,7 +4,6 @@
#include "TBRec/CBNT_BeamInstrumentation.h"
#include "StoreGate/StoreGateSvc.h"
-#include "GaudiKernel/AlgFactory.h"
#include "GaudiKernel/IToolSvc.h"
#include "GaudiKernel/INTupleSvc.h"
diff --git a/TestBeam/TBRec/src/CBNT_Timing.cxx b/TestBeam/TBRec/src/CBNT_Timing.cxx
index 5bc28afc706..52480759fef 100755
--- a/TestBeam/TBRec/src/CBNT_Timing.cxx
+++ b/TestBeam/TBRec/src/CBNT_Timing.cxx
@@ -6,7 +6,6 @@
#include "CLHEP/Units/SystemOfUnits.h"
#include "StoreGate/StoreGateSvc.h"
-#include "GaudiKernel/AlgFactory.h"
#include "GaudiKernel/NTuple.h"
#include "CaloEvent/CaloCell.h"
diff --git a/TestBeam/TBRec/src/TBBPCRec.cxx b/TestBeam/TBRec/src/TBBPCRec.cxx
index 08a90e1706d..0afe4bd65ff 100755
--- a/TestBeam/TBRec/src/TBBPCRec.cxx
+++ b/TestBeam/TBRec/src/TBBPCRec.cxx
@@ -18,7 +18,6 @@
#include "TBRec/TBBPCRec.h"
-//#include "GaudiKernel/AlgFactory.h"
// static const AlgFactory<TBBPCRec> s_factory;
// const IAlgFactory& TBBPCRecFactory = s_factory;
diff --git a/TestBeam/TBRec/src/TBBeamQualityMC.cxx b/TestBeam/TBRec/src/TBBeamQualityMC.cxx
index a1c881e635a..52479b4c250 100644
--- a/TestBeam/TBRec/src/TBBeamQualityMC.cxx
+++ b/TestBeam/TBRec/src/TBBeamQualityMC.cxx
@@ -4,7 +4,6 @@
#include "TBRec/TBBeamQualityMC.h"
#include "StoreGate/StoreGateSvc.h"
-#include "GaudiKernel/AlgFactory.h"
#include "TBEvent/TBEventInfo.h"
#include "TBEvent/TBTrack.h"
diff --git a/TestBeam/TBRec/src/TBMWPCRec.cxx b/TestBeam/TBRec/src/TBMWPCRec.cxx
index 7e804278320..2303357e103 100755
--- a/TestBeam/TBRec/src/TBMWPCRec.cxx
+++ b/TestBeam/TBRec/src/TBMWPCRec.cxx
@@ -9,7 +9,6 @@
#include "TBRec/TBMWPCRec.h"
-//#include "GaudiKernel/AlgFactory.h"
// static const AlgFactory<TBMWPCRec> s_factory;
// const IAlgFactory& TBMWPCRecFactory = s_factory;
diff --git a/TestBeam/TBRec/src/TBScintillatorRec.cxx b/TestBeam/TBRec/src/TBScintillatorRec.cxx
index 4eabbc1e48b..e2e904f1776 100755
--- a/TestBeam/TBRec/src/TBScintillatorRec.cxx
+++ b/TestBeam/TBRec/src/TBScintillatorRec.cxx
@@ -12,7 +12,6 @@
#include "TBEvent/TBScintillatorCont.h"
#include "TBEvent/TBScintillatorRawCont.h"
-//#include "GaudiKernel/AlgFactory.h"
// static const AlgFactory<TBScintillatorRec> s_factory;
// const IAlgFactory& TBScintillatorRecFactory = s_factory;
diff --git a/TestBeam/TBRec/src/TBTailCatcherRec.cxx b/TestBeam/TBRec/src/TBTailCatcherRec.cxx
index 65af1a3355b..262566a7185 100755
--- a/TestBeam/TBRec/src/TBTailCatcherRec.cxx
+++ b/TestBeam/TBRec/src/TBTailCatcherRec.cxx
@@ -9,7 +9,6 @@
#include "TBRec/TBTailCatcherRec.h"
-//#include "GaudiKernel/AlgFactory.h"
// static const AlgFactory<TBObjectRecoAlgo> s_factory;
// const IAlgFactory& TBObjectRecoAlgoFactory = s_factory;
diff --git a/TestBeam/TBRec/src/TBTrackToCaloAlg.cxx b/TestBeam/TBRec/src/TBTrackToCaloAlg.cxx
index b0f1dbafcb5..718fafc3422 100755
--- a/TestBeam/TBRec/src/TBTrackToCaloAlg.cxx
+++ b/TestBeam/TBRec/src/TBTrackToCaloAlg.cxx
@@ -12,7 +12,6 @@
// Gaudi includes
#include "StoreGate/StoreGate.h"
-#include "GaudiKernel/AlgFactory.h"
#include "StoreGate/StoreGateSvc.h"
#include "GaudiKernel/IToolSvc.h"
diff --git a/TestPolicy/include/ctest_athena_service.h b/TestPolicy/include/ctest_athena_service.h
index 2ac7414c4c2..e2458aad9c3 100755
--- a/TestPolicy/include/ctest_athena_service.h
+++ b/TestPolicy/include/ctest_athena_service.h
@@ -57,7 +57,6 @@ int service_initialize(const Service* psvc) {
#include <stdlib.h>
#include "GaudiKernel/IInterface.h"
#include "GaudiKernel/Service.h"
-#include "GaudiKernel/SvcFactory.h"
#include "GaudiKernel/SmartIF.h"
#include "GaudiKernel/Bootstrap.h"
#include "GaudiKernel/IAppMgrUI.h"
diff --git a/TileCalorimeter/TileConditions/test/TileCablingService_common_test.cxx b/TileCalorimeter/TileConditions/test/TileCablingService_common_test.cxx
index c11e30b880a..4b3eebd43ad 100644
--- a/TileCalorimeter/TileConditions/test/TileCablingService_common_test.cxx
+++ b/TileCalorimeter/TileConditions/test/TileCablingService_common_test.cxx
@@ -19,7 +19,7 @@
#include "StoreGate/StoreGateSvc.h"
-// #include "GaudiKernel/DeclareFactoryEntries.h"
+// //#include "GaudiKernel/DeclareFactoryEntries.h"
#include <algorithm>
#include <cassert>
diff --git a/TileCalorimeter/TileConditions/test/TileCondToolDspThreshold_test.cxx b/TileCalorimeter/TileConditions/test/TileCondToolDspThreshold_test.cxx
index befb1f53cd7..6614897453d 100644
--- a/TileCalorimeter/TileConditions/test/TileCondToolDspThreshold_test.cxx
+++ b/TileCalorimeter/TileConditions/test/TileCondToolDspThreshold_test.cxx
@@ -22,7 +22,7 @@
#include "AthenaBaseComps/AthAlgorithm.h"
#include "AthenaBaseComps/AthAlgTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
+//#include "GaudiKernel/DeclareFactoryEntries.h"
#include <algorithm>
#include <cassert>
diff --git a/TileCalorimeter/TileConditions/test/TileCondToolOfcCool_test.cxx b/TileCalorimeter/TileConditions/test/TileCondToolOfcCool_test.cxx
index 07df9d94568..7581ff27400 100644
--- a/TileCalorimeter/TileConditions/test/TileCondToolOfcCool_test.cxx
+++ b/TileCalorimeter/TileConditions/test/TileCondToolOfcCool_test.cxx
@@ -22,7 +22,7 @@
#include "AthenaBaseComps/AthAlgorithm.h"
#include "AthenaBaseComps/AthAlgTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
+//#include "GaudiKernel/DeclareFactoryEntries.h"
#include <algorithm>
#include <cassert>
diff --git a/TileCalorimeter/TileConditions/test/TileCondToolTMDB_test.cxx b/TileCalorimeter/TileConditions/test/TileCondToolTMDB_test.cxx
index bb502a0844f..d0f4cd61567 100644
--- a/TileCalorimeter/TileConditions/test/TileCondToolTMDB_test.cxx
+++ b/TileCalorimeter/TileConditions/test/TileCondToolTMDB_test.cxx
@@ -22,7 +22,7 @@
#include "AthenaBaseComps/AthAlgorithm.h"
#include "AthenaBaseComps/AthAlgTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
+//#include "GaudiKernel/DeclareFactoryEntries.h"
#include <algorithm>
#include <cassert>
diff --git a/TileCalorimeter/TileRecAlgs/test/TileDigitsThresholdFilter_test.cxx b/TileCalorimeter/TileRecAlgs/test/TileDigitsThresholdFilter_test.cxx
index b55350afa73..3f79a1dcf60 100644
--- a/TileCalorimeter/TileRecAlgs/test/TileDigitsThresholdFilter_test.cxx
+++ b/TileCalorimeter/TileRecAlgs/test/TileDigitsThresholdFilter_test.cxx
@@ -23,7 +23,7 @@
// ATLAS C++
#include "CxxUtils/make_unique.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
+//#include "GaudiKernel/DeclareFactoryEntries.h"
#include <algorithm>
#include <cassert>
diff --git a/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileBeamElemContByteStreamCnv.h b/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileBeamElemContByteStreamCnv.h
index 80f37414801..58af7381c25 100644
--- a/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileBeamElemContByteStreamCnv.h
+++ b/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileBeamElemContByteStreamCnv.h
@@ -46,12 +46,8 @@ class TileBeamElemContByteStreamCnv
: public Converter
, public ::AthMessaging
{
- friend class CnvFactory<TileBeamElemContByteStreamCnv>;
-
- protected:
- TileBeamElemContByteStreamCnv(ISvcLocator* svcloc);
-
public:
+ TileBeamElemContByteStreamCnv(ISvcLocator* svcloc);
virtual StatusCode initialize();
virtual StatusCode createObj(IOpaqueAddress* pAddr, DataObject*& pObj);
diff --git a/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileDigitsContByteStreamCnv.h b/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileDigitsContByteStreamCnv.h
index afba67ba864..45ca45e804b 100644
--- a/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileDigitsContByteStreamCnv.h
+++ b/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileDigitsContByteStreamCnv.h
@@ -52,12 +52,9 @@ class TileDigitsContByteStreamCnv
, public IIncidentListener
, public ::AthMessaging
{
- friend class CnvFactory<TileDigitsContByteStreamCnv>;
-
- protected:
- TileDigitsContByteStreamCnv(ISvcLocator* svcloc);
public:
+ TileDigitsContByteStreamCnv(ISvcLocator* svcloc);
typedef TileDigitsContByteStreamTool BYTESTREAMTOOL;
diff --git a/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileL2ContByteStreamCnv.h b/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileL2ContByteStreamCnv.h
index 7b77545d873..9d8d73c6418 100644
--- a/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileL2ContByteStreamCnv.h
+++ b/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileL2ContByteStreamCnv.h
@@ -47,12 +47,8 @@ class TileL2ContByteStreamCnv
, public IIncidentListener
, public ::AthMessaging
{
- friend class CnvFactory<TileL2ContByteStreamCnv>;
-
- protected:
- TileL2ContByteStreamCnv(ISvcLocator* svcloc);
-
public:
+ TileL2ContByteStreamCnv(ISvcLocator* svcloc);
typedef TileL2ContByteStreamTool BYTESTREAMTOOL ;
diff --git a/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileLaserObjByteStreamCnv.h b/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileLaserObjByteStreamCnv.h
index 484d859622c..d2f644151fd 100644
--- a/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileLaserObjByteStreamCnv.h
+++ b/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileLaserObjByteStreamCnv.h
@@ -42,13 +42,8 @@ class TileLaserObjByteStreamCnv
: public Converter
, public ::AthMessaging
{
-
- friend class CnvFactory<TileLaserObjByteStreamCnv>;
-
- protected:
- TileLaserObjByteStreamCnv(ISvcLocator* svcloc);
-
public:
+ TileLaserObjByteStreamCnv(ISvcLocator* svcloc);
typedef TileLaserObjByteStreamTool BYTESTREAMTOOL ;
diff --git a/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileMuRcvContByteStreamCnv.h b/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileMuRcvContByteStreamCnv.h
index 8502822d3b4..090c2eae596 100644
--- a/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileMuRcvContByteStreamCnv.h
+++ b/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileMuRcvContByteStreamCnv.h
@@ -45,12 +45,8 @@ class TileMuRcvContByteStreamCnv
, public IIncidentListener
, public ::AthMessaging
{
- friend class CnvFactory<TileMuRcvContByteStreamCnv>;
-
- protected:
- TileMuRcvContByteStreamCnv(ISvcLocator* svcloc);
-
public:
+ TileMuRcvContByteStreamCnv(ISvcLocator* svcloc);
typedef TileMuRcvContByteStreamTool BYTESTREAMTOOL ;
diff --git a/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileRawChannelContByteStreamCnv.h b/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileRawChannelContByteStreamCnv.h
index 10e56a6c293..c6ca4f49d6a 100644
--- a/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileRawChannelContByteStreamCnv.h
+++ b/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileRawChannelContByteStreamCnv.h
@@ -47,13 +47,8 @@ class TileRawChannelContByteStreamCnv
, public IIncidentListener
, public ::AthMessaging
{
-
- friend class CnvFactory<TileRawChannelContByteStreamCnv>;
-
- protected:
- TileRawChannelContByteStreamCnv(ISvcLocator* svcloc);
-
public:
+ TileRawChannelContByteStreamCnv(ISvcLocator* svcloc);
typedef TileRawChannelContByteStreamTool BYTESTREAMTOOL ;
diff --git a/TileCalorimeter/TileSvc/TileByteStream/src/TileBeamElemContByteStreamCnv.cxx b/TileCalorimeter/TileSvc/TileByteStream/src/TileBeamElemContByteStreamCnv.cxx
index 2fed9828a71..188b54f7c2b 100644
--- a/TileCalorimeter/TileSvc/TileByteStream/src/TileBeamElemContByteStreamCnv.cxx
+++ b/TileCalorimeter/TileSvc/TileByteStream/src/TileBeamElemContByteStreamCnv.cxx
@@ -3,7 +3,6 @@
*/
// Gaudi includes
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IRegistry.h"
diff --git a/TileCalorimeter/TileSvc/TileByteStream/src/TileDigitsContByteStreamCnv.cxx b/TileCalorimeter/TileSvc/TileByteStream/src/TileDigitsContByteStreamCnv.cxx
index 563b68b3c85..05c9d6c5fcc 100644
--- a/TileCalorimeter/TileSvc/TileByteStream/src/TileDigitsContByteStreamCnv.cxx
+++ b/TileCalorimeter/TileSvc/TileByteStream/src/TileDigitsContByteStreamCnv.cxx
@@ -4,7 +4,6 @@
// Gaudi includes
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IRegistry.h"
diff --git a/TileCalorimeter/TileSvc/TileByteStream/src/TileDigitsContByteStreamTool.cxx b/TileCalorimeter/TileSvc/TileByteStream/src/TileDigitsContByteStreamTool.cxx
index 977396f1e1f..964dee7f41a 100644
--- a/TileCalorimeter/TileSvc/TileByteStream/src/TileDigitsContByteStreamTool.cxx
+++ b/TileCalorimeter/TileSvc/TileByteStream/src/TileDigitsContByteStreamTool.cxx
@@ -3,7 +3,6 @@
*/
// Gaudi includes
-#include "GaudiKernel/ToolFactory.h"
// Atlas includes
#include "AthenaKernel/errorcheck.h"
diff --git a/TileCalorimeter/TileSvc/TileByteStream/src/TileL2ContByteStreamCnv.cxx b/TileCalorimeter/TileSvc/TileByteStream/src/TileL2ContByteStreamCnv.cxx
index 52cf290aeed..562cf24d2ad 100644
--- a/TileCalorimeter/TileSvc/TileByteStream/src/TileL2ContByteStreamCnv.cxx
+++ b/TileCalorimeter/TileSvc/TileByteStream/src/TileL2ContByteStreamCnv.cxx
@@ -4,7 +4,6 @@
// Gaudi includes
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IRegistry.h"
diff --git a/TileCalorimeter/TileSvc/TileByteStream/src/TileL2ContByteStreamTool.cxx b/TileCalorimeter/TileSvc/TileByteStream/src/TileL2ContByteStreamTool.cxx
index 2a1ae8764b7..bba979193c5 100644
--- a/TileCalorimeter/TileSvc/TileByteStream/src/TileL2ContByteStreamTool.cxx
+++ b/TileCalorimeter/TileSvc/TileByteStream/src/TileL2ContByteStreamTool.cxx
@@ -17,7 +17,6 @@
//****************************************************************************
// Gaudi includes
-#include "GaudiKernel/ToolFactory.h"
// Atlas includes
#include "AthenaKernel/errorcheck.h"
diff --git a/TileCalorimeter/TileSvc/TileByteStream/src/TileLaserObjByteStreamCnv.cxx b/TileCalorimeter/TileSvc/TileByteStream/src/TileLaserObjByteStreamCnv.cxx
index 7743d5ca30c..1db0338c2e0 100644
--- a/TileCalorimeter/TileSvc/TileByteStream/src/TileLaserObjByteStreamCnv.cxx
+++ b/TileCalorimeter/TileSvc/TileByteStream/src/TileLaserObjByteStreamCnv.cxx
@@ -7,7 +7,6 @@
//date February 2008
// Gaudi includes
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IRegistry.h"
diff --git a/TileCalorimeter/TileSvc/TileByteStream/src/TileLaserObjByteStreamTool.cxx b/TileCalorimeter/TileSvc/TileByteStream/src/TileLaserObjByteStreamTool.cxx
index fed4c6801c5..a9b05beafc7 100644
--- a/TileCalorimeter/TileSvc/TileByteStream/src/TileLaserObjByteStreamTool.cxx
+++ b/TileCalorimeter/TileSvc/TileByteStream/src/TileLaserObjByteStreamTool.cxx
@@ -7,7 +7,6 @@
//date February 2008
// Gaudi includes
-#include "GaudiKernel/ToolFactory.h"
// Atlas includes
#include "AthenaKernel/errorcheck.h"
diff --git a/TileCalorimeter/TileSvc/TileByteStream/src/TileMuRcvContByteStreamCnv.cxx b/TileCalorimeter/TileSvc/TileByteStream/src/TileMuRcvContByteStreamCnv.cxx
index 0d9f6befdf8..b3a8c5ad0e3 100644
--- a/TileCalorimeter/TileSvc/TileByteStream/src/TileMuRcvContByteStreamCnv.cxx
+++ b/TileCalorimeter/TileSvc/TileByteStream/src/TileMuRcvContByteStreamCnv.cxx
@@ -4,7 +4,6 @@
// Gaudi includes
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IRegistry.h"
diff --git a/TileCalorimeter/TileSvc/TileByteStream/src/TileMuRcvContByteStreamTool.cxx b/TileCalorimeter/TileSvc/TileByteStream/src/TileMuRcvContByteStreamTool.cxx
index 7322bc94a2e..cf1c653261f 100644
--- a/TileCalorimeter/TileSvc/TileByteStream/src/TileMuRcvContByteStreamTool.cxx
+++ b/TileCalorimeter/TileSvc/TileByteStream/src/TileMuRcvContByteStreamTool.cxx
@@ -17,7 +17,6 @@
//****************************************************************************
// Gaudi includes
-#include "GaudiKernel/ToolFactory.h"
// Atlas includes
#include "AthenaKernel/errorcheck.h"
diff --git a/TileCalorimeter/TileSvc/TileByteStream/src/TileRawChannelContByteStreamCnv.cxx b/TileCalorimeter/TileSvc/TileByteStream/src/TileRawChannelContByteStreamCnv.cxx
index 48b32f62990..4fc0fdd5c64 100644
--- a/TileCalorimeter/TileSvc/TileByteStream/src/TileRawChannelContByteStreamCnv.cxx
+++ b/TileCalorimeter/TileSvc/TileByteStream/src/TileRawChannelContByteStreamCnv.cxx
@@ -4,7 +4,6 @@
// Gaudi includes
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IRegistry.h"
diff --git a/TileCalorimeter/TileSvc/TileByteStream/src/components/TileByteStream_entries.cxx b/TileCalorimeter/TileSvc/TileByteStream/src/components/TileByteStream_entries.cxx
index 65b2a7ccb69..bdd2633a039 100644
--- a/TileCalorimeter/TileSvc/TileByteStream/src/components/TileByteStream_entries.cxx
+++ b/TileCalorimeter/TileSvc/TileByteStream/src/components/TileByteStream_entries.cxx
@@ -18,10 +18,10 @@ DECLARE_COMPONENT( TileL2ContByteStreamTool )
DECLARE_COMPONENT( TileLaserObjByteStreamTool )
DECLARE_COMPONENT( TileMuRcvContByteStreamTool )
DECLARE_COMPONENT( TileROD_Decoder )
-DECLARE_CONVERTER_FACTORY( TileRawChannelContByteStreamCnv )
-DECLARE_CONVERTER_FACTORY( TileBeamElemContByteStreamCnv )
-DECLARE_CONVERTER_FACTORY( TileDigitsContByteStreamCnv )
-DECLARE_CONVERTER_FACTORY( TileL2ContByteStreamCnv )
-DECLARE_CONVERTER_FACTORY( TileLaserObjByteStreamCnv )
-DECLARE_CONVERTER_FACTORY( TileMuRcvContByteStreamCnv )
+DECLARE_CONVERTER( TileRawChannelContByteStreamCnv )
+DECLARE_CONVERTER( TileBeamElemContByteStreamCnv )
+DECLARE_CONVERTER( TileDigitsContByteStreamCnv )
+DECLARE_CONVERTER( TileL2ContByteStreamCnv )
+DECLARE_CONVERTER( TileLaserObjByteStreamCnv )
+DECLARE_CONVERTER( TileMuRcvContByteStreamCnv )
diff --git a/TileCalorimeter/TileSvc/TileEventAthenaPool/src/TileBeamElemContainerCnv.h b/TileCalorimeter/TileSvc/TileEventAthenaPool/src/TileBeamElemContainerCnv.h
index 4d265c3ade1..1dcbc6e3549 100755
--- a/TileCalorimeter/TileSvc/TileEventAthenaPool/src/TileBeamElemContainerCnv.h
+++ b/TileCalorimeter/TileSvc/TileEventAthenaPool/src/TileBeamElemContainerCnv.h
@@ -13,9 +13,10 @@ typedef TileBeamElemContainer_p1 TileBeamElemContainer_PERS;
class TileBeamElemContainerCnv : public T_AthenaPoolCustomCnv<TileBeamElemContainer, TileBeamElemContainer_PERS > {
friend class CnvFactory<TileBeamElemContainerCnv>;
-protected:
+public:
TileBeamElemContainerCnv(ISvcLocator* svcloc) :
T_AthenaPoolCustomCnv<TileBeamElemContainer, TileBeamElemContainer_PERS >( svcloc) {}
+protected:
TileBeamElemContainer_PERS* createPersistent(TileBeamElemContainer* transCont);
TileBeamElemContainer* createTransient ();
};
diff --git a/TileCalorimeter/TileSvc/TileEventAthenaPool/src/TileCellContainerCnv.cxx b/TileCalorimeter/TileSvc/TileEventAthenaPool/src/TileCellContainerCnv.cxx
index b6758800abb..7068179cbb4 100755
--- a/TileCalorimeter/TileSvc/TileEventAthenaPool/src/TileCellContainerCnv.cxx
+++ b/TileCalorimeter/TileSvc/TileEventAthenaPool/src/TileCellContainerCnv.cxx
@@ -6,7 +6,6 @@
#include "CaloIdentifier/TileTBID.h"
#include "CaloDetDescr/MbtsDetDescrManager.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/IIncidentSvc.h"
diff --git a/TileCalorimeter/TileSvc/TileEventAthenaPool/src/TileCosmicMuonContainerCnv.h b/TileCalorimeter/TileSvc/TileEventAthenaPool/src/TileCosmicMuonContainerCnv.h
index 8a7d1491996..f7267321505 100644
--- a/TileCalorimeter/TileSvc/TileEventAthenaPool/src/TileCosmicMuonContainerCnv.h
+++ b/TileCalorimeter/TileSvc/TileEventAthenaPool/src/TileCosmicMuonContainerCnv.h
@@ -39,7 +39,9 @@ class TileCosmicMuonContainerCnv: public T_AthenaPoolCustomCnv<
/** Create the converter from the service locator
*/
+public:
TileCosmicMuonContainerCnv(ISvcLocator* svcloc);
+protected:
/** Build the persistent representation from the transient one.
*/
diff --git a/TileCalorimeter/TileSvc/TileEventAthenaPool/src/TileDigitsContainerCnv.h b/TileCalorimeter/TileSvc/TileEventAthenaPool/src/TileDigitsContainerCnv.h
index e99e763fe3e..37fd7435e37 100755
--- a/TileCalorimeter/TileSvc/TileEventAthenaPool/src/TileDigitsContainerCnv.h
+++ b/TileCalorimeter/TileSvc/TileEventAthenaPool/src/TileDigitsContainerCnv.h
@@ -13,9 +13,10 @@ typedef TileDigitsContainer_p1 TileDigitsContainer_PERS;
class TileDigitsContainerCnv : public T_AthenaPoolCustomCnv<TileDigitsContainer, TileDigitsContainer_PERS > {
friend class CnvFactory<TileDigitsContainerCnv>;
-protected:
+public:
TileDigitsContainerCnv(ISvcLocator* svcloc) :
T_AthenaPoolCustomCnv<TileDigitsContainer, TileDigitsContainer_PERS >( svcloc) {}
+protected:
TileDigitsContainer_PERS* createPersistent(TileDigitsContainer* transCont);
TileDigitsContainer* createTransient ();
};
diff --git a/TileCalorimeter/TileSvc/TileEventAthenaPool/src/TileHitContainerCnv.h b/TileCalorimeter/TileSvc/TileEventAthenaPool/src/TileHitContainerCnv.h
index aa2a6f26828..6f83dd2d74a 100755
--- a/TileCalorimeter/TileSvc/TileEventAthenaPool/src/TileHitContainerCnv.h
+++ b/TileCalorimeter/TileSvc/TileEventAthenaPool/src/TileHitContainerCnv.h
@@ -13,9 +13,10 @@ typedef TileHitContainer_p1 TileHitContainer_PERS;
class TileHitContainerCnv : public T_AthenaPoolCustomCnv<TileHitContainer, TileHitContainer_PERS > {
friend class CnvFactory<TileHitContainerCnv>;
-protected:
+public:
TileHitContainerCnv(ISvcLocator* svcloc) :
T_AthenaPoolCustomCnv<TileHitContainer, TileHitContainer_PERS >( svcloc) {}
+protected:
TileHitContainer_PERS* createPersistent(TileHitContainer* transCont);
TileHitContainer* createTransient ();
};
diff --git a/TileCalorimeter/TileSvc/TileEventAthenaPool/src/TileL2ContainerCnv.h b/TileCalorimeter/TileSvc/TileEventAthenaPool/src/TileL2ContainerCnv.h
old mode 100755
new mode 100644
index 812ea17cd30..8a5276338ef
--- a/TileCalorimeter/TileSvc/TileEventAthenaPool/src/TileL2ContainerCnv.h
+++ b/TileCalorimeter/TileSvc/TileEventAthenaPool/src/TileL2ContainerCnv.h
@@ -38,7 +38,9 @@ class TileL2ContainerCnv: public T_AthenaPoolCustomCnv<
/** Create the converter from the service locator
*/
+public:
TileL2ContainerCnv(ISvcLocator* svcloc);
+protected:
/** Build the persistent representation from the transient one.
*/
diff --git a/TileCalorimeter/TileSvc/TileEventAthenaPool/src/TileMuContainerCnv.h b/TileCalorimeter/TileSvc/TileEventAthenaPool/src/TileMuContainerCnv.h
old mode 100755
new mode 100644
index 718cb504557..9aceed30c49
--- a/TileCalorimeter/TileSvc/TileEventAthenaPool/src/TileMuContainerCnv.h
+++ b/TileCalorimeter/TileSvc/TileEventAthenaPool/src/TileMuContainerCnv.h
@@ -37,7 +37,9 @@ class TileMuContainerCnv: public T_AthenaPoolCustomCnv<
/** Create the converter from the service locator
*/
+public:
TileMuContainerCnv(ISvcLocator* svcloc);
+protected:
/** Build the persistent representation from the transient one.
*/
diff --git a/TileCalorimeter/TileSvc/TileEventAthenaPool/src/TileMuonReceiverContainerCnv.h b/TileCalorimeter/TileSvc/TileEventAthenaPool/src/TileMuonReceiverContainerCnv.h
old mode 100755
new mode 100644
index c788daf4257..bf7a8bb5e6b
--- a/TileCalorimeter/TileSvc/TileEventAthenaPool/src/TileMuonReceiverContainerCnv.h
+++ b/TileCalorimeter/TileSvc/TileEventAthenaPool/src/TileMuonReceiverContainerCnv.h
@@ -36,7 +36,9 @@ class TileMuonReceiverContainerCnv: public T_AthenaPoolCustomCnv<
/** Create the converter from the service locator
*/
+public:
TileMuonReceiverContainerCnv(ISvcLocator* svcloc);
+protected:
/** Build the persistent representation from the transient one.
*/
diff --git a/TileCalorimeter/TileSvc/TileEventAthenaPool/src/TileRawChannelContainerCnv.h b/TileCalorimeter/TileSvc/TileEventAthenaPool/src/TileRawChannelContainerCnv.h
index da8a21f4288..6f075c9bcca 100755
--- a/TileCalorimeter/TileSvc/TileEventAthenaPool/src/TileRawChannelContainerCnv.h
+++ b/TileCalorimeter/TileSvc/TileEventAthenaPool/src/TileRawChannelContainerCnv.h
@@ -13,9 +13,10 @@ typedef TileRawChannelContainer_p1 TileRawChannelContainer_PERS;
class TileRawChannelContainerCnv : public T_AthenaPoolCustomCnv<TileRawChannelContainer, TileRawChannelContainer_PERS > {
friend class CnvFactory<TileRawChannelContainerCnv>;
-protected:
+public:
TileRawChannelContainerCnv(ISvcLocator* svcloc) :
T_AthenaPoolCustomCnv<TileRawChannelContainer, TileRawChannelContainer_PERS >( svcloc) {}
+protected:
TileRawChannelContainer_PERS* createPersistent(TileRawChannelContainer* transCont);
TileRawChannelContainer* createTransient ();
};
diff --git a/TileCalorimeter/TileSvc/TileEventAthenaPool/src/TileTTL1ContainerCnv.h b/TileCalorimeter/TileSvc/TileEventAthenaPool/src/TileTTL1ContainerCnv.h
old mode 100755
new mode 100644
index 1d158669473..9f5b23670a4
--- a/TileCalorimeter/TileSvc/TileEventAthenaPool/src/TileTTL1ContainerCnv.h
+++ b/TileCalorimeter/TileSvc/TileEventAthenaPool/src/TileTTL1ContainerCnv.h
@@ -37,7 +37,9 @@ class TileTTL1ContainerCnv: public T_AthenaPoolCustomCnv<
/** Create the converter from the service locator
*/
+public:
TileTTL1ContainerCnv(ISvcLocator* svcloc);
+protected:
/** Build the persistent representation from the transient one.
*/
diff --git a/TileCalorimeter/TileSvc/TileIdCnv/TileIdCnv/TileHWIDDetDescrCnv.h b/TileCalorimeter/TileSvc/TileIdCnv/TileIdCnv/TileHWIDDetDescrCnv.h
index bcb66bf49a7..daaa9f53c77 100755
--- a/TileCalorimeter/TileSvc/TileIdCnv/TileIdCnv/TileHWIDDetDescrCnv.h
+++ b/TileCalorimeter/TileSvc/TileIdCnv/TileIdCnv/TileHWIDDetDescrCnv.h
@@ -32,7 +32,6 @@
**/
class TileHWIDDetDescrCnv: public DetDescrConverter {
- friend class CnvFactory<TileHWIDDetDescrCnv>;
public:
virtual StatusCode initialize();
@@ -44,7 +43,6 @@ public:
static long storageType();
static const CLID& classID();
-protected:
TileHWIDDetDescrCnv(ISvcLocator* svcloc);
};
diff --git a/TileCalorimeter/TileSvc/TileIdCnv/src/TileHWIDDetDescrCnv.cxx b/TileCalorimeter/TileSvc/TileIdCnv/src/TileHWIDDetDescrCnv.cxx
index c5b97b36446..eaa715aa984 100755
--- a/TileCalorimeter/TileSvc/TileIdCnv/src/TileHWIDDetDescrCnv.cxx
+++ b/TileCalorimeter/TileSvc/TileIdCnv/src/TileHWIDDetDescrCnv.cxx
@@ -17,7 +17,6 @@
#include "DetDescrCnvSvc/DetDescrConverter.h"
#include "DetDescrCnvSvc/DetDescrAddress.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/CnvFactory.h"
#include "StoreGate/StoreGate.h"
#include "IdDictDetDescr/IdDictManager.h"
diff --git a/TileCalorimeter/TileSvc/TileIdCnv/src/TileIdCnv_entries.cxx b/TileCalorimeter/TileSvc/TileIdCnv/src/TileIdCnv_entries.cxx
index 7320794e2bd..389bb34a942 100644
--- a/TileCalorimeter/TileSvc/TileIdCnv/src/TileIdCnv_entries.cxx
+++ b/TileCalorimeter/TileSvc/TileIdCnv/src/TileIdCnv_entries.cxx
@@ -1,4 +1,4 @@
#include "TileIdCnv/TileHWIDDetDescrCnv.h"
-DECLARE_CONVERTER_FACTORY( TileHWIDDetDescrCnv )
+DECLARE_CONVERTER( TileHWIDDetDescrCnv )
diff --git a/TileCalorimeter/TileSvc/TileSimEventAthenaPool/src/TileHitVectorCnv.h b/TileCalorimeter/TileSvc/TileSimEventAthenaPool/src/TileHitVectorCnv.h
old mode 100755
new mode 100644
index 41b4e9775e4..1dc960641a3
--- a/TileCalorimeter/TileSvc/TileSimEventAthenaPool/src/TileHitVectorCnv.h
+++ b/TileCalorimeter/TileSvc/TileSimEventAthenaPool/src/TileHitVectorCnv.h
@@ -19,7 +19,9 @@ class TileHitVectorCnv : public T_AthenaPoolCustomCnv<TileHitVector, TileHitVec
friend class CnvFactory<TileHitVectorCnv>;
protected:
+public:
TileHitVectorCnv(ISvcLocator* svcloc): T_AthenaPoolCustomCnv<TileHitVector, TileHitVector_PERS >( svcloc) {}
+protected:
TileHitVector_PERS* createPersistent(TileHitVector* transCont);
TileHitVector* createTransient ();
diff --git a/Tracking/TrkDetDescr/TrkDetDescrAthenaPool/src/ElementTableCnv.h b/Tracking/TrkDetDescr/TrkDetDescrAthenaPool/src/ElementTableCnv.h
index a59ef928e7c..2a04196573b 100644
--- a/Tracking/TrkDetDescr/TrkDetDescrAthenaPool/src/ElementTableCnv.h
+++ b/Tracking/TrkDetDescr/TrkDetDescrAthenaPool/src/ElementTableCnv.h
@@ -33,7 +33,9 @@ class ElementTableCnv : public ElementTableCnvBase {
protected:
+public:
ElementTableCnv( ISvcLocator *svcloc );
+protected:
~ElementTableCnv();
virtual StatusCode initialize();
diff --git a/Tracking/TrkDetDescr/TrkDetDescrAthenaPool/src/LayerMaterialMapCnv.h b/Tracking/TrkDetDescr/TrkDetDescrAthenaPool/src/LayerMaterialMapCnv.h
index abf7b889625..f6dcbac32f3 100644
--- a/Tracking/TrkDetDescr/TrkDetDescrAthenaPool/src/LayerMaterialMapCnv.h
+++ b/Tracking/TrkDetDescr/TrkDetDescrAthenaPool/src/LayerMaterialMapCnv.h
@@ -34,7 +34,9 @@ class LayerMaterialMapCnv : public LayerMaterialMapCnvBase
friend class CnvFactory<LayerMaterialMapCnv>;
protected:
+public:
LayerMaterialMapCnv( ISvcLocator *svcloc );
+protected:
~LayerMaterialMapCnv();
virtual StatusCode initialize();
diff --git a/Tracking/TrkDetDescr/TrkDetDescrAthenaPool/src/MaterialStepCollectionCnv.h b/Tracking/TrkDetDescr/TrkDetDescrAthenaPool/src/MaterialStepCollectionCnv.h
index c6727d12532..5d4f88e11be 100644
--- a/Tracking/TrkDetDescr/TrkDetDescrAthenaPool/src/MaterialStepCollectionCnv.h
+++ b/Tracking/TrkDetDescr/TrkDetDescrAthenaPool/src/MaterialStepCollectionCnv.h
@@ -33,7 +33,9 @@ class MaterialStepCollectionCnv : public MaterialStepCollectionCnvBase {
protected:
+public:
MaterialStepCollectionCnv( ISvcLocator *svcloc );
+protected:
~MaterialStepCollectionCnv();
virtual StatusCode initialize();
diff --git a/Tracking/TrkEventCnv/TrkEventAthenaPool/src/MVFVxContainerCnv.h b/Tracking/TrkEventCnv/TrkEventAthenaPool/src/MVFVxContainerCnv.h
old mode 100755
new mode 100644
index 5fccd38b757..6d72d3dcaab
--- a/Tracking/TrkEventCnv/TrkEventAthenaPool/src/MVFVxContainerCnv.h
+++ b/Tracking/TrkEventCnv/TrkEventAthenaPool/src/MVFVxContainerCnv.h
@@ -41,7 +41,9 @@ class MVFVxContainerCnv : public MVFVxContainerCnvBase
protected:
+public:
MVFVxContainerCnv( ISvcLocator *svcloc );
+protected:
~MVFVxContainerCnv();
diff --git a/Tracking/TrkEventCnv/TrkEventAthenaPool/src/SegmentCollectionCnv.h b/Tracking/TrkEventCnv/TrkEventAthenaPool/src/SegmentCollectionCnv.h
index 96fa3a15c25..ac7ff052d92 100755
--- a/Tracking/TrkEventCnv/TrkEventAthenaPool/src/SegmentCollectionCnv.h
+++ b/Tracking/TrkEventCnv/TrkEventAthenaPool/src/SegmentCollectionCnv.h
@@ -43,8 +43,10 @@ class SegmentCollectionCnv
{
friend class CnvFactory<SegmentCollectionCnv>;
-protected:
+public:
SegmentCollectionCnv( ISvcLocator *svcloc );
+
+protected:
~SegmentCollectionCnv();
virtual StatusCode initialize();
diff --git a/Tracking/TrkEventCnv/TrkEventAthenaPool/src/TrackCollectionCnv.h b/Tracking/TrkEventCnv/TrkEventAthenaPool/src/TrackCollectionCnv.h
index fbfa1aee224..2bfc26e0e03 100755
--- a/Tracking/TrkEventCnv/TrkEventAthenaPool/src/TrackCollectionCnv.h
+++ b/Tracking/TrkEventCnv/TrkEventAthenaPool/src/TrackCollectionCnv.h
@@ -49,8 +49,10 @@ class TrackCollectionCnv
{
friend class CnvFactory<TrackCollectionCnv>;
-protected:
+public:
TrackCollectionCnv( ISvcLocator *svcloc );
+
+protected:
~TrackCollectionCnv();
virtual StatusCode initialize();
diff --git a/Tracking/TrkEventCnv/TrkEventAthenaPool/src/V0ContainerCnv.h b/Tracking/TrkEventCnv/TrkEventAthenaPool/src/V0ContainerCnv.h
old mode 100755
new mode 100644
index 412283e32a9..452562dc774
--- a/Tracking/TrkEventCnv/TrkEventAthenaPool/src/V0ContainerCnv.h
+++ b/Tracking/TrkEventCnv/TrkEventAthenaPool/src/V0ContainerCnv.h
@@ -46,7 +46,9 @@ class V0ContainerCnv : public V0ContainerCnvBase
protected:
+public:
V0ContainerCnv( ISvcLocator *svcloc );
+protected:
~V0ContainerCnv();
virtual StatusCode initialize();
diff --git a/Tracking/TrkEventCnv/TrkEventAthenaPool/src/VxContainerCnv.h b/Tracking/TrkEventCnv/TrkEventAthenaPool/src/VxContainerCnv.h
old mode 100755
new mode 100644
index 1de05ff6c5a..e4995daf51d
--- a/Tracking/TrkEventCnv/TrkEventAthenaPool/src/VxContainerCnv.h
+++ b/Tracking/TrkEventCnv/TrkEventAthenaPool/src/VxContainerCnv.h
@@ -40,7 +40,9 @@ class VxContainerCnv : public VxContainerCnvBase, public AthenaPoolCnvTPExtensio
protected:
+public:
VxContainerCnv( ISvcLocator *svcloc );
+protected:
~VxContainerCnv();
virtual StatusCode initialize();
diff --git a/Tracking/TrkEventCnv/TrkJiveXML/src/TrackRetriever.cxx b/Tracking/TrkEventCnv/TrkJiveXML/src/TrackRetriever.cxx
index 5a82333a7a0..11e2d09e7ee 100644
--- a/Tracking/TrkEventCnv/TrkJiveXML/src/TrackRetriever.cxx
+++ b/Tracking/TrkEventCnv/TrkJiveXML/src/TrackRetriever.cxx
@@ -3,7 +3,6 @@
*/
#include "TrkJiveXML/TrackRetriever.h"
-#include "GaudiKernel/ToolFactory.h"
#include "GaudiKernel/IToolSvc.h"
#include "GaudiKernel/ListItem.h"
diff --git a/Tracking/TrkEventCnv/TrkTruthAthenaPool/src/DetailedTrackTruthCollectionCnv.h b/Tracking/TrkEventCnv/TrkTruthAthenaPool/src/DetailedTrackTruthCollectionCnv.h
old mode 100755
new mode 100644
index e2dbd67cbe8..c8da50fd698
--- a/Tracking/TrkEventCnv/TrkTruthAthenaPool/src/DetailedTrackTruthCollectionCnv.h
+++ b/Tracking/TrkEventCnv/TrkTruthAthenaPool/src/DetailedTrackTruthCollectionCnv.h
@@ -23,7 +23,9 @@ class DetailedTrackTruthCollectionCnv : public DetailedTrackTruthCollectionCnvBa
{
friend class CnvFactory<DetailedTrackTruthCollectionCnv>;
protected:
+public:
DetailedTrackTruthCollectionCnv(ISvcLocator* svcloc);
+protected:
virtual DetailedTrackTruthCollection* createTransient();
virtual DetailedTrackTruthCollectionPERS* createPersistent(DetailedTrackTruthCollection*);
private:
diff --git a/Tracking/TrkEventCnv/TrkTruthAthenaPool/src/PRD_MultiTruthCollectionCnv.h b/Tracking/TrkEventCnv/TrkTruthAthenaPool/src/PRD_MultiTruthCollectionCnv.h
old mode 100755
new mode 100644
index 34692f2c2c7..15dfd020fef
--- a/Tracking/TrkEventCnv/TrkTruthAthenaPool/src/PRD_MultiTruthCollectionCnv.h
+++ b/Tracking/TrkEventCnv/TrkTruthAthenaPool/src/PRD_MultiTruthCollectionCnv.h
@@ -23,7 +23,9 @@ class PRD_MultiTruthCollectionCnv : public PRD_MultiTruthCollectionCnvBase
{
friend class CnvFactory<PRD_MultiTruthCollectionCnv>;
protected:
+public:
PRD_MultiTruthCollectionCnv(ISvcLocator*);
+protected:
virtual PRD_MultiTruthCollection* createTransient();
virtual PRD_MultiTruthCollectionPERS* createPersistent(PRD_MultiTruthCollection*);
private:
diff --git a/Tracking/TrkEventCnv/TrkTruthAthenaPool/src/TrackTruthCollectionCnv.h b/Tracking/TrkEventCnv/TrkTruthAthenaPool/src/TrackTruthCollectionCnv.h
old mode 100755
new mode 100644
index bd10f0262cb..d64e43427a8
--- a/Tracking/TrkEventCnv/TrkTruthAthenaPool/src/TrackTruthCollectionCnv.h
+++ b/Tracking/TrkEventCnv/TrkTruthAthenaPool/src/TrackTruthCollectionCnv.h
@@ -25,7 +25,9 @@ class TrackTruthCollectionCnv : public TrackTruthCollectionCnvBase
{
friend class CnvFactory<TrackTruthCollectionCnv>;
protected:
+public:
TrackTruthCollectionCnv(ISvcLocator* svcloc);
+protected:
virtual TrackTruthCollection* createTransient();
virtual TrackTruthCollectionPERS* createPersistent(TrackTruthCollection*);
private:
diff --git a/Tracking/TrkFitter/TrkDeterministicAnnealingFilter/src/DeterministicAnnealingFilter.cxx b/Tracking/TrkFitter/TrkDeterministicAnnealingFilter/src/DeterministicAnnealingFilter.cxx
index 7437282e03a..e4d6ba23c0a 100755
--- a/Tracking/TrkFitter/TrkDeterministicAnnealingFilter/src/DeterministicAnnealingFilter.cxx
+++ b/Tracking/TrkFitter/TrkDeterministicAnnealingFilter/src/DeterministicAnnealingFilter.cxx
@@ -13,7 +13,6 @@
#include "TrkDeterministicAnnealingFilter/DeterministicAnnealingFilter.h"
-//#include "GaudiKernel/ToolFactory.h"
//#include "GaudiKernel/ListItem.h"
#include "GaudiKernel/MsgStream.h"
diff --git a/Tracking/TrkFitter/TrkGaussianSumFilter/src/GaussianSumFitter.cxx b/Tracking/TrkFitter/TrkGaussianSumFilter/src/GaussianSumFitter.cxx
index a4db9676d1f..0bebf8563fe 100644
--- a/Tracking/TrkFitter/TrkGaussianSumFilter/src/GaussianSumFitter.cxx
+++ b/Tracking/TrkFitter/TrkGaussianSumFilter/src/GaussianSumFitter.cxx
@@ -38,7 +38,6 @@ decription : Implementation code for Gaussian Sum Fitter class
#include "TrkCaloCluster_OnTrack/CaloCluster_OnTrack.h"
#include "GaudiKernel/Chrono.h"
-#include "GaudiKernel/ToolFactory.h"
#include <vector>
diff --git a/Tracking/TrkVertexFitter/TrkV0Fitter/src/TrkV0VertexFitter.cxx b/Tracking/TrkVertexFitter/TrkV0Fitter/src/TrkV0VertexFitter.cxx
index e35fd3bd9da..b8735c40741 100755
--- a/Tracking/TrkVertexFitter/TrkV0Fitter/src/TrkV0VertexFitter.cxx
+++ b/Tracking/TrkVertexFitter/TrkV0Fitter/src/TrkV0VertexFitter.cxx
@@ -7,7 +7,6 @@
***************************************************************************/
#include "TrkV0Fitter/TrkV0VertexFitter.h"
#include "VxVertex/VxTrackAtVertex.h"
-#include "GaudiKernel/ToolFactory.h"
#include "TrkSurfaces/PerigeeSurface.h"
#include "TrkSurfaces/CylinderSurface.h"
#include "TrkExInterfaces/IExtrapolator.h"
diff --git a/Tracking/TrkVertexFitter/TrkVertexBilloirTools/src/FastVertexFitter.cxx b/Tracking/TrkVertexFitter/TrkVertexBilloirTools/src/FastVertexFitter.cxx
index 17fb14660a2..c2ea75afd96 100755
--- a/Tracking/TrkVertexFitter/TrkVertexBilloirTools/src/FastVertexFitter.cxx
+++ b/Tracking/TrkVertexFitter/TrkVertexBilloirTools/src/FastVertexFitter.cxx
@@ -8,7 +8,6 @@
#include "TrkVertexBilloirTools/FastVertexFitter.h"
#include "VxVertex/VxTrackAtVertex.h"
#include "VxVertex/LinearizedTrack.h"
-#include "GaudiKernel/ToolFactory.h"
#include "TrkSurfaces/PerigeeSurface.h"
#include "TrkExInterfaces/IExtrapolator.h"
#include "TrkDetDescrUtils/GeometryStatics.h"
diff --git a/Tracking/TrkVertexFitter/TrkVertexBilloirTools/src/FullVertexFitter.cxx b/Tracking/TrkVertexFitter/TrkVertexBilloirTools/src/FullVertexFitter.cxx
index 1932ca1faa3..c2f368de44a 100755
--- a/Tracking/TrkVertexFitter/TrkVertexBilloirTools/src/FullVertexFitter.cxx
+++ b/Tracking/TrkVertexFitter/TrkVertexBilloirTools/src/FullVertexFitter.cxx
@@ -8,7 +8,6 @@
#include "TrkVertexBilloirTools/FullVertexFitter.h"
#include "VxVertex/VxTrackAtVertex.h"
#include "VxVertex/LinearizedTrack.h"
-#include "GaudiKernel/ToolFactory.h"
#include "TrkSurfaces/PerigeeSurface.h"
#include "TrkExInterfaces/IExtrapolator.h"
#include "TrkDetDescrUtils/GeometryStatics.h"
diff --git a/Trigger/TrigAlgorithms/TrigHLTJetRec/src/IParticleSelectorAll.cxx b/Trigger/TrigAlgorithms/TrigHLTJetRec/src/IParticleSelectorAll.cxx
index 8af7705bfcd..d3b0393202f 100644
--- a/Trigger/TrigAlgorithms/TrigHLTJetRec/src/IParticleSelectorAll.cxx
+++ b/Trigger/TrigAlgorithms/TrigHLTJetRec/src/IParticleSelectorAll.cxx
@@ -3,7 +3,6 @@
*/
#include "GaudiKernel/StatusCode.h"
-#include "GaudiKernel/ToolFactory.h"
#include "TrigHLTJetRec/IParticleSelectorAll.h"
IParticleSelectorAll::IParticleSelectorAll(const std::string& s,
diff --git a/Trigger/TrigAlgorithms/TrigHLTJetRec/src/IParticleSelectorEtaPt.cxx b/Trigger/TrigAlgorithms/TrigHLTJetRec/src/IParticleSelectorEtaPt.cxx
index eb64bc6faef..a07e1ee1a73 100644
--- a/Trigger/TrigAlgorithms/TrigHLTJetRec/src/IParticleSelectorEtaPt.cxx
+++ b/Trigger/TrigAlgorithms/TrigHLTJetRec/src/IParticleSelectorEtaPt.cxx
@@ -5,7 +5,6 @@
#include <iostream>
#include <cmath>
#include "GaudiKernel/StatusCode.h"
-#include "GaudiKernel/ToolFactory.h"
#include "TrigHLTJetRec/IParticleSelectorEtaPt.h"
#include "xAODBase/IParticle.h"
diff --git a/Trigger/TrigAlgorithms/TrigHLTJetRec/src/PseudoJetSelectorAll.cxx b/Trigger/TrigAlgorithms/TrigHLTJetRec/src/PseudoJetSelectorAll.cxx
index 7acd42e850f..ed277565954 100644
--- a/Trigger/TrigAlgorithms/TrigHLTJetRec/src/PseudoJetSelectorAll.cxx
+++ b/Trigger/TrigAlgorithms/TrigHLTJetRec/src/PseudoJetSelectorAll.cxx
@@ -3,7 +3,6 @@
*/
#include "GaudiKernel/StatusCode.h"
-#include "GaudiKernel/ToolFactory.h"
#include "TrigHLTJetRec/PseudoJetSelectorAll.h"
using jet::PseudoJetVector;
diff --git a/Trigger/TrigAlgorithms/TrigHLTJetRec/src/PseudoJetSelectorEtaPt.cxx b/Trigger/TrigAlgorithms/TrigHLTJetRec/src/PseudoJetSelectorEtaPt.cxx
index 384cb63fca2..255020efea4 100644
--- a/Trigger/TrigAlgorithms/TrigHLTJetRec/src/PseudoJetSelectorEtaPt.cxx
+++ b/Trigger/TrigAlgorithms/TrigHLTJetRec/src/PseudoJetSelectorEtaPt.cxx
@@ -3,7 +3,6 @@
*/
#include "GaudiKernel/StatusCode.h"
-#include "GaudiKernel/ToolFactory.h"
#include "TrigHLTJetRec/PseudoJetSelectorEtaPt.h"
using jet::PseudoJetVector;
diff --git a/Trigger/TrigAlgorithms/TrigHLTJetRec/src/TriggerPseudoJetGetter.cxx b/Trigger/TrigAlgorithms/TrigHLTJetRec/src/TriggerPseudoJetGetter.cxx
index 34d2e75c77d..0dedacd28b6 100644
--- a/Trigger/TrigAlgorithms/TrigHLTJetRec/src/TriggerPseudoJetGetter.cxx
+++ b/Trigger/TrigAlgorithms/TrigHLTJetRec/src/TriggerPseudoJetGetter.cxx
@@ -11,10 +11,7 @@
//
// ********************************************************************
#include "GaudiKernel/StatusCode.h"
-#include "GaudiKernel/ToolFactory.h"
#include "TrigHLTJetRec/TriggerPseudoJetGetter.h"
-// #include "GaudiKernel/ToolFactory.h"
-// #include "GaudiKernel/IToolFactory.h"
TriggerPseudoJetGetter::TriggerPseudoJetGetter(const std::string& name)
:AsgTool(name), m_primed(false), m_label(""), m_pseudoJetVector(nullptr){
diff --git a/Trigger/TrigAlgorithms/TrigL2MuonSA/src/CscDataPreparator.cxx b/Trigger/TrigAlgorithms/TrigL2MuonSA/src/CscDataPreparator.cxx
index 2ec492f9f56..9006a3db14d 100644
--- a/Trigger/TrigAlgorithms/TrigL2MuonSA/src/CscDataPreparator.cxx
+++ b/Trigger/TrigAlgorithms/TrigL2MuonSA/src/CscDataPreparator.cxx
@@ -4,7 +4,6 @@
#include "TrigL2MuonSA/CscDataPreparator.h"
-#include "GaudiKernel/ToolFactory.h"
#include "StoreGate/StoreGateSvc.h"
#include "StoreGate/ActiveStoreSvc.h"
diff --git a/Trigger/TrigAlgorithms/TrigL2MuonSA/src/MdtDataPreparator.cxx b/Trigger/TrigAlgorithms/TrigL2MuonSA/src/MdtDataPreparator.cxx
index a606f2a1cdb..8c8e7991e62 100644
--- a/Trigger/TrigAlgorithms/TrigL2MuonSA/src/MdtDataPreparator.cxx
+++ b/Trigger/TrigAlgorithms/TrigL2MuonSA/src/MdtDataPreparator.cxx
@@ -4,7 +4,6 @@
#include "TrigL2MuonSA/MdtDataPreparator.h"
-#include "GaudiKernel/ToolFactory.h"
#include "StoreGate/StoreGateSvc.h"
#include "MuonRDO/MdtCsmContainer.h"
diff --git a/Trigger/TrigAlgorithms/TrigL2MuonSA/src/MuCalStreamerTool.cxx b/Trigger/TrigAlgorithms/TrigL2MuonSA/src/MuCalStreamerTool.cxx
index 3a19a0f1862..7e7fa73bfda 100644
--- a/Trigger/TrigAlgorithms/TrigL2MuonSA/src/MuCalStreamerTool.cxx
+++ b/Trigger/TrigAlgorithms/TrigL2MuonSA/src/MuCalStreamerTool.cxx
@@ -4,7 +4,6 @@
#include "TrigL2MuonSA/MuCalStreamerTool.h"
-#include "GaudiKernel/ToolFactory.h"
#include "StoreGate/StoreGateSvc.h"
#include "CLHEP/Units/PhysicalConstants.h"
diff --git a/Trigger/TrigAlgorithms/TrigL2MuonSA/src/MuFastDataPreparator.cxx b/Trigger/TrigAlgorithms/TrigL2MuonSA/src/MuFastDataPreparator.cxx
index 2987883fab8..bb0b18423ad 100644
--- a/Trigger/TrigAlgorithms/TrigL2MuonSA/src/MuFastDataPreparator.cxx
+++ b/Trigger/TrigAlgorithms/TrigL2MuonSA/src/MuFastDataPreparator.cxx
@@ -4,7 +4,6 @@
#include "TrigL2MuonSA/MuFastDataPreparator.h"
-#include "GaudiKernel/ToolFactory.h"
#include "StoreGate/StoreGateSvc.h"
#include "CLHEP/Units/PhysicalConstants.h"
diff --git a/Trigger/TrigAlgorithms/TrigL2MuonSA/src/MuFastPatternFinder.cxx b/Trigger/TrigAlgorithms/TrigL2MuonSA/src/MuFastPatternFinder.cxx
index b4a2ea83193..81699bbe0b6 100644
--- a/Trigger/TrigAlgorithms/TrigL2MuonSA/src/MuFastPatternFinder.cxx
+++ b/Trigger/TrigAlgorithms/TrigL2MuonSA/src/MuFastPatternFinder.cxx
@@ -4,7 +4,6 @@
#include "TrigL2MuonSA/MuFastPatternFinder.h"
-#include "GaudiKernel/ToolFactory.h"
#include "StoreGate/StoreGateSvc.h"
#include "MuonCalibEvent/MdtCalibHit.h"
diff --git a/Trigger/TrigAlgorithms/TrigL2MuonSA/src/MuFastStationFitter.cxx b/Trigger/TrigAlgorithms/TrigL2MuonSA/src/MuFastStationFitter.cxx
index 672974f6d20..825c01072bd 100644
--- a/Trigger/TrigAlgorithms/TrigL2MuonSA/src/MuFastStationFitter.cxx
+++ b/Trigger/TrigAlgorithms/TrigL2MuonSA/src/MuFastStationFitter.cxx
@@ -5,7 +5,6 @@
#include "TrigL2MuonSA/MuFastStationFitter.h"
#include "xAODTrigMuon/L2StandAloneMuonAuxContainer.h"
-#include "GaudiKernel/ToolFactory.h"
#include "StoreGate/StoreGateSvc.h"
#include "CLHEP/Units/PhysicalConstants.h"
diff --git a/Trigger/TrigAlgorithms/TrigL2MuonSA/src/MuFastTrackExtrapolator.cxx b/Trigger/TrigAlgorithms/TrigL2MuonSA/src/MuFastTrackExtrapolator.cxx
index c7ff2c8ca3e..af8956bb2de 100644
--- a/Trigger/TrigAlgorithms/TrigL2MuonSA/src/MuFastTrackExtrapolator.cxx
+++ b/Trigger/TrigAlgorithms/TrigL2MuonSA/src/MuFastTrackExtrapolator.cxx
@@ -6,7 +6,6 @@
#include "xAODTrigMuon/L2StandAloneMuonAuxContainer.h"
#include "xAODTrigMuon/TrigMuonDefs.h"
-#include "GaudiKernel/ToolFactory.h"
#include "StoreGate/StoreGateSvc.h"
#include "CLHEP/Units/PhysicalConstants.h"
diff --git a/Trigger/TrigAlgorithms/TrigL2MuonSA/src/MuFastTrackFitter.cxx b/Trigger/TrigAlgorithms/TrigL2MuonSA/src/MuFastTrackFitter.cxx
index ba42c4fd4eb..c2e9e040189 100644
--- a/Trigger/TrigAlgorithms/TrigL2MuonSA/src/MuFastTrackFitter.cxx
+++ b/Trigger/TrigAlgorithms/TrigL2MuonSA/src/MuFastTrackFitter.cxx
@@ -4,7 +4,6 @@
#include "TrigL2MuonSA/MuFastTrackFitter.h"
-#include "GaudiKernel/ToolFactory.h"
#include "StoreGate/StoreGateSvc.h"
#include "CLHEP/Units/PhysicalConstants.h"
diff --git a/Trigger/TrigAlgorithms/TrigL2MuonSA/src/RpcDataPreparator.cxx b/Trigger/TrigAlgorithms/TrigL2MuonSA/src/RpcDataPreparator.cxx
index 8faa6042729..cd3c9d2cf4d 100644
--- a/Trigger/TrigAlgorithms/TrigL2MuonSA/src/RpcDataPreparator.cxx
+++ b/Trigger/TrigAlgorithms/TrigL2MuonSA/src/RpcDataPreparator.cxx
@@ -6,7 +6,6 @@
#include "TrigL2MuonSA/RpcDataPreparator.h"
-#include "GaudiKernel/ToolFactory.h"
#include "StoreGate/StoreGateSvc.h"
#include "CLHEP/Units/PhysicalConstants.h"
diff --git a/Trigger/TrigAlgorithms/TrigL2MuonSA/src/TgcDataPreparator.cxx b/Trigger/TrigAlgorithms/TrigL2MuonSA/src/TgcDataPreparator.cxx
index 4e9f5361992..d21992b019d 100644
--- a/Trigger/TrigAlgorithms/TrigL2MuonSA/src/TgcDataPreparator.cxx
+++ b/Trigger/TrigAlgorithms/TrigL2MuonSA/src/TgcDataPreparator.cxx
@@ -4,7 +4,6 @@
#include "TrigL2MuonSA/TgcDataPreparator.h"
-#include "GaudiKernel/ToolFactory.h"
#include "StoreGate/StoreGateSvc.h"
#include "CLHEP/Units/PhysicalConstants.h"
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/T2CaloInitSvc.cxx b/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/T2CaloInitSvc.cxx
index 1be343b7164..3e99d2a032c 100755
--- a/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/T2CaloInitSvc.cxx
+++ b/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/T2CaloInitSvc.cxx
@@ -6,9 +6,6 @@
#include "GaudiKernel/ISvcLocator.h"
#include "StoreGate/StoreGateSvc.h"
-//#include "GaudiKernel/ISvcFactory.h"
-//#include "GaudiKernel/SvcFactory.h"
-
#include "CaloDetDescr/CaloDetDescrManager.h"
#include "TrigT2CaloCommon/T2CaloInitSvc.h"
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/T_AnalysisConfig.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/T_AnalysisConfig.h
index daa6e1b6750..60dfedb78bc 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/T_AnalysisConfig.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/T_AnalysisConfig.h
@@ -12,7 +12,6 @@
#include "GaudiKernel/IToolSvc.h"
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/ITHistSvc.h"
-// #include "GaudiKernel/AlgFactory.h"
#include "StoreGate/StoreGateSvc.h"
#include "TrigDecisionTool/TrigDecisionTool.h"
diff --git a/Trigger/TrigDataAccess/TrigSerializeCnvSvc/TrigSerializeCnvSvc/TrigSerializeConverter.h b/Trigger/TrigDataAccess/TrigSerializeCnvSvc/TrigSerializeCnvSvc/TrigSerializeConverter.h
index c8560266414..8548f28dc3b 100755
--- a/Trigger/TrigDataAccess/TrigSerializeCnvSvc/TrigSerializeCnvSvc/TrigSerializeConverter.h
+++ b/Trigger/TrigDataAccess/TrigSerializeCnvSvc/TrigSerializeCnvSvc/TrigSerializeConverter.h
@@ -273,9 +273,6 @@ public:
virtual long int repSvcType() const;
static long int storageType();
-protected:
- friend class CnvFactory< TrigSerializeConverter< DATA > >;
-
TrigSerializeConverter( ISvcLocator* svcloc )
: Converter( storageType(), classID(), svcloc ),
m_convHelper( "TrigSerializeConvHelper/TrigSerializeConvHelper" ),
@@ -285,6 +282,8 @@ protected:
m_log = new MsgStream( msgSvc(), "TrigSerializeConverter" );
}
+protected:
+
~TrigSerializeConverter(){
delete m_log;
}
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/CombinedMuonFeatureCnv.h b/Trigger/TrigEvent/TrigEventAthenaPool/src/CombinedMuonFeatureCnv.h
index a0c474cc038..52f530ff86f 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/CombinedMuonFeatureCnv.h
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/CombinedMuonFeatureCnv.h
@@ -43,7 +43,9 @@ typedef T_AthenaPoolCustomCnv<CombinedMuonFeature, CombinedMuonFeature_PERS>
friend class CnvFactory<CombinedMuonFeatureCnv>;
protected:
+public:
CombinedMuonFeatureCnv( ISvcLocator *svcloc );
+protected:
~CombinedMuonFeatureCnv();
virtual CombinedMuonFeature_PERS* createPersistent( CombinedMuonFeature *transObj);
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/CombinedMuonFeatureContainerCnv.h b/Trigger/TrigEvent/TrigEventAthenaPool/src/CombinedMuonFeatureContainerCnv.h
index 35d74a73cd7..1fb1fd1c035 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/CombinedMuonFeatureContainerCnv.h
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/CombinedMuonFeatureContainerCnv.h
@@ -21,7 +21,9 @@ class CombinedMuonFeatureContainerCnv : public CombinedMuonFeatureContainerCnvBa
protected:
+public:
CombinedMuonFeatureContainerCnv( ISvcLocator *svcloc ): CombinedMuonFeatureContainerCnvBase(svcloc){}
+protected:
virtual CombinedMuonFeatureContainer_PERS *createPersistent( CombinedMuonFeatureContainer *transObj);
virtual CombinedMuonFeatureContainer *createTransient();
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/ElectronMuonTopoInfoContainerCnv.h b/Trigger/TrigEvent/TrigEventAthenaPool/src/ElectronMuonTopoInfoContainerCnv.h
index 9f02f7c26cd..232acfe3d38 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/ElectronMuonTopoInfoContainerCnv.h
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/ElectronMuonTopoInfoContainerCnv.h
@@ -23,7 +23,9 @@ class ElectronMuonTopoInfoContainerCnv : public ElectronMuonTopoInfoContainerCnv
protected:
+public:
ElectronMuonTopoInfoContainerCnv( ISvcLocator *svcloc ): ElectronMuonTopoInfoContainerCnvBase(svcloc){}
+protected:
virtual ElectronMuonTopoInfoContainer_PERS *createPersistent( ElectronMuonTopoInfoContainer *transObj);
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/FTK_RawTrackContainerCnv.h b/Trigger/TrigEvent/TrigEventAthenaPool/src/FTK_RawTrackContainerCnv.h
index bb1f997e8fa..9145158d5a4 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/FTK_RawTrackContainerCnv.h
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/FTK_RawTrackContainerCnv.h
@@ -36,7 +36,9 @@ class FTK_RawTrackContainerCnv : public FTK_RawTrackContainerCnvBase{
protected:
+public:
FTK_RawTrackContainerCnv(ISvcLocator* svcloc);
+protected:
~FTK_RawTrackContainerCnv();
virtual FTK_RawTrackContainer_PERS* createPersistent(FTK_RawTrackContainer* transObj);
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/IsoMuonFeatureCnv.h b/Trigger/TrigEvent/TrigEventAthenaPool/src/IsoMuonFeatureCnv.h
index 0c9333598d1..6c9564d6b41 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/IsoMuonFeatureCnv.h
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/IsoMuonFeatureCnv.h
@@ -41,7 +41,9 @@ typedef T_AthenaPoolCustomCnv<IsoMuonFeature, IsoMuonFeature_PERS>
friend class CnvFactory<IsoMuonFeatureCnv>;
protected:
+public:
IsoMuonFeatureCnv( ISvcLocator *svcloc );
+protected:
~IsoMuonFeatureCnv();
virtual IsoMuonFeature_PERS* createPersistent( IsoMuonFeature *transObj);
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/IsoMuonFeatureContainerCnv.h b/Trigger/TrigEvent/TrigEventAthenaPool/src/IsoMuonFeatureContainerCnv.h
index 218a8461011..0d98a273dc0 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/IsoMuonFeatureContainerCnv.h
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/IsoMuonFeatureContainerCnv.h
@@ -20,7 +20,9 @@ class IsoMuonFeatureContainerCnv : public IsoMuonFeatureContainerCnvBase {
protected:
+public:
IsoMuonFeatureContainerCnv( ISvcLocator *svcloc ): IsoMuonFeatureContainerCnvBase(svcloc){}
+protected:
virtual IsoMuonFeatureContainer_PERS *createPersistent( IsoMuonFeatureContainer *transObj);
virtual IsoMuonFeatureContainer *createTransient();
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/MuonFeatureCnv.h b/Trigger/TrigEvent/TrigEventAthenaPool/src/MuonFeatureCnv.h
index 068daf6b517..a70057af893 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/MuonFeatureCnv.h
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/MuonFeatureCnv.h
@@ -37,7 +37,9 @@ class MuonFeatureCnv : public MuonFeatureCnvBase {
friend class CnvFactory<MuonFeatureCnv>;
protected:
+public:
MuonFeatureCnv(ISvcLocator *svcloc);
+protected:
~MuonFeatureCnv();
virtual MuonFeature_PERS *createPersistent(MuonFeature *transObj);
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/MuonFeatureContainerCnv.h b/Trigger/TrigEvent/TrigEventAthenaPool/src/MuonFeatureContainerCnv.h
index 0328a894a73..1d7659f7b99 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/MuonFeatureContainerCnv.h
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/MuonFeatureContainerCnv.h
@@ -19,7 +19,9 @@ class MuonFeatureContainerCnv : public MuonFeatureContainerCnvBase {
protected:
+public:
MuonFeatureContainerCnv( ISvcLocator *svcloc ): MuonFeatureContainerCnvBase(svcloc){}
+protected:
virtual MuonFeatureContainer_PERS *createPersistent( MuonFeatureContainer *transObj);
virtual MuonFeatureContainer *createTransient();
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/MuonFeatureDetailsCnv.h b/Trigger/TrigEvent/TrigEventAthenaPool/src/MuonFeatureDetailsCnv.h
index c4c387aa010..87e1f963186 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/MuonFeatureDetailsCnv.h
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/MuonFeatureDetailsCnv.h
@@ -25,7 +25,9 @@ class MuonFeatureDetailsCnv : public MuonFeatureDetailsCnvBase {
friend class CnvFactory<MuonFeatureDetailsCnv>;
protected:
+public:
MuonFeatureDetailsCnv(ISvcLocator *svcloc);
+protected:
~MuonFeatureDetailsCnv();
virtual MuonFeatureDetails_PERS *createPersistent(MuonFeatureDetails *transObj);
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/MuonFeatureDetailsContainerCnv.h b/Trigger/TrigEvent/TrigEventAthenaPool/src/MuonFeatureDetailsContainerCnv.h
index e70e79dedd0..9849c8d4c35 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/MuonFeatureDetailsContainerCnv.h
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/MuonFeatureDetailsContainerCnv.h
@@ -20,7 +20,9 @@ class MuonFeatureDetailsContainerCnv : public MuonFeatureDetailsContainerCnvBase
protected:
+public:
MuonFeatureDetailsContainerCnv( ISvcLocator *svcloc ): MuonFeatureDetailsContainerCnvBase(svcloc){}
+protected:
virtual MuonFeatureDetailsContainer_PERS *createPersistent( MuonFeatureDetailsContainer *transObj);
virtual MuonFeatureDetailsContainer *createTransient();
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/RingerRingsCnv.h b/Trigger/TrigEvent/TrigEventAthenaPool/src/RingerRingsCnv.h
index 5d877854a1e..9fa357f4633 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/RingerRingsCnv.h
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/RingerRingsCnv.h
@@ -33,7 +33,9 @@ class RingerRingsCnv : public T_AthenaPoolCustomCnv<RingerRings, RingerRings_PE
protected:
+public:
RingerRingsCnv(ISvcLocator* svcloc);
+protected:
~RingerRingsCnv();
RingerRings_PERS* createPersistent(RingerRings* transCont);
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/RingerRingsContainerCnv.h b/Trigger/TrigEvent/TrigEventAthenaPool/src/RingerRingsContainerCnv.h
index 7bd735202f6..b966e649277 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/RingerRingsContainerCnv.h
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/RingerRingsContainerCnv.h
@@ -22,7 +22,9 @@ class RingerRingsContainerCnv : public RingerRingsContainerCnvBase {
protected:
+public:
RingerRingsContainerCnv(ISvcLocator *svcloc) : RingerRingsContainerCnvBase(svcloc){}
+protected:
virtual RingerRingsContainer_PERS *createPersistent(RingerRingsContainer *transObj);
virtual RingerRingsContainer *createTransient();
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TileMuFeatureCnv.h b/Trigger/TrigEvent/TrigEventAthenaPool/src/TileMuFeatureCnv.h
index 955e27699c7..a5a3752855c 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TileMuFeatureCnv.h
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TileMuFeatureCnv.h
@@ -35,7 +35,9 @@ class TileMuFeatureCnv : public TileMuFeatureCnvBase {
friend class CnvFactory<TileMuFeatureCnv>;
protected:
+public:
TileMuFeatureCnv(ISvcLocator *svcloc);
+protected:
~TileMuFeatureCnv();
virtual TileMuFeature_PERS *createPersistent(TileMuFeature *transObj);
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TileMuFeatureContainerCnv.h b/Trigger/TrigEvent/TrigEventAthenaPool/src/TileMuFeatureContainerCnv.h
index e4bf6474e1f..d431f36fcfd 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TileMuFeatureContainerCnv.h
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TileMuFeatureContainerCnv.h
@@ -19,7 +19,9 @@ class TileMuFeatureContainerCnv : public TileMuFeatureContainerCnvBase {
protected:
+public:
TileMuFeatureContainerCnv( ISvcLocator *svcloc ): TileMuFeatureContainerCnvBase(svcloc){}
+protected:
virtual TileMuFeatureContainer_PERS *createPersistent( TileMuFeatureContainer *transObj);
virtual TileMuFeatureContainer *createTransient();
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TileTrackMuFeatureContainerCnv.h b/Trigger/TrigEvent/TrigEventAthenaPool/src/TileTrackMuFeatureContainerCnv.h
index 20c2c3409e6..47b884c47e6 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TileTrackMuFeatureContainerCnv.h
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TileTrackMuFeatureContainerCnv.h
@@ -39,7 +39,9 @@ class TileTrackMuFeatureContainerCnv : public TileTrackMuFeatureContainerCnvBase
protected:
+public:
TileTrackMuFeatureContainerCnv( ISvcLocator *svcloc ): TileTrackMuFeatureContainerCnvBase(svcloc){}
+protected:
virtual TileTrackMuFeatureContainer_PERS *createPersistent( TileTrackMuFeatureContainer *transObj);
virtual TileTrackMuFeatureContainer *createTransient();
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigCaloClusterContainerCnv.h b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigCaloClusterContainerCnv.h
index da10e70c873..06d37510fdb 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigCaloClusterContainerCnv.h
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigCaloClusterContainerCnv.h
@@ -23,7 +23,9 @@ class TrigCaloClusterContainerCnv : public TrigCaloClusterContainerCnvBase
protected:
+public:
TrigCaloClusterContainerCnv( ISvcLocator *svcloc ): TrigCaloClusterContainerCnvBase(svcloc){}
+protected:
virtual TrigCaloClusterContainer_PERS *createPersistent( TrigCaloClusterContainer *transObj);
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigCompositeCnv.h b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigCompositeCnv.h
index 580a57da787..86296e21e35 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigCompositeCnv.h
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigCompositeCnv.h
@@ -31,7 +31,9 @@ class TrigCompositeCnv : public T_AthenaPoolCustomCnv<TrigComposite, TrigCompos
protected:
+public:
TrigCompositeCnv(ISvcLocator* svcloc);
+protected:
~TrigCompositeCnv();
TrigComposite_PERS* createPersistent(TrigComposite* transCont);
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigCompositeContainerCnv.h b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigCompositeContainerCnv.h
index 0548a8dbcc5..9c6e066c247 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigCompositeContainerCnv.h
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigCompositeContainerCnv.h
@@ -23,7 +23,9 @@ class TrigCompositeContainerCnv : public TrigCompositeContainerCnvBase
protected:
+public:
TrigCompositeContainerCnv( ISvcLocator *svcloc ): TrigCompositeContainerCnvBase(svcloc){}
+protected:
virtual TrigCompositeContainer_PERS *createPersistent( TrigCompositeContainer *transObj);
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigDecisionCnv.h b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigDecisionCnv.h
old mode 100755
new mode 100644
index 080f43a0131..05f0c721a01
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigDecisionCnv.h
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigDecisionCnv.h
@@ -43,7 +43,9 @@ class TrigDecisionCnv : public TrigDecisionCnvBase {
friend class CnvFactory<TrigDecisionCnv >;
protected:
+public:
TrigDecisionCnv (ISvcLocator* svcloc);
+protected:
~TrigDecisionCnv ();
virtual TrigDecision_PERS* createPersistent (TrigDec::TrigDecision* transCont);
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigEFBjetContainerCnv.h b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigEFBjetContainerCnv.h
index 4d8da25bfde..30f8d12e903 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigEFBjetContainerCnv.h
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigEFBjetContainerCnv.h
@@ -44,7 +44,9 @@ class TrigEFBjetContainerCnv : public TrigEFBjetContainerCnvBase
protected:
+public:
TrigEFBjetContainerCnv( ISvcLocator *svcloc );
+protected:
~TrigEFBjetContainerCnv();
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigEFBphysContainerCnv.h b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigEFBphysContainerCnv.h
index b1d58f15946..869ebe28141 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigEFBphysContainerCnv.h
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigEFBphysContainerCnv.h
@@ -44,7 +44,9 @@ class TrigEFBphysContainerCnv : public TrigEFBphysContainerCnvBase
protected:
+public:
TrigEFBphysContainerCnv( ISvcLocator *svcloc );
+protected:
~TrigEFBphysContainerCnv();
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigEMClusterCnv.h b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigEMClusterCnv.h
index 970e6a102a7..ed72c112660 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigEMClusterCnv.h
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigEMClusterCnv.h
@@ -35,7 +35,9 @@ class TrigEMClusterCnv : public T_AthenaPoolCustomCnv<TrigEMCluster, TrigEMClus
protected:
+public:
TrigEMClusterCnv(ISvcLocator* svcloc);
+protected:
~TrigEMClusterCnv();
TrigEMCluster_PERS* createPersistent(TrigEMCluster* transCont);
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigEMClusterContainerCnv.h b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigEMClusterContainerCnv.h
index 2e37a8e1edb..724d17182b4 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigEMClusterContainerCnv.h
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigEMClusterContainerCnv.h
@@ -23,7 +23,9 @@ class TrigEMClusterContainerCnv : public TrigEMClusterContainerCnvBase
protected:
+public:
TrigEMClusterContainerCnv( ISvcLocator *svcloc ): TrigEMClusterContainerCnvBase(svcloc){}
+protected:
virtual TrigEMClusterContainer_PERS *createPersistent( TrigEMClusterContainer *transObj);
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigElectronContainerCnv.h b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigElectronContainerCnv.h
index cba1ceca98c..4b44a8168bb 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigElectronContainerCnv.h
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigElectronContainerCnv.h
@@ -20,7 +20,9 @@ class TrigElectronContainerCnv : public TrigElectronContainerCnvBase {
protected:
+public:
TrigElectronContainerCnv(ISvcLocator* svcloc): TrigElectronContainerCnvBase(svcloc){}
+protected:
virtual TrigElectronContainer_PERS* createPersistent(TrigElectronContainer* transCont);
virtual TrigElectronContainer* createTransient ();
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigHisto1DCnv.h b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigHisto1DCnv.h
index c297e31e362..63fe0ef1def 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigHisto1DCnv.h
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigHisto1DCnv.h
@@ -31,7 +31,9 @@ class TrigHisto1DCnv : public TrigHisto1DCnvBase {
friend class CnvFactory<TrigHisto1DCnv>;
protected:
+public:
TrigHisto1DCnv(ISvcLocator* svcloc);
+protected:
~TrigHisto1DCnv();
TrigHisto1D_PERS* createPersistent(TrigHisto1D* transObj);
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigHisto2DCnv.h b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigHisto2DCnv.h
index 6e11aa79dc6..b15e8da75cb 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigHisto2DCnv.h
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigHisto2DCnv.h
@@ -30,7 +30,9 @@ class TrigHisto2DCnv : public TrigHisto2DCnvBase {
friend class CnvFactory<TrigHisto2DCnv>;
protected:
+public:
TrigHisto2DCnv(ISvcLocator* svcloc);
+protected:
~TrigHisto2DCnv();
TrigHisto2D_PERS* createPersistent(TrigHisto2D* transObj);
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigInDetTrackCollectionCnv.h b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigInDetTrackCollectionCnv.h
index 469fce2e6cb..17dc2d42a8a 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigInDetTrackCollectionCnv.h
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigInDetTrackCollectionCnv.h
@@ -36,7 +36,9 @@ class TrigInDetTrackCollectionCnv : public TrigInDetTrackCollectionCnvBase{
protected:
+public:
TrigInDetTrackCollectionCnv(ISvcLocator* svcloc);
+protected:
~TrigInDetTrackCollectionCnv();
virtual TrigInDetTrackCollection_PERS* createPersistent(TrigInDetTrackCollection* transObj);
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigL2BjetContainerCnv.h b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigL2BjetContainerCnv.h
index 92cfb867853..d2d7d8c7ec9 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigL2BjetContainerCnv.h
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigL2BjetContainerCnv.h
@@ -20,7 +20,9 @@ class TrigL2BjetContainerCnv : public TrigL2BjetContainerCnvBase {
protected:
+public:
TrigL2BjetContainerCnv( ISvcLocator *svcloc ) : TrigL2BjetContainerCnvBase(svcloc){}
+protected:
virtual TrigL2BjetContainer_PERS *createPersistent( TrigL2BjetContainer *transObj);
virtual TrigL2BjetContainer *createTransient();
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigL2BphysContainerCnv.h b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigL2BphysContainerCnv.h
index 822048f0f70..435e542e1f9 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigL2BphysContainerCnv.h
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigL2BphysContainerCnv.h
@@ -46,7 +46,9 @@ class TrigL2BphysContainerCnv : public TrigL2BphysContainerCnvBase
protected:
+public:
TrigL2BphysContainerCnv( ISvcLocator *svcloc );
+protected:
~TrigL2BphysContainerCnv();
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMissingETCnv.h b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMissingETCnv.h
index 03fd44f44d6..b32f1cdb5ea 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMissingETCnv.h
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMissingETCnv.h
@@ -36,7 +36,9 @@ class TrigMissingETCnv : public TrigMissingETCnvBase {
friend class CnvFactory<TrigMissingETCnv>;
protected:
+public:
TrigMissingETCnv(ISvcLocator *svcloc);
+protected:
~TrigMissingETCnv();
virtual TrigMissingET_PERS *createPersistent(TrigMissingET *transObj);
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMissingETContainerCnv.h b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMissingETContainerCnv.h
index f99d08877bd..7b64e9fcc77 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMissingETContainerCnv.h
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMissingETContainerCnv.h
@@ -22,7 +22,9 @@ class TrigMissingETContainerCnv : public TrigMissingETContainerCnvBase {
protected:
+public:
TrigMissingETContainerCnv( ISvcLocator *svcloc ) : TrigMissingETContainerCnvBase(svcloc) {}
+protected:
virtual TrigMissingETContainer_PERS *createPersistent( TrigMissingETContainer *transObj);
virtual TrigMissingETContainer *createTransient();
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMonConfigCnv.h b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMonConfigCnv.h
index 305b44ed8e0..076bcfc9f77 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMonConfigCnv.h
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMonConfigCnv.h
@@ -21,7 +21,9 @@ class TrigMonConfigCnv : public T_AthenaPoolCustomCnv<TrigMonConfig, TrigMonConf
protected:
+public:
TrigMonConfigCnv(ISvcLocator* svcloc);
+protected:
virtual ~TrigMonConfigCnv();
TrigMonConfig_PERS* createPersistent(TrigMonConfig* transObj);
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMonConfigCollectionCnv.h b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMonConfigCollectionCnv.h
index b4221ccb6e4..8770c6f45d9 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMonConfigCollectionCnv.h
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMonConfigCollectionCnv.h
@@ -21,9 +21,10 @@ class TrigMonConfigCollectionCnv
friend class CnvFactory<TrigMonConfigCollectionCnv>;
- protected:
-
+public:
TrigMonConfigCollectionCnv(ISvcLocator* svcloc);
+
+ protected:
virtual ~TrigMonConfigCollectionCnv();
TrigMonConfigCollection_PERS* createPersistent(TrigMonConfigCollection* transObj);
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMonEventCnv.h b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMonEventCnv.h
index 94392be6b92..2e6123c3565 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMonEventCnv.h
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMonEventCnv.h
@@ -21,7 +21,9 @@ class TrigMonEventCnv : public T_AthenaPoolCustomCnv<TrigMonEvent, TrigMonEvent_
protected:
+public:
TrigMonEventCnv(ISvcLocator* svcloc);
+protected:
virtual ~TrigMonEventCnv();
TrigMonEvent_PERS* createPersistent(TrigMonEvent* transObj);
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMonEventCollectionCnv.h b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMonEventCollectionCnv.h
index d4654bd8eb8..661e82b90a7 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMonEventCollectionCnv.h
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMonEventCollectionCnv.h
@@ -21,9 +21,10 @@ class TrigMonEventCollectionCnv
friend class CnvFactory<TrigMonEventCollectionCnv>;
- protected:
-
+ public:
TrigMonEventCollectionCnv(ISvcLocator* svcloc);
+
+ protected:
virtual ~TrigMonEventCollectionCnv();
TrigMonEventCollection_PERS* createPersistent(TrigMonEventCollection* transObj);
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMuonClusterFeatureCnv.h b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMuonClusterFeatureCnv.h
index de804349904..08db4ed8007 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMuonClusterFeatureCnv.h
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMuonClusterFeatureCnv.h
@@ -23,7 +23,9 @@ class TrigMuonClusterFeatureCnv : public TrigMuonClusterFeatureCnvBase {
protected:
+public:
TrigMuonClusterFeatureCnv( ISvcLocator *svcloc ): TrigMuonClusterFeatureCnvBase(svcloc){}
+protected:
virtual TrigMuonClusterFeature_PERS* createPersistent( TrigMuonClusterFeature *transObj);
virtual TrigMuonClusterFeature* createTransient();
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMuonClusterFeatureContainerCnv.h b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMuonClusterFeatureContainerCnv.h
index 2df68bb049f..2bdafa5c218 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMuonClusterFeatureContainerCnv.h
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMuonClusterFeatureContainerCnv.h
@@ -45,7 +45,9 @@ class TrigMuonClusterFeatureContainerCnv : public TrigMuonClusterFeatureContaine
protected:
+public:
TrigMuonClusterFeatureContainerCnv( ISvcLocator *svcloc );
+protected:
~TrigMuonClusterFeatureContainerCnv();
virtual TrigMuonClusterFeatureContainer_PERS *createPersistent( TrigMuonClusterFeatureContainer *transObj);
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMuonEFContainerCnv.h b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMuonEFContainerCnv.h
index 3b6a22ef0b3..c7f835fd17e 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMuonEFContainerCnv.h
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMuonEFContainerCnv.h
@@ -21,7 +21,9 @@ class TrigMuonEFContainerCnv : public TrigMuonEFContainerCnvBase {
protected:
+public:
TrigMuonEFContainerCnv( ISvcLocator *svcloc ): TrigMuonEFContainerCnvBase(svcloc) {}
+protected:
virtual TrigMuonEFContainer_PERS *createPersistent( TrigMuonEFContainer *transObj);
virtual TrigMuonEFContainer *createTransient();
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMuonEFInfoContainerCnv.h b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMuonEFInfoContainerCnv.h
index f12f2f1ccf6..6720ef65482 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMuonEFInfoContainerCnv.h
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMuonEFInfoContainerCnv.h
@@ -37,7 +37,9 @@ class TrigMuonEFInfoContainerCnv : public TrigMuonEFInfoContainerCnvBase{
protected:
+public:
TrigMuonEFInfoContainerCnv( ISvcLocator *svcloc );
+protected:
~TrigMuonEFInfoContainerCnv();
virtual TrigMuonEFInfoContainer_PERS *createPersistent( TrigMuonEFInfoContainer *transObj);
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMuonEFIsolationContainerCnv.h b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMuonEFIsolationContainerCnv.h
index 4479f6122f6..82f506c08d9 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMuonEFIsolationContainerCnv.h
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMuonEFIsolationContainerCnv.h
@@ -30,7 +30,9 @@ class TrigMuonEFIsolationContainerCnv : public TrigMuonEFIsolationContainerCnvBa
protected:
+public:
TrigMuonEFIsolationContainerCnv(ISvcLocator* svcloc);
+protected:
TrigMuonEFIsolationContainer_PERS* createPersistent(TrigMuonEFIsolationContainer* transCont);
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigPhotonContainerCnv.h b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigPhotonContainerCnv.h
index c031600ba66..817e38b851d 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigPhotonContainerCnv.h
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigPhotonContainerCnv.h
@@ -21,7 +21,9 @@ class TrigPhotonContainerCnv : public TrigPhotonContainerCnvBase {
protected:
+public:
TrigPhotonContainerCnv( ISvcLocator *svcloc ) : TrigPhotonContainerCnvBase(svcloc){}
+protected:
virtual TrigPhotonContainer_PERS *createPersistent( TrigPhotonContainer *transObj);
virtual TrigPhotonContainer *createTransient();
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigRNNOutputCnv.h b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigRNNOutputCnv.h
index 5b645b14a4d..941761a2750 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigRNNOutputCnv.h
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigRNNOutputCnv.h
@@ -34,7 +34,9 @@ class TrigRNNOutputCnv : public T_AthenaPoolCustomCnv<TrigRNNOutput, TrigRNNOut
protected:
+public:
TrigRNNOutputCnv(ISvcLocator* svcloc);
+protected:
~TrigRNNOutputCnv();
TrigRNNOutput_PERS* createPersistent(TrigRNNOutput* transCont);
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigRNNOutputContainerCnv.h b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigRNNOutputContainerCnv.h
index 46361a523c3..f770ad1d05a 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigRNNOutputContainerCnv.h
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigRNNOutputContainerCnv.h
@@ -21,7 +21,9 @@ class TrigRNNOutputContainerCnv : public TrigRNNOutputContainerCnvBase {
protected:
+public:
TrigRNNOutputContainerCnv( ISvcLocator *svcloc ) : TrigRNNOutputContainerCnvBase(svcloc){}
+protected:
virtual TrigRNNOutputContainer_PERS *createPersistent( TrigRNNOutputContainer *transObj);
virtual TrigRNNOutputContainer *createTransient();
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigSpacePointCountsCnv.h b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigSpacePointCountsCnv.h
index 1bd1e12871b..829509f4b2f 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigSpacePointCountsCnv.h
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigSpacePointCountsCnv.h
@@ -35,7 +35,9 @@ class TrigSpacePointCountsCnv : public TrigSpacePointCountsCnvBase {
virtual StatusCode initialize();
protected:
+public:
TrigSpacePointCountsCnv(ISvcLocator *svcloc);
+protected:
~TrigSpacePointCountsCnv();
virtual TrigSpacePointCounts_PERS *createPersistent(TrigSpacePointCounts *transObj);
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigSpacePointCountsCollectionCnv.h b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigSpacePointCountsCollectionCnv.h
index 99bea1a154b..15faddcd491 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigSpacePointCountsCollectionCnv.h
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigSpacePointCountsCollectionCnv.h
@@ -25,7 +25,9 @@ class TrigSpacePointCountsCollectionCnv : public TrigSpacePointCountsCollectionC
protected:
+public:
TrigSpacePointCountsCollectionCnv( ISvcLocator *svcloc ) : TrigSpacePointCountsCollectionCnvBase(svcloc) {}
+protected:
virtual TrigSpacePointCountsCollection_PERS *createPersistent( TrigSpacePointCountsCollection *transObj);
virtual TrigSpacePointCountsCollection *createTransient();
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigT2JetCnv.h b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigT2JetCnv.h
index 73ceff1ab89..85b774584c1 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigT2JetCnv.h
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigT2JetCnv.h
@@ -43,7 +43,9 @@ class TrigT2JetCnv : public TrigT2JetCnvBase
protected:
+public:
TrigT2JetCnv( ISvcLocator *svcloc );
+protected:
~TrigT2JetCnv();
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigT2JetContainerCnv.h b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigT2JetContainerCnv.h
index 7722d5cf7ac..da7ce06ba0b 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigT2JetContainerCnv.h
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigT2JetContainerCnv.h
@@ -34,7 +34,9 @@ class TrigT2JetContainerCnv : public TrigT2JetContainerCnvBase {
protected:
+public:
TrigT2JetContainerCnv( ISvcLocator *svcloc ): TrigT2JetContainerCnvBase(svcloc){}
+protected:
virtual TrigT2JetContainer_PERS *createPersistent( TrigT2JetContainer *transObj);
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigT2MbtsBitsCnv.h b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigT2MbtsBitsCnv.h
index 1d9e5306641..356fdb33236 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigT2MbtsBitsCnv.h
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigT2MbtsBitsCnv.h
@@ -30,7 +30,9 @@ class TrigT2MbtsBitsCnv : public TrigT2MbtsBitsCnvBase {
friend class CnvFactory<TrigT2MbtsBitsCnv>;
protected:
+public:
TrigT2MbtsBitsCnv(ISvcLocator* svcloc);
+protected:
~TrigT2MbtsBitsCnv();
TrigT2MbtsBits_PERS* createPersistent(TrigT2MbtsBits* transObj);
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigT2MbtsBitsContainerCnv.h b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigT2MbtsBitsContainerCnv.h
index 0e747ed9856..3056b3b28ac 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigT2MbtsBitsContainerCnv.h
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigT2MbtsBitsContainerCnv.h
@@ -20,7 +20,9 @@ class TrigT2MbtsBitsContainerCnv : public TrigT2MbtsBitsContainerCnvBase {
protected:
+public:
TrigT2MbtsBitsContainerCnv( ISvcLocator *svcloc ) : TrigT2MbtsBitsContainerCnvBase(svcloc){}
+protected:
virtual TrigT2MbtsBitsContainer_PERS *createPersistent( TrigT2MbtsBitsContainer *transObj);
virtual TrigT2MbtsBitsContainer *createTransient();
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTauClusterCnv.h b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTauClusterCnv.h
index 3d0db4e0d45..40042021006 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTauClusterCnv.h
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTauClusterCnv.h
@@ -34,7 +34,9 @@ class TrigTauClusterCnv : public T_AthenaPoolCustomCnv<TrigTauCluster, TrigTauCl
friend class CnvFactory<TrigTauClusterCnv>;
protected:
+public:
TrigTauClusterCnv(ISvcLocator* svcloc);
+protected:
~TrigTauClusterCnv();
TrigTauCluster_PERS* createPersistent(TrigTauCluster* transCont);
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTauClusterContainerCnv.h b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTauClusterContainerCnv.h
index 0f61bb57b34..056ba1aeaad 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTauClusterContainerCnv.h
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTauClusterContainerCnv.h
@@ -32,7 +32,9 @@ class TrigTauClusterContainerCnv : public TrigTauClusterContainerCnvBase
friend class CnvFactory<TrigTauClusterContainerCnv>;
protected:
+public:
TrigTauClusterContainerCnv(ISvcLocator *svcloc) : TrigTauClusterContainerCnvBase(svcloc){}
+protected:
virtual TrigTauClusterContainer_PERS* createPersistent(TrigTauClusterContainer *transObj);
virtual TrigTauClusterContainer* createTransient();
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTauClusterDetailsCnv.h b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTauClusterDetailsCnv.h
index 76ea669641c..d54d6d44d45 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTauClusterDetailsCnv.h
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTauClusterDetailsCnv.h
@@ -34,7 +34,9 @@ class TrigTauClusterDetailsCnv : public T_AthenaPoolCustomCnv<TrigTauClusterDeta
friend class CnvFactory<TrigTauClusterDetailsCnv>;
protected:
+public:
TrigTauClusterDetailsCnv(ISvcLocator* svcloc);
+protected:
~TrigTauClusterDetailsCnv();
TrigTauClusterDetails_PERS* createPersistent(TrigTauClusterDetails* transCont);
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTauClusterDetailsContainerCnv.h b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTauClusterDetailsContainerCnv.h
index 96d9e10e25a..1bd55f6adf8 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTauClusterDetailsContainerCnv.h
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTauClusterDetailsContainerCnv.h
@@ -24,7 +24,9 @@ class TrigTauClusterDetailsContainerCnv : public TrigTauClusterDetailsContainerC
protected:
+public:
TrigTauClusterDetailsContainerCnv( ISvcLocator *svcloc ): TrigTauClusterDetailsContainerCnvBase(svcloc){}
+protected:
virtual TrigTauClusterDetailsContainer_PERS *createPersistent( TrigTauClusterDetailsContainer *transObj);
virtual TrigTauClusterDetailsContainer *createTransient();
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTauCnv.h b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTauCnv.h
index b0e86e31b7e..9e150440559 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTauCnv.h
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTauCnv.h
@@ -35,7 +35,9 @@ class TrigTauCnv : public T_AthenaPoolCustomCnv<TrigTau, TrigTau_PERS >
protected:
+public:
TrigTauCnv(ISvcLocator* svcloc);
+protected:
~TrigTauCnv();
TrigTau_PERS* createPersistent(TrigTau* transCont);
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTauContainerCnv.h b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTauContainerCnv.h
index 33d48cbb71a..8baf76302a9 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTauContainerCnv.h
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTauContainerCnv.h
@@ -23,7 +23,9 @@ class TrigTauContainerCnv : public TrigTauContainerCnvBase
protected:
+public:
TrigTauContainerCnv( ISvcLocator *svcloc ): TrigTauContainerCnvBase(svcloc){}
+protected:
virtual TrigTauContainer_PERS *createPersistent( TrigTauContainer *transObj);
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTauTracksInfoCollectionCnv.h b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTauTracksInfoCollectionCnv.h
index 924e154bd18..a4068cca1f4 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTauTracksInfoCollectionCnv.h
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTauTracksInfoCollectionCnv.h
@@ -20,7 +20,9 @@ class TrigTauTracksInfoCollectionCnv : public TrigTauTracksInfoCollectionCnvBase
protected:
+public:
TrigTauTracksInfoCollectionCnv( ISvcLocator *svcloc ) : TrigTauTracksInfoCollectionCnvBase(svcloc){}
+protected:
virtual TrigTauTracksInfoCollection_PERS *createPersistent( TrigTauTracksInfoCollection *transObj);
virtual TrigTauTracksInfoCollection *createTransient();
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTrackCountsCnv.h b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTrackCountsCnv.h
index fcf8bd639d1..c82ed2ceec9 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTrackCountsCnv.h
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTrackCountsCnv.h
@@ -34,7 +34,9 @@ class TrigTrackCountsCnv : public TrigTrackCountsCnvBase {
friend class CnvFactory<TrigTrackCountsCnv>;
protected:
+public:
TrigTrackCountsCnv(ISvcLocator *svcloc);
+protected:
~TrigTrackCountsCnv();
virtual TrigTrackCounts_PERS *createPersistent(TrigTrackCounts *transObj);
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTrackCountsCollectionCnv.h b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTrackCountsCollectionCnv.h
index ae9617c695e..aa0271a95c0 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTrackCountsCollectionCnv.h
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTrackCountsCollectionCnv.h
@@ -43,7 +43,9 @@ class TrigTrackCountsCollectionCnv : public TrigTrackCountsCollectionCnvBase
protected:
+public:
TrigTrackCountsCollectionCnv( ISvcLocator *svcloc );
+protected:
~TrigTrackCountsCollectionCnv();
virtual TrigTrackCountsCollection_PERS *createPersistent( TrigTrackCountsCollection *transObj);
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTrtHitCountsCnv.h b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTrtHitCountsCnv.h
index 14785fca7ec..09ea6a5c7bc 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTrtHitCountsCnv.h
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTrtHitCountsCnv.h
@@ -30,7 +30,9 @@ class TrigTrtHitCountsCnv : public TrigTrtHitCountsCnvBase {
friend class CnvFactory<TrigTrtHitCountsCnv>;
protected:
+public:
TrigTrtHitCountsCnv(ISvcLocator* svcloc);
+protected:
~TrigTrtHitCountsCnv();
TrigTrtHitCounts_PERS* createPersistent(TrigTrtHitCounts* transObj);
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTrtHitCountsCollectionCnv.h b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTrtHitCountsCollectionCnv.h
index c9a0980096f..1de02a315f7 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTrtHitCountsCollectionCnv.h
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTrtHitCountsCollectionCnv.h
@@ -21,7 +21,9 @@ class TrigTrtHitCountsCollectionCnv : public TrigTrtHitCountsCollectionCnvBase {
protected:
+public:
TrigTrtHitCountsCollectionCnv( ISvcLocator *svcloc ): TrigTrtHitCountsCollectionCnvBase(svcloc) {}
+protected:
virtual TrigTrtHitCountsCollection_PERS *createPersistent( TrigTrtHitCountsCollection *transObj);
virtual TrigTrtHitCountsCollection *createTransient();
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigVertexCollectionCnv.h b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigVertexCollectionCnv.h
index 1773d691b7d..7223eedc926 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigVertexCollectionCnv.h
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigVertexCollectionCnv.h
@@ -46,7 +46,9 @@ class TrigVertexCollectionCnv : public TrigVertexCollectionCnvBase
protected:
+public:
TrigVertexCollectionCnv( ISvcLocator *svcloc );
+protected:
~TrigVertexCollectionCnv();
virtual TrigVertexCollection_PERS *createPersistent( TrigVertexCollection *transObj);
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigVertexCountsCnv.h b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigVertexCountsCnv.h
index 15ac360c7de..2c2424160ac 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigVertexCountsCnv.h
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigVertexCountsCnv.h
@@ -30,7 +30,9 @@ class TrigVertexCountsCnv : public TrigVertexCountsCnvBase {
friend class CnvFactory<TrigVertexCountsCnv>;
protected:
+public:
TrigVertexCountsCnv(ISvcLocator* svcloc);
+protected:
~TrigVertexCountsCnv();
TrigVertexCounts_PERS* createPersistent(TrigVertexCounts* transObj);
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigVertexCountsCollectionCnv.h b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigVertexCountsCollectionCnv.h
index bb119b0bc38..5d501d1e79e 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigVertexCountsCollectionCnv.h
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigVertexCountsCollectionCnv.h
@@ -39,7 +39,9 @@ class TrigVertexCountsCollectionCnv : public TrigVertexCountsCollectionCnvBase
protected:
+public:
TrigVertexCountsCollectionCnv( ISvcLocator *svcloc );
+protected:
~TrigVertexCountsCollectionCnv();
virtual TrigVertexCountsCollection_PERS *createPersistent( TrigVertexCountsCollection *transObj);
diff --git a/Trigger/TrigEvent/TrigNavigation/test/Holder_test.cxx b/Trigger/TrigEvent/TrigNavigation/test/Holder_test.cxx
index b37b683d0f1..31c83d0627e 100644
--- a/Trigger/TrigEvent/TrigNavigation/test/Holder_test.cxx
+++ b/Trigger/TrigEvent/TrigNavigation/test/Holder_test.cxx
@@ -35,8 +35,8 @@ StoreGateSvc* pStore(0);
typedef TrigSerializeConverter<TestBContainer> TestBContainerSerCnv;
typedef TrigSerializeConverter<TestAuxB> TestAuxBSerCnv;
-DECLARE_CONVERTER_FACTORY (TestBContainerSerCnv)
-DECLARE_CONVERTER_FACTORY (TestAuxBSerCnv)
+DECLARE_CONVERTER (TestBContainerSerCnv)
+DECLARE_CONVERTER (TestAuxBSerCnv)
template<class HTYPE>
bool reg( HTYPE* full, const char* name, int idx, ITypeProxy* /*aux*/, typename HTYPE::base_type*& base_holder,
diff --git a/Trigger/TrigEvent/TrigSteeringEventAthenaPool/src/HLTResultCnv.h b/Trigger/TrigEvent/TrigSteeringEventAthenaPool/src/HLTResultCnv.h
index e56486b3470..54f138767b7 100644
--- a/Trigger/TrigEvent/TrigSteeringEventAthenaPool/src/HLTResultCnv.h
+++ b/Trigger/TrigEvent/TrigSteeringEventAthenaPool/src/HLTResultCnv.h
@@ -43,7 +43,9 @@ class HLTResultCnv : public HLTResultCnvBase {
protected:
+public:
HLTResultCnv (ISvcLocator* svcloc);
+protected:
~HLTResultCnv();
diff --git a/Trigger/TrigEvent/TrigSteeringEventAthenaPool/src/Lvl1ResultCnv.h b/Trigger/TrigEvent/TrigSteeringEventAthenaPool/src/Lvl1ResultCnv.h
index 0d9551f28e7..78dbce2eda6 100644
--- a/Trigger/TrigEvent/TrigSteeringEventAthenaPool/src/Lvl1ResultCnv.h
+++ b/Trigger/TrigEvent/TrigSteeringEventAthenaPool/src/Lvl1ResultCnv.h
@@ -40,7 +40,9 @@ class Lvl1ResultCnv : public Lvl1ResultCnvBase {
protected:
+public:
Lvl1ResultCnv (ISvcLocator* svcloc);
+protected:
~Lvl1ResultCnv();
diff --git a/Trigger/TrigEvent/TrigSteeringEventAthenaPool/src/TrigOperationalInfoCnv.h b/Trigger/TrigEvent/TrigSteeringEventAthenaPool/src/TrigOperationalInfoCnv.h
index 85705062d1b..2d567c93e34 100644
--- a/Trigger/TrigEvent/TrigSteeringEventAthenaPool/src/TrigOperationalInfoCnv.h
+++ b/Trigger/TrigEvent/TrigSteeringEventAthenaPool/src/TrigOperationalInfoCnv.h
@@ -35,7 +35,9 @@ class TrigOperationalInfoCnv : public T_AthenaPoolCustomCnv<TrigOperationalInfo,
protected:
+public:
TrigOperationalInfoCnv(ISvcLocator* svcloc);
+protected:
~TrigOperationalInfoCnv();
TrigOperationalInfo_PERS* createPersistent(TrigOperationalInfo* transObj);
diff --git a/Trigger/TrigEvent/TrigSteeringEventAthenaPool/src/TrigOperationalInfoCollectionCnv.h b/Trigger/TrigEvent/TrigSteeringEventAthenaPool/src/TrigOperationalInfoCollectionCnv.h
index 329a5101ac9..774218c6ec0 100644
--- a/Trigger/TrigEvent/TrigSteeringEventAthenaPool/src/TrigOperationalInfoCollectionCnv.h
+++ b/Trigger/TrigEvent/TrigSteeringEventAthenaPool/src/TrigOperationalInfoCollectionCnv.h
@@ -35,7 +35,9 @@ class TrigOperationalInfoCollectionCnv : public T_AthenaPoolCustomCnv<TrigOperat
protected:
+public:
TrigOperationalInfoCollectionCnv(ISvcLocator* svcloc);
+protected:
~TrigOperationalInfoCollectionCnv();
TrigOperationalInfoCollection_PERS* createPersistent(TrigOperationalInfoCollection* transObj);
diff --git a/Trigger/TrigEvent/TrigSteeringEventAthenaPool/src/TrigPassBitsCnv.h b/Trigger/TrigEvent/TrigSteeringEventAthenaPool/src/TrigPassBitsCnv.h
index 82e49bf06b0..e9799c36ad4 100644
--- a/Trigger/TrigEvent/TrigSteeringEventAthenaPool/src/TrigPassBitsCnv.h
+++ b/Trigger/TrigEvent/TrigSteeringEventAthenaPool/src/TrigPassBitsCnv.h
@@ -37,7 +37,9 @@ class TrigPassBitsCnv : public TrigPassBitsCnvBase {
friend class CnvFactory<TrigPassBitsCnv>;
protected:
+public:
TrigPassBitsCnv(ISvcLocator *svcloc);
+protected:
~TrigPassBitsCnv();
virtual TrigPassBits_PERS *createPersistent(TrigPassBits *transObj);
diff --git a/Trigger/TrigEvent/TrigSteeringEventAthenaPool/src/TrigPassBitsCollectionCnv.h b/Trigger/TrigEvent/TrigSteeringEventAthenaPool/src/TrigPassBitsCollectionCnv.h
index a088c50aa5a..d116ef8dc9b 100644
--- a/Trigger/TrigEvent/TrigSteeringEventAthenaPool/src/TrigPassBitsCollectionCnv.h
+++ b/Trigger/TrigEvent/TrigSteeringEventAthenaPool/src/TrigPassBitsCollectionCnv.h
@@ -19,7 +19,9 @@ class TrigPassBitsCollectionCnv : public TrigPassBitsCollectionCnvBase {
protected:
+public:
TrigPassBitsCollectionCnv( ISvcLocator *svcloc ): TrigPassBitsCollectionCnvBase(svcloc){}
+protected:
virtual TrigPassBitsCollection_PERS *createPersistent( TrigPassBitsCollection *transObj);
virtual TrigPassBitsCollection *createTransient();
diff --git a/Trigger/TrigEvent/TrigSteeringEventAthenaPool/src/TrigPassFlagsCnv.h b/Trigger/TrigEvent/TrigSteeringEventAthenaPool/src/TrigPassFlagsCnv.h
index 7d80a1070ff..b2f566a03ba 100644
--- a/Trigger/TrigEvent/TrigSteeringEventAthenaPool/src/TrigPassFlagsCnv.h
+++ b/Trigger/TrigEvent/TrigSteeringEventAthenaPool/src/TrigPassFlagsCnv.h
@@ -37,7 +37,9 @@ class TrigPassFlagsCnv : public TrigPassFlagsCnvBase {
friend class CnvFactory<TrigPassFlagsCnv>;
protected:
+public:
TrigPassFlagsCnv(ISvcLocator *svcloc);
+protected:
~TrigPassFlagsCnv();
virtual TrigPassFlags_PERS *createPersistent(TrigPassFlags *transObj);
diff --git a/Trigger/TrigEvent/TrigSteeringEventAthenaPool/src/TrigPassFlagsCollectionCnv.h b/Trigger/TrigEvent/TrigSteeringEventAthenaPool/src/TrigPassFlagsCollectionCnv.h
index cc1fa4284ed..22cad336052 100644
--- a/Trigger/TrigEvent/TrigSteeringEventAthenaPool/src/TrigPassFlagsCollectionCnv.h
+++ b/Trigger/TrigEvent/TrigSteeringEventAthenaPool/src/TrigPassFlagsCollectionCnv.h
@@ -19,7 +19,9 @@ class TrigPassFlagsCollectionCnv : public TrigPassFlagsCollectionCnvBase {
protected:
+public:
TrigPassFlagsCollectionCnv( ISvcLocator *svcloc ): TrigPassFlagsCollectionCnvBase(svcloc){}
+protected:
virtual TrigPassFlagsCollection_PERS *createPersistent( TrigPassFlagsCollection *transObj);
virtual TrigPassFlagsCollection *createTransient();
diff --git a/Trigger/TrigEvent/TrigSteeringEventAthenaPool/src/TrigRoiDescriptorCnv.h b/Trigger/TrigEvent/TrigSteeringEventAthenaPool/src/TrigRoiDescriptorCnv.h
index affd77cbeea..3c73f7d18de 100644
--- a/Trigger/TrigEvent/TrigSteeringEventAthenaPool/src/TrigRoiDescriptorCnv.h
+++ b/Trigger/TrigEvent/TrigSteeringEventAthenaPool/src/TrigRoiDescriptorCnv.h
@@ -36,7 +36,9 @@ class TrigRoiDescriptorCnv : public T_AthenaPoolCustomCnv<TrigRoiDescriptor, Tri
protected:
+public:
TrigRoiDescriptorCnv(ISvcLocator* svcloc);
+protected:
~TrigRoiDescriptorCnv();
TrigRoiDescriptor_PERS* createPersistent(TrigRoiDescriptor* transObj);
diff --git a/Trigger/TrigEvent/TrigSteeringEventAthenaPool/src/TrigRoiDescriptorCollectionCnv.h b/Trigger/TrigEvent/TrigSteeringEventAthenaPool/src/TrigRoiDescriptorCollectionCnv.h
index 1e31baf8c59..f81814454b1 100644
--- a/Trigger/TrigEvent/TrigSteeringEventAthenaPool/src/TrigRoiDescriptorCollectionCnv.h
+++ b/Trigger/TrigEvent/TrigSteeringEventAthenaPool/src/TrigRoiDescriptorCollectionCnv.h
@@ -37,7 +37,9 @@ class TrigRoiDescriptorCollectionCnv : public T_AthenaPoolCustomCnv<TrigRoiDescr
protected:
+public:
TrigRoiDescriptorCollectionCnv(ISvcLocator* svcloc);
+protected:
~TrigRoiDescriptorCollectionCnv();
TrigRoiDescriptorCollection_PERS* createPersistent(TrigRoiDescriptorCollection* transObj);
diff --git a/Trigger/TrigFTK/FTK_DataProviderSvc/src/FTK_DataProviderSvc.cxx b/Trigger/TrigFTK/FTK_DataProviderSvc/src/FTK_DataProviderSvc.cxx
index 327a3d8dac1..2c21aded5cb 100644
--- a/Trigger/TrigFTK/FTK_DataProviderSvc/src/FTK_DataProviderSvc.cxx
+++ b/Trigger/TrigFTK/FTK_DataProviderSvc/src/FTK_DataProviderSvc.cxx
@@ -43,7 +43,6 @@
#include "AtlasDetDescr/AtlasDetectorID.h"
-#include "GaudiKernel/SvcFactory.h"
#include "GaudiKernel/MsgStream.h"
#include "EventInfo/EventIncident.h"
#include "StoreGate/StoreGateSvc.h"
diff --git a/Trigger/TrigFTK/TrigFTKByteStream/TrigFTKByteStream/TrigFTKByteStreamCnv.h b/Trigger/TrigFTK/TrigFTKByteStream/TrigFTKByteStream/TrigFTKByteStreamCnv.h
index 7a78f3d0ee9..796c429292c 100755
--- a/Trigger/TrigFTK/TrigFTKByteStream/TrigFTKByteStream/TrigFTKByteStreamCnv.h
+++ b/Trigger/TrigFTK/TrigFTKByteStream/TrigFTKByteStream/TrigFTKByteStreamCnv.h
@@ -18,7 +18,6 @@
**********************************************************************************/
#include "GaudiKernel/Converter.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/ToolHandle.h"
#include "GaudiKernel/ServiceHandle.h"
#include "ByteStreamCnvSvcBase/ByteStreamAddress.h"
@@ -85,8 +84,6 @@ namespace FTK {
long repSvcType() const { return i_repSvcType(); } //!< return repSvcType
- friend class CnvFactory<TrigFTKByteStreamCnv>; //!< declare factory as friend
-
private:
MsgStream* m_log; //!< std message stream
diff --git a/Trigger/TrigFTK/TrigFTKByteStream/src/TrigFTKByteStreamCnv.cxx b/Trigger/TrigFTK/TrigFTKByteStream/src/TrigFTKByteStreamCnv.cxx
index c2d51b2707d..82c13c99b19 100755
--- a/Trigger/TrigFTK/TrigFTKByteStream/src/TrigFTKByteStreamCnv.cxx
+++ b/Trigger/TrigFTK/TrigFTKByteStream/src/TrigFTKByteStreamCnv.cxx
@@ -8,7 +8,6 @@
#include "ByteStreamCnvSvcBase/IROBDataProviderSvc.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IRegistry.h"
diff --git a/Trigger/TrigFTK/TrigFTKByteStream/src/TrigFTKByteStreamTool.cxx b/Trigger/TrigFTK/TrigFTKByteStream/src/TrigFTKByteStreamTool.cxx
index 12cbc0141a6..c25e8729a62 100755
--- a/Trigger/TrigFTK/TrigFTKByteStream/src/TrigFTKByteStreamTool.cxx
+++ b/Trigger/TrigFTK/TrigFTKByteStream/src/TrigFTKByteStreamTool.cxx
@@ -3,7 +3,6 @@
*/
#include "eformat/SourceIdentifier.h"
-#include "GaudiKernel/ToolFactory.h"
#include "GaudiKernel/MsgStream.h"
#include "ByteStreamCnvSvcBase/IROBDataProviderSvc.h"
diff --git a/Trigger/TrigFTK/TrigFTKByteStream/src/components/TrigTrigFTKByteStream_entries.cxx b/Trigger/TrigFTK/TrigFTKByteStream/src/components/TrigTrigFTKByteStream_entries.cxx
index 905bff0086d..8c8f15d675b 100644
--- a/Trigger/TrigFTK/TrigFTKByteStream/src/components/TrigTrigFTKByteStream_entries.cxx
+++ b/Trigger/TrigFTK/TrigFTKByteStream/src/components/TrigTrigFTKByteStream_entries.cxx
@@ -4,7 +4,7 @@
#include "../FTKByteStreamDecoderEncoderAux.h"
#include "../FTKDump.h"
-DECLARE_CONVERTER_FACTORY( FTK::TrigFTKByteStreamCnv )
+DECLARE_CONVERTER( FTK::TrigFTKByteStreamCnv )
DECLARE_COMPONENT( FTK::TrigFTKByteStreamTool )
DECLARE_COMPONENT( FTK::FTKByteStreamDecoderEncoderTool )
DECLARE_COMPONENT( FTK::FTKByteStreamDecoderEncoderAuxTool )
diff --git a/Trigger/TrigSteer/TrigHLTResultByteStream/TrigHLTResultByteStream/HLTResultByteStreamCnv.h b/Trigger/TrigSteer/TrigHLTResultByteStream/TrigHLTResultByteStream/HLTResultByteStreamCnv.h
index ac0607969d1..366ed5c1752 100755
--- a/Trigger/TrigSteer/TrigHLTResultByteStream/TrigHLTResultByteStream/HLTResultByteStreamCnv.h
+++ b/Trigger/TrigSteer/TrigHLTResultByteStream/TrigHLTResultByteStream/HLTResultByteStreamCnv.h
@@ -22,7 +22,6 @@
#include <string>
#include "GaudiKernel/Converter.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/ToolHandle.h"
#include "GaudiKernel/ServiceHandle.h"
#include "ByteStreamCnvSvcBase/ByteStreamAddress.h"
@@ -75,7 +74,7 @@ namespace HLT {
*/
class HLTResultByteStreamCnv : public Converter {
- protected:
+ public:
HLTResultByteStreamCnv(ISvcLocator* svcloc); //!< std Gaudi converter constructor
public:
@@ -92,8 +91,6 @@ namespace HLT {
long repSvcType() const { return i_repSvcType(); } //!< return repSvcType
- friend class CnvFactory<HLTResultByteStreamCnv>; //!< declare factory as friend
-
private:
MsgStream* m_log; //!< std message stream
diff --git a/Trigger/TrigSteer/TrigHLTResultByteStream/TrigHLTResultByteStream/HLTResultByteStreamCnv.icc b/Trigger/TrigSteer/TrigHLTResultByteStream/TrigHLTResultByteStream/HLTResultByteStreamCnv.icc
index bc9b69886d9..49fa7025db0 100755
--- a/Trigger/TrigSteer/TrigHLTResultByteStream/TrigHLTResultByteStream/HLTResultByteStreamCnv.icc
+++ b/Trigger/TrigSteer/TrigHLTResultByteStream/TrigHLTResultByteStream/HLTResultByteStreamCnv.icc
@@ -14,7 +14,6 @@
//#include "eformat/RawMemorySimpleFragment.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IRegistry.h"
diff --git a/Trigger/TrigSteer/TrigHLTResultByteStream/src/HLTResultByteStreamCnv.cxx b/Trigger/TrigSteer/TrigHLTResultByteStream/src/HLTResultByteStreamCnv.cxx
index 009c8238270..420385abf0c 100755
--- a/Trigger/TrigSteer/TrigHLTResultByteStream/src/HLTResultByteStreamCnv.cxx
+++ b/Trigger/TrigSteer/TrigHLTResultByteStream/src/HLTResultByteStreamCnv.cxx
@@ -14,7 +14,6 @@
#include "ByteStreamCnvSvcBase/IROBDataProviderSvc.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IRegistry.h"
diff --git a/Trigger/TrigSteer/TrigHLTResultByteStream/src/components/TrigHLTResultByteStream_entries.cxx b/Trigger/TrigSteer/TrigHLTResultByteStream/src/components/TrigHLTResultByteStream_entries.cxx
index e834616c075..fbcb8e97fa2 100644
--- a/Trigger/TrigSteer/TrigHLTResultByteStream/src/components/TrigHLTResultByteStream_entries.cxx
+++ b/Trigger/TrigSteer/TrigHLTResultByteStream/src/components/TrigHLTResultByteStream_entries.cxx
@@ -2,6 +2,6 @@
#include "TrigHLTResultByteStream/HLTResultByteStreamCnv.h"
#include "TrigHLTResultByteStream/HLTResultByteStreamTool.h"
-DECLARE_CONVERTER_FACTORY( HLT::HLTResultByteStreamCnv )
+DECLARE_CONVERTER( HLT::HLTResultByteStreamCnv )
DECLARE_COMPONENT( HLT::HLTResultByteStreamTool )
diff --git a/Trigger/TrigT1/L1Topo/L1TopoByteStream/src/L1TopoByteStreamAuxCnv.cxx b/Trigger/TrigT1/L1Topo/L1TopoByteStream/src/L1TopoByteStreamAuxCnv.cxx
index f3f27c9c6a3..f07dcfd148d 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoByteStream/src/L1TopoByteStreamAuxCnv.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoByteStream/src/L1TopoByteStreamAuxCnv.cxx
@@ -22,7 +22,6 @@
#include "ByteStreamData/ROBData.h"
#include "AthenaKernel/errorcheck.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IOpaqueAddress.h"
#include "GaudiKernel/IRegistry.h"
diff --git a/Trigger/TrigT1/L1Topo/L1TopoByteStream/src/L1TopoByteStreamAuxCnv.h b/Trigger/TrigT1/L1Topo/L1TopoByteStream/src/L1TopoByteStreamAuxCnv.h
index 54d82fad565..92c22406a88 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoByteStream/src/L1TopoByteStreamAuxCnv.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoByteStream/src/L1TopoByteStreamAuxCnv.h
@@ -38,9 +38,8 @@ namespace LVL1BS {
*/
class L1TopoByteStreamAuxCnv : public Converter, public ::AthMessaging {
- friend class CnvFactory<L1TopoByteStreamAuxCnv>;
- protected:
+public:
L1TopoByteStreamAuxCnv(ISvcLocator* svcloc);
public:
diff --git a/Trigger/TrigT1/L1Topo/L1TopoByteStream/src/L1TopoByteStreamCnv.h b/Trigger/TrigT1/L1Topo/L1TopoByteStream/src/L1TopoByteStreamCnv.h
index 1b3859a2a63..56a840733a0 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoByteStream/src/L1TopoByteStreamCnv.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoByteStream/src/L1TopoByteStreamCnv.h
@@ -9,7 +9,6 @@
// Gaudi/Athena include(s):
#include "GaudiKernel/Converter.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h"
@@ -43,9 +42,8 @@ extern long ByteStream_StorageType;
* @date $Date: 2014-11-12 00:00:00 $
*/
class L1TopoByteStreamCnv : public Converter, public AthMessaging {
- friend class CnvFactory<L1TopoByteStreamCnv>;
- protected:
+public:
/// Standard constructor
L1TopoByteStreamCnv(ISvcLocator* svcloc);
diff --git a/Trigger/TrigT1/L1Topo/L1TopoByteStream/src/L1TopoByteStreamxAODCnv.cxx b/Trigger/TrigT1/L1Topo/L1TopoByteStream/src/L1TopoByteStreamxAODCnv.cxx
index 687f408c1d6..054bb441c64 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoByteStream/src/L1TopoByteStreamxAODCnv.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoByteStream/src/L1TopoByteStreamxAODCnv.cxx
@@ -13,7 +13,6 @@
#include "ByteStreamData/ROBData.h"
#include "AthenaKernel/errorcheck.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IOpaqueAddress.h"
#include "GaudiKernel/IRegistry.h"
diff --git a/Trigger/TrigT1/L1Topo/L1TopoByteStream/src/L1TopoByteStreamxAODCnv.h b/Trigger/TrigT1/L1Topo/L1TopoByteStream/src/L1TopoByteStreamxAODCnv.h
index bfd9a39787e..56286fb3802 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoByteStream/src/L1TopoByteStreamxAODCnv.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoByteStream/src/L1TopoByteStreamxAODCnv.h
@@ -33,9 +33,8 @@ namespace LVL1BS {
*/
class L1TopoByteStreamxAODCnv : public Converter, public ::AthMessaging {
- friend class CnvFactory<L1TopoByteStreamxAODCnv>;
- protected:
+public:
L1TopoByteStreamxAODCnv(ISvcLocator* svcloc);
public:
diff --git a/Trigger/TrigT1/L1Topo/L1TopoByteStream/src/components/L1TopoByteStream_entries.cxx b/Trigger/TrigT1/L1Topo/L1TopoByteStream/src/components/L1TopoByteStream_entries.cxx
index 500e9a1e4ee..b5ba22cdc8b 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoByteStream/src/components/L1TopoByteStream_entries.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoByteStream/src/components/L1TopoByteStream_entries.cxx
@@ -3,8 +3,8 @@
#include "../L1TopoByteStreamAuxCnv.h"
#include "../L1TopoByteStreamTool.h"
-DECLARE_CONVERTER_FACTORY( L1TopoByteStreamCnv )
-DECLARE_CONVERTER_FACTORY( LVL1BS::L1TopoByteStreamxAODCnv )
-DECLARE_CONVERTER_FACTORY( LVL1BS::L1TopoByteStreamAuxCnv )
+DECLARE_CONVERTER( L1TopoByteStreamCnv )
+DECLARE_CONVERTER( LVL1BS::L1TopoByteStreamxAODCnv )
+DECLARE_CONVERTER( LVL1BS::L1TopoByteStreamAuxCnv )
DECLARE_COMPONENT( L1TopoByteStreamTool )
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamCnv.cxx
index 78dcabd00fe..8d2a969da20 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamCnv.cxx
@@ -13,7 +13,6 @@
#include "DataModel/DataVector.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IOpaqueAddress.h"
#include "GaudiKernel/IRegistry.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV1Cnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV1Cnv.cxx
index 3e03f75e0de..a51adb75063 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV1Cnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV1Cnv.cxx
@@ -13,7 +13,6 @@
#include "DataModel/DataVector.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IOpaqueAddress.h"
#include "GaudiKernel/IRegistry.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV1Cnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV1Cnv.h
index 48dcce6ca18..533a95936a2 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV1Cnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV1Cnv.h
@@ -34,14 +34,8 @@ class CpByteStreamV1Tool;
*/
class CpByteStreamV1Cnv: public Converter {
-
- friend class CnvFactory<CpByteStreamV1Cnv>;
-
-protected:
-
- CpByteStreamV1Cnv(ISvcLocator* svcloc);
-
public:
+ CpByteStreamV1Cnv(ISvcLocator* svcloc);
~CpByteStreamV1Cnv();
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV2Cnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV2Cnv.cxx
index d9977ea8fd7..368965e3556 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV2Cnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV2Cnv.cxx
@@ -13,7 +13,6 @@
#include "DataModel/DataVector.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IOpaqueAddress.h"
#include "GaudiKernel/IRegistry.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV2Cnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV2Cnv.h
index f7fc65683ff..777ce4366ca 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV2Cnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV2Cnv.h
@@ -34,14 +34,8 @@ class CpByteStreamV2Tool;
*/
class CpByteStreamV2Cnv: public Converter {
-
- friend class CnvFactory<CpByteStreamV2Cnv>;
-
-protected:
-
- CpByteStreamV2Cnv(ISvcLocator* svcloc);
-
public:
+ CpByteStreamV2Cnv(ISvcLocator* svcloc);
~CpByteStreamV2Cnv();
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamCnv.icc b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamCnv.icc
index 12484e5b3fb..466a176f0d5 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamCnv.icc
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamCnv.icc
@@ -13,7 +13,6 @@
#include "ByteStreamData/RawEvent.h"
#include "ByteStreamData/ROBData.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IOpaqueAddress.h"
#include "GaudiKernel/ISvcLocator.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV1Cnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV1Cnv.h
index 1c80738fca8..d4ac573ef3d 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV1Cnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV1Cnv.h
@@ -35,14 +35,8 @@ class CpByteStreamV1Tool;
template <typename Container>
class CpReadByteStreamV1Cnv: public Converter {
-
- friend class CnvFactory<CpReadByteStreamV1Cnv<Container> >;
-
-protected:
-
- CpReadByteStreamV1Cnv(ISvcLocator* svcloc);
-
public:
+ CpReadByteStreamV1Cnv(ISvcLocator* svcloc);
~CpReadByteStreamV1Cnv();
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV1Cnv.icc b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV1Cnv.icc
index aab3536ec4f..9ed21fca000 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV1Cnv.icc
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV1Cnv.icc
@@ -13,7 +13,6 @@
#include "ByteStreamData/RawEvent.h"
#include "ByteStreamData/ROBData.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IOpaqueAddress.h"
#include "GaudiKernel/ISvcLocator.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV1V2Cnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV1V2Cnv.cxx
index 686fe4a5f66..5fe8213051e 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV1V2Cnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV1V2Cnv.cxx
@@ -15,7 +15,6 @@
#include "DataModel/DataVector.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IOpaqueAddress.h"
#include "GaudiKernel/IRegistry.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV1V2Cnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV1V2Cnv.h
index b55dc3b28de..874cfcca17b 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV1V2Cnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV1V2Cnv.h
@@ -39,13 +39,8 @@ class CpByteStreamV2Tool;
class CpReadByteStreamV1V2Cnv: public Converter {
- friend class CnvFactory<CpReadByteStreamV1V2Cnv>;
-
-protected:
-
- CpReadByteStreamV1V2Cnv(ISvcLocator* svcloc);
-
public:
+ CpReadByteStreamV1V2Cnv(ISvcLocator* svcloc);
~CpReadByteStreamV1V2Cnv();
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV2Cnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV2Cnv.h
index c68f2203366..ffef3abf3a7 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV2Cnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV2Cnv.h
@@ -35,14 +35,8 @@ class CpByteStreamV2Tool;
template <typename Container>
class CpReadByteStreamV2Cnv: public Converter {
-
- friend class CnvFactory<CpReadByteStreamV2Cnv<Container> >;
-
-protected:
-
- CpReadByteStreamV2Cnv(ISvcLocator* svcloc);
-
public:
+ CpReadByteStreamV2Cnv(ISvcLocator* svcloc);
~CpReadByteStreamV2Cnv();
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV2Cnv.icc b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV2Cnv.icc
index bc3b6868a12..bfb7ed046b5 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV2Cnv.icc
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV2Cnv.icc
@@ -13,7 +13,6 @@
#include "ByteStreamData/RawEvent.h"
#include "ByteStreamData/ROBData.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IOpaqueAddress.h"
#include "GaudiKernel/ISvcLocator.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamCnv.cxx
index ec671a68ddd..3e2d0f85d79 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamCnv.cxx
@@ -15,7 +15,6 @@
#include "DataModel/DataVector.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IOpaqueAddress.h"
#include "GaudiKernel/IRegistry.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamV1Cnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamV1Cnv.cxx
index 460d393bdc7..5552d52215d 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamV1Cnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamV1Cnv.cxx
@@ -15,7 +15,6 @@
#include "DataModel/DataVector.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IOpaqueAddress.h"
#include "GaudiKernel/IRegistry.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamV1Cnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamV1Cnv.h
index 60a6c0ff310..3a39bec7b0f 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamV1Cnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamV1Cnv.h
@@ -35,14 +35,8 @@ class CpmRoiByteStreamV1Tool;
*/
class CpmRoiByteStreamV1Cnv: public Converter {
-
- friend class CnvFactory<CpmRoiByteStreamV1Cnv>;
-
-protected:
-
- CpmRoiByteStreamV1Cnv(ISvcLocator* svcloc);
-
public:
+ CpmRoiByteStreamV1Cnv(ISvcLocator* svcloc);
~CpmRoiByteStreamV1Cnv();
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamV2Cnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamV2Cnv.cxx
index 0188cfa148f..dd83259e832 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamV2Cnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamV2Cnv.cxx
@@ -15,7 +15,6 @@
#include "DataModel/DataVector.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IOpaqueAddress.h"
#include "GaudiKernel/IRegistry.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamV2Cnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamV2Cnv.h
index 741f6db5e3b..84f842664b3 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamV2Cnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamV2Cnv.h
@@ -35,14 +35,8 @@ class CpmRoiByteStreamV2Tool;
*/
class CpmRoiByteStreamV2Cnv: public Converter {
-
- friend class CnvFactory<CpmRoiByteStreamV2Cnv>;
-
-protected:
-
- CpmRoiByteStreamV2Cnv(ISvcLocator* svcloc);
-
public:
+ CpmRoiByteStreamV2Cnv(ISvcLocator* svcloc);
~CpmRoiByteStreamV2Cnv();
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamCnv.cxx
index aeb8659d0cd..fc4c004c1a9 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamCnv.cxx
@@ -13,7 +13,6 @@
#include "DataModel/DataVector.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IOpaqueAddress.h"
#include "GaudiKernel/IRegistry.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV1Cnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV1Cnv.cxx
index 5a92f4767aa..37e3f675e50 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV1Cnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV1Cnv.cxx
@@ -13,7 +13,6 @@
#include "DataModel/DataVector.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IOpaqueAddress.h"
#include "GaudiKernel/IRegistry.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV1Cnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV1Cnv.h
index cb2fa92759d..28ade26af19 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV1Cnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV1Cnv.h
@@ -34,14 +34,8 @@ class JepByteStreamV1Tool;
*/
class JepByteStreamV1Cnv: public Converter {
-
- friend class CnvFactory<JepByteStreamV1Cnv>;
-
-protected:
-
- JepByteStreamV1Cnv(ISvcLocator* svcloc);
-
public:
+ JepByteStreamV1Cnv(ISvcLocator* svcloc);
~JepByteStreamV1Cnv();
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV2Cnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV2Cnv.cxx
index 78ad5a286e2..d05fef84932 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV2Cnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV2Cnv.cxx
@@ -13,7 +13,6 @@
#include "DataModel/DataVector.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IOpaqueAddress.h"
#include "GaudiKernel/IRegistry.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV2Cnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV2Cnv.h
index d10fe52f8a3..27c1cc8ce61 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV2Cnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV2Cnv.h
@@ -34,14 +34,8 @@ class JepByteStreamV2Tool;
*/
class JepByteStreamV2Cnv: public Converter {
-
- friend class CnvFactory<JepByteStreamV2Cnv>;
-
-protected:
-
- JepByteStreamV2Cnv(ISvcLocator* svcloc);
-
public:
+ JepByteStreamV2Cnv(ISvcLocator* svcloc);
~JepByteStreamV2Cnv();
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamCnv.icc b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamCnv.icc
index 2c6b1498e91..f2543ca77b3 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamCnv.icc
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamCnv.icc
@@ -13,7 +13,6 @@
#include "ByteStreamData/RawEvent.h"
#include "ByteStreamData/ROBData.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IOpaqueAddress.h"
#include "GaudiKernel/ISvcLocator.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV1Cnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV1Cnv.h
index 07f0c0d66ff..08e5805e471 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV1Cnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV1Cnv.h
@@ -36,13 +36,8 @@ class JepByteStreamV1Tool;
template <typename Container>
class JepReadByteStreamV1Cnv: public Converter {
- friend class CnvFactory<JepReadByteStreamV1Cnv<Container> >;
-
-protected:
-
- JepReadByteStreamV1Cnv(ISvcLocator* svcloc);
-
public:
+ JepReadByteStreamV1Cnv(ISvcLocator* svcloc);
~JepReadByteStreamV1Cnv();
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV1Cnv.icc b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV1Cnv.icc
index f95c302c3d4..0693952f3a2 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV1Cnv.icc
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV1Cnv.icc
@@ -13,7 +13,6 @@
#include "ByteStreamData/RawEvent.h"
#include "ByteStreamData/ROBData.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IOpaqueAddress.h"
#include "GaudiKernel/ISvcLocator.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV1V2Cnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV1V2Cnv.h
index 9c0b17020bd..5c138d4ce6c 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV1V2Cnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV1V2Cnv.h
@@ -40,13 +40,8 @@ class JepByteStreamV2Tool;
template <typename Container>
class JepReadByteStreamV1V2Cnv: public Converter {
- friend class CnvFactory<JepReadByteStreamV1V2Cnv<Container> >;
-
-protected:
-
- JepReadByteStreamV1V2Cnv(ISvcLocator* svcloc);
-
public:
+ JepReadByteStreamV1V2Cnv(ISvcLocator* svcloc);
~JepReadByteStreamV1V2Cnv();
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV1V2Cnv.icc b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV1V2Cnv.icc
index 6c77a60df60..3352e71705d 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV1V2Cnv.icc
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV1V2Cnv.icc
@@ -15,7 +15,6 @@
#include "DataModel/DataVector.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IOpaqueAddress.h"
#include "GaudiKernel/IRegistry.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV2Cnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV2Cnv.h
index babe217385f..1e300b94ff4 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV2Cnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV2Cnv.h
@@ -35,14 +35,8 @@ class JepByteStreamV2Tool;
template <typename Container>
class JepReadByteStreamV2Cnv: public Converter {
-
- friend class CnvFactory<JepReadByteStreamV2Cnv<Container> >;
-
-protected:
-
- JepReadByteStreamV2Cnv(ISvcLocator* svcloc);
-
public:
+ JepReadByteStreamV2Cnv(ISvcLocator* svcloc);
~JepReadByteStreamV2Cnv();
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV2Cnv.icc b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV2Cnv.icc
index c369996bd29..2e8ac5be54c 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV2Cnv.icc
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV2Cnv.icc
@@ -13,7 +13,6 @@
#include "ByteStreamData/RawEvent.h"
#include "ByteStreamData/ROBData.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IOpaqueAddress.h"
#include "GaudiKernel/ISvcLocator.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamCnv.cxx
index e87657d8be7..e6ba6a62df2 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamCnv.cxx
@@ -13,7 +13,6 @@
#include "DataModel/DataVector.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IOpaqueAddress.h"
#include "GaudiKernel/IRegistry.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamV1Cnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamV1Cnv.cxx
index 88c9333c46e..3c832933e55 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamV1Cnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamV1Cnv.cxx
@@ -13,7 +13,6 @@
#include "DataModel/DataVector.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IOpaqueAddress.h"
#include "GaudiKernel/IRegistry.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamV1Cnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamV1Cnv.h
index 11a168fbd9a..507875b8b8d 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamV1Cnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamV1Cnv.h
@@ -35,13 +35,8 @@ class JepRoiByteStreamV1Tool;
class JepRoiByteStreamV1Cnv: public Converter {
- friend class CnvFactory<JepRoiByteStreamV1Cnv>;
-
-protected:
-
- JepRoiByteStreamV1Cnv(ISvcLocator* svcloc);
-
public:
+ JepRoiByteStreamV1Cnv(ISvcLocator* svcloc);
~JepRoiByteStreamV1Cnv();
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamV2Cnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamV2Cnv.cxx
index 5bf834d448d..f483e9dde35 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamV2Cnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamV2Cnv.cxx
@@ -13,7 +13,6 @@
#include "DataModel/DataVector.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IOpaqueAddress.h"
#include "GaudiKernel/IRegistry.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamV2Cnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamV2Cnv.h
index c165db2f8e9..5f7348066fd 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamV2Cnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamV2Cnv.h
@@ -34,14 +34,8 @@ class JepRoiByteStreamV2Tool;
*/
class JepRoiByteStreamV2Cnv: public Converter {
-
- friend class CnvFactory<JepRoiByteStreamV2Cnv>;
-
-protected:
-
- JepRoiByteStreamV2Cnv(ISvcLocator* svcloc);
-
public:
+ JepRoiByteStreamV2Cnv(ISvcLocator* svcloc);
~JepRoiByteStreamV2Cnv();
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamCnv.icc b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamCnv.icc
index d09be689673..de27d42c5db 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamCnv.icc
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamCnv.icc
@@ -13,7 +13,6 @@
#include "ByteStreamData/RawEvent.h"
#include "ByteStreamData/ROBData.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IOpaqueAddress.h"
#include "GaudiKernel/ISvcLocator.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamV1Cnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamV1Cnv.h
index 60e1ea9128d..5f9b2f52e55 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamV1Cnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamV1Cnv.h
@@ -36,13 +36,8 @@ class JepRoiByteStreamV1Tool;
template <typename Container>
class JepRoiReadByteStreamV1Cnv: public Converter {
- friend class CnvFactory<JepRoiReadByteStreamV1Cnv<Container> >;
-
-protected:
-
- JepRoiReadByteStreamV1Cnv(ISvcLocator* svcloc);
-
public:
+ JepRoiReadByteStreamV1Cnv(ISvcLocator* svcloc);
~JepRoiReadByteStreamV1Cnv();
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamV1Cnv.icc b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamV1Cnv.icc
index c6ea7059862..bcd42b78550 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamV1Cnv.icc
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamV1Cnv.icc
@@ -13,7 +13,6 @@
#include "ByteStreamData/RawEvent.h"
#include "ByteStreamData/ROBData.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IOpaqueAddress.h"
#include "GaudiKernel/ISvcLocator.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamV2Cnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamV2Cnv.h
index 5e7ca43e80f..4d88e8a4c01 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamV2Cnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamV2Cnv.h
@@ -35,14 +35,8 @@ class JepRoiByteStreamV2Tool;
template <typename Container>
class JepRoiReadByteStreamV2Cnv: public Converter {
-
- friend class CnvFactory<JepRoiReadByteStreamV2Cnv<Container> >;
-
-protected:
-
- JepRoiReadByteStreamV2Cnv(ISvcLocator* svcloc);
-
public:
+ JepRoiReadByteStreamV2Cnv(ISvcLocator* svcloc);
~JepRoiReadByteStreamV2Cnv();
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamV2Cnv.icc b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamV2Cnv.icc
index 7224f5eefb9..8bcbda1e2f0 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamV2Cnv.icc
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamV2Cnv.icc
@@ -13,7 +13,6 @@
#include "ByteStreamData/RawEvent.h"
#include "ByteStreamData/ROBData.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IOpaqueAddress.h"
#include "GaudiKernel/ISvcLocator.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/L1CaloErrorByteStreamCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/L1CaloErrorByteStreamCnv.cxx
index 2084f8e43d9..64fe9240801 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/L1CaloErrorByteStreamCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/L1CaloErrorByteStreamCnv.cxx
@@ -7,7 +7,6 @@
#include "ByteStreamCnvSvcBase/ByteStreamAddress.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IOpaqueAddress.h"
#include "GaudiKernel/ISvcLocator.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/L1CaloErrorByteStreamCnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/L1CaloErrorByteStreamCnv.h
index 948634ad0c8..db57d137230 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/L1CaloErrorByteStreamCnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/L1CaloErrorByteStreamCnv.h
@@ -33,13 +33,8 @@ class L1CaloErrorByteStreamTool;
class L1CaloErrorByteStreamCnv: public Converter {
- friend class CnvFactory<L1CaloErrorByteStreamCnv>;
-
-protected:
-
- L1CaloErrorByteStreamCnv(ISvcLocator* svcloc);
-
public:
+ L1CaloErrorByteStreamCnv(ISvcLocator* svcloc);
~L1CaloErrorByteStreamCnv();
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/PpmByteStreamV1Cnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/PpmByteStreamV1Cnv.cxx
index 8f67bf4875b..8c50f85b79e 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/PpmByteStreamV1Cnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/PpmByteStreamV1Cnv.cxx
@@ -15,7 +15,6 @@
#include "DataModel/DataVector.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IOpaqueAddress.h"
#include "GaudiKernel/IRegistry.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/PpmByteStreamV1Cnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/PpmByteStreamV1Cnv.h
index 786329c72fc..7096df448d1 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/PpmByteStreamV1Cnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/PpmByteStreamV1Cnv.h
@@ -36,13 +36,8 @@ class PpmByteStreamV1Tool;
class PpmByteStreamV1Cnv: public Converter {
- friend class CnvFactory<PpmByteStreamV1Cnv>;
-
-protected:
-
- PpmByteStreamV1Cnv(ISvcLocator* svcloc);
-
public:
+ PpmByteStreamV1Cnv(ISvcLocator* svcloc);
~PpmByteStreamV1Cnv();
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/RodHeaderByteStreamCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/RodHeaderByteStreamCnv.cxx
index 5bd862c7e36..ede9de318b6 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/RodHeaderByteStreamCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/RodHeaderByteStreamCnv.cxx
@@ -14,7 +14,6 @@
#include "DataModel/DataVector.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IOpaqueAddress.h"
#include "GaudiKernel/ISvcLocator.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/RodHeaderByteStreamCnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/RodHeaderByteStreamCnv.h
index 2894ad5f8fd..31d84ff9c7d 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/RodHeaderByteStreamCnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/RodHeaderByteStreamCnv.h
@@ -34,13 +34,8 @@ class RodHeaderByteStreamTool;
class RodHeaderByteStreamCnv: public Converter {
- friend class CnvFactory<RodHeaderByteStreamCnv>;
-
-protected:
-
- RodHeaderByteStreamCnv(ISvcLocator* svcloc);
-
public:
+ RodHeaderByteStreamCnv(ISvcLocator* svcloc);
~RodHeaderByteStreamCnv();
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/components/TrigT1CaloByteStream_entries.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/components/TrigT1CaloByteStream_entries.cxx
index badcd38dbb0..627ee679579 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/components/TrigT1CaloByteStream_entries.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/components/TrigT1CaloByteStream_entries.cxx
@@ -220,104 +220,104 @@ typedef JepReadByteStreamV1V2Cnv<JEMEtSumsCollection> JepReadESByteStreamV1V2Cn
// ============================================================================
// RUN2
// ============================================================================
-DECLARE_CONVERTER_FACTORY( LVL1BS::JepRoiByteStreamV2Cnv )
-DECLARE_CONVERTER_FACTORY( LVL1BS::JepRoiReadCRByteStreamV2CnvT )
+DECLARE_CONVERTER( LVL1BS::JepRoiByteStreamV2Cnv )
+DECLARE_CONVERTER( LVL1BS::JepRoiReadCRByteStreamV2CnvT )
// ============================================================================
// RUN1
// ============================================================================
-DECLARE_CONVERTER_FACTORY( LVL1BS::CpByteStreamV1Cnv )
-DECLARE_CONVERTER_FACTORY( LVL1BS::CpmRoiByteStreamV1Cnv )
-DECLARE_CONVERTER_FACTORY( LVL1BS::CpReadCHByteStreamV1CnvT )
-DECLARE_CONVERTER_FACTORY( LVL1BS::CpReadCCByteStreamV1CnvT )
-DECLARE_CONVERTER_FACTORY( LVL1BS::JepByteStreamV1Cnv )
-DECLARE_CONVERTER_FACTORY( LVL1BS::JepRoiByteStreamV1Cnv )
-DECLARE_CONVERTER_FACTORY( LVL1BS::JepReadCJByteStreamV1CnvT )
-DECLARE_CONVERTER_FACTORY( LVL1BS::JepReadCEByteStreamV1CnvT )
-DECLARE_CONVERTER_FACTORY( LVL1BS::JepReadJHByteStreamV1CnvT )
-DECLARE_CONVERTER_FACTORY( LVL1BS::JepRoiReadJRByteStreamV1CnvT )
-DECLARE_CONVERTER_FACTORY( LVL1BS::JepRoiReadCRByteStreamV1CnvT )
+DECLARE_CONVERTER( LVL1BS::CpByteStreamV1Cnv )
+DECLARE_CONVERTER( LVL1BS::CpmRoiByteStreamV1Cnv )
+DECLARE_CONVERTER( LVL1BS::CpReadCHByteStreamV1CnvT )
+DECLARE_CONVERTER( LVL1BS::CpReadCCByteStreamV1CnvT )
+DECLARE_CONVERTER( LVL1BS::JepByteStreamV1Cnv )
+DECLARE_CONVERTER( LVL1BS::JepRoiByteStreamV1Cnv )
+DECLARE_CONVERTER( LVL1BS::JepReadCJByteStreamV1CnvT )
+DECLARE_CONVERTER( LVL1BS::JepReadCEByteStreamV1CnvT )
+DECLARE_CONVERTER( LVL1BS::JepReadJHByteStreamV1CnvT )
+DECLARE_CONVERTER( LVL1BS::JepRoiReadJRByteStreamV1CnvT )
+DECLARE_CONVERTER( LVL1BS::JepRoiReadCRByteStreamV1CnvT )
// ============================================================================
// RUN1 & RUN2
// ============================================================================
-DECLARE_CONVERTER_FACTORY( LVL1BS::CpReadByteStreamV1V2Cnv )
-DECLARE_CONVERTER_FACTORY( LVL1BS::JepReadJEByteStreamV1V2CnvT )
-DECLARE_CONVERTER_FACTORY( LVL1BS::JepReadESByteStreamV1V2CnvT )
-DECLARE_CONVERTER_FACTORY( LVL1BS::RodHeaderByteStreamCnv )
-DECLARE_CONVERTER_FACTORY( LVL1BS::L1CaloErrorByteStreamCnv )
+DECLARE_CONVERTER( LVL1BS::CpReadByteStreamV1V2Cnv )
+DECLARE_CONVERTER( LVL1BS::JepReadJEByteStreamV1V2CnvT )
+DECLARE_CONVERTER( LVL1BS::JepReadESByteStreamV1V2CnvT )
+DECLARE_CONVERTER( LVL1BS::RodHeaderByteStreamCnv )
+DECLARE_CONVERTER( LVL1BS::L1CaloErrorByteStreamCnv )
// ============================================================================
// PPM
// ============================================================================
DECLARE_COMPONENT( LVL1BS::PpmByteStreamV1Tool )
DECLARE_COMPONENT( LVL1BS::PpmByteStreamReadV1V2Tool )
-DECLARE_CONVERTER_FACTORY( LVL1BS::PpmByteStreamV1Cnv )
-DECLARE_CONVERTER_FACTORY( LVL1BS::PpmByteStreamxAODCnv )
-DECLARE_CONVERTER_FACTORY( LVL1BS::PpmByteStreamAuxCnv )
+DECLARE_CONVERTER( LVL1BS::PpmByteStreamV1Cnv )
+DECLARE_CONVERTER( LVL1BS::PpmByteStreamxAODCnv )
+DECLARE_CONVERTER( LVL1BS::PpmByteStreamAuxCnv )
// ============================================================================
// CPM
// ============================================================================
DECLARE_COMPONENT( LVL1BS::CpByteStreamV2Tool )
-DECLARE_CONVERTER_FACTORY( LVL1BS::CpmTowerByteStreamxAODCnv )
-DECLARE_CONVERTER_FACTORY( LVL1BS::CpmTowerByteStreamAuxCnv )
+DECLARE_CONVERTER( LVL1BS::CpmTowerByteStreamxAODCnv )
+DECLARE_CONVERTER( LVL1BS::CpmTowerByteStreamAuxCnv )
// ============================================================================
// CMXCPTOB
// ============================================================================
-DECLARE_CONVERTER_FACTORY( LVL1BS::CmxCpTobByteStreamxAODCnv )
-DECLARE_CONVERTER_FACTORY( LVL1BS::CmxCpTobByteStreamAuxCnv )
+DECLARE_CONVERTER( LVL1BS::CmxCpTobByteStreamxAODCnv )
+DECLARE_CONVERTER( LVL1BS::CmxCpTobByteStreamAuxCnv )
// ============================================================================
// CMXCPHITS
// ============================================================================
-DECLARE_CONVERTER_FACTORY( LVL1BS::CmxCpHitsByteStreamxAODCnv )
-DECLARE_CONVERTER_FACTORY( LVL1BS::CmxCpHitsByteStreamAuxCnv )
+DECLARE_CONVERTER( LVL1BS::CmxCpHitsByteStreamxAODCnv )
+DECLARE_CONVERTER( LVL1BS::CmxCpHitsByteStreamAuxCnv )
// ============================================================================
// CMXJETTOB
// ============================================================================
-DECLARE_CONVERTER_FACTORY( LVL1BS::CmxJetTobByteStreamxAODCnv )
-DECLARE_CONVERTER_FACTORY( LVL1BS::CmxJetTobByteStreamAuxCnv )
+DECLARE_CONVERTER( LVL1BS::CmxJetTobByteStreamxAODCnv )
+DECLARE_CONVERTER( LVL1BS::CmxJetTobByteStreamAuxCnv )
// ============================================================================
// CMXJETHITS
// ============================================================================
-DECLARE_CONVERTER_FACTORY( LVL1BS::CmxJetHitsByteStreamxAODCnv )
-DECLARE_CONVERTER_FACTORY( LVL1BS::CmxJetHitsByteStreamAuxCnv )
+DECLARE_CONVERTER( LVL1BS::CmxJetHitsByteStreamxAODCnv )
+DECLARE_CONVERTER( LVL1BS::CmxJetHitsByteStreamAuxCnv )
// ============================================================================
// CMXETSUMS
// ============================================================================
-DECLARE_CONVERTER_FACTORY( LVL1BS::CmxEtSumsByteStreamxAODCnv )
-DECLARE_CONVERTER_FACTORY( LVL1BS::CmxEtSumsByteStreamAuxCnv )
+DECLARE_CONVERTER( LVL1BS::CmxEtSumsByteStreamxAODCnv )
+DECLARE_CONVERTER( LVL1BS::CmxEtSumsByteStreamAuxCnv )
// ============================================================================
// JEMETSUMS
// ============================================================================
-DECLARE_CONVERTER_FACTORY( LVL1BS::JemEtSumsByteStreamxAODCnv )
-DECLARE_CONVERTER_FACTORY( LVL1BS::JemEtSumsByteStreamAuxCnv )
+DECLARE_CONVERTER( LVL1BS::JemEtSumsByteStreamxAODCnv )
+DECLARE_CONVERTER( LVL1BS::JemEtSumsByteStreamAuxCnv )
// ============================================================================
// CPMTOBROI
// ============================================================================
-DECLARE_CONVERTER_FACTORY( LVL1BS::CpmTobRoiByteStreamxAODCnv )
-DECLARE_CONVERTER_FACTORY( LVL1BS::CpmTobRoiByteStreamAuxCnv )
+DECLARE_CONVERTER( LVL1BS::CpmTobRoiByteStreamxAODCnv )
+DECLARE_CONVERTER( LVL1BS::CpmTobRoiByteStreamAuxCnv )
// ============================================================================
// JEMTOBROI
// ============================================================================
-DECLARE_CONVERTER_FACTORY( LVL1BS::JemTobRoiByteStreamxAODCnv )
-DECLARE_CONVERTER_FACTORY( LVL1BS::JemTobRoiByteStreamAuxCnv )
+DECLARE_CONVERTER( LVL1BS::JemTobRoiByteStreamxAODCnv )
+DECLARE_CONVERTER( LVL1BS::JemTobRoiByteStreamAuxCnv )
// ============================================================================
// JETELEMENT
// ============================================================================
-DECLARE_CONVERTER_FACTORY( LVL1BS::JetElementByteStreamxAODCnv )
-DECLARE_CONVERTER_FACTORY( LVL1BS::JetElementByteStreamAuxCnv )
+DECLARE_CONVERTER( LVL1BS::JetElementByteStreamxAODCnv )
+DECLARE_CONVERTER( LVL1BS::JetElementByteStreamAuxCnv )
// ============================================================================
// CMXROI
// ============================================================================
-DECLARE_CONVERTER_FACTORY( LVL1BS::CmxRoIByteStreamxAODCnv )
-DECLARE_CONVERTER_FACTORY( LVL1BS::CmxRoIByteStreamAuxCnv )
+DECLARE_CONVERTER( LVL1BS::CmxRoIByteStreamxAODCnv )
+DECLARE_CONVERTER( LVL1BS::CmxRoIByteStreamAuxCnv )
// ============================================================================
// RODHEADER
// ============================================================================
-DECLARE_CONVERTER_FACTORY( LVL1BS::RodHeaderByteStreamxAODCnv )
-DECLARE_CONVERTER_FACTORY( LVL1BS::RodHeaderByteStreamAuxCnv )
+DECLARE_CONVERTER( LVL1BS::RodHeaderByteStreamxAODCnv )
+DECLARE_CONVERTER( LVL1BS::RodHeaderByteStreamAuxCnv )
// ============================================================================
DECLARE_COMPONENT( LVL1BS::CpmRoiByteStreamV2Tool )
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxCpHitsByteStreamAuxCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxCpHitsByteStreamAuxCnv.cxx
index 9a7e8d51fea..b365a18df86 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxCpHitsByteStreamAuxCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxCpHitsByteStreamAuxCnv.cxx
@@ -22,7 +22,6 @@
#include "ByteStreamData/ROBData.h"
#include "AthenaKernel/errorcheck.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IOpaqueAddress.h"
#include "GaudiKernel/IRegistry.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxCpHitsByteStreamAuxCnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxCpHitsByteStreamAuxCnv.h
index 0d73c1bd1c0..ac0a6171d83 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxCpHitsByteStreamAuxCnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxCpHitsByteStreamAuxCnv.h
@@ -38,13 +38,8 @@ class CpByteStreamV2Tool;
class CmxCpHitsByteStreamAuxCnv: public Converter, public ::AthMessaging {
- friend class CnvFactory<CmxCpHitsByteStreamAuxCnv>;
-
-protected:
-
- CmxCpHitsByteStreamAuxCnv(ISvcLocator* svcloc);
-
public:
+ CmxCpHitsByteStreamAuxCnv(ISvcLocator* svcloc);
virtual ~CmxCpHitsByteStreamAuxCnv(){};
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxCpHitsByteStreamxAODCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxCpHitsByteStreamxAODCnv.cxx
index 8b51d8d3502..ec95ed56afd 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxCpHitsByteStreamxAODCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxCpHitsByteStreamxAODCnv.cxx
@@ -13,7 +13,6 @@
#include "ByteStreamData/ROBData.h"
#include "AthenaKernel/errorcheck.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IOpaqueAddress.h"
#include "GaudiKernel/IRegistry.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxCpHitsByteStreamxAODCnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxCpHitsByteStreamxAODCnv.h
index 6d54a60787e..c1ac193cee7 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxCpHitsByteStreamxAODCnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxCpHitsByteStreamxAODCnv.h
@@ -33,13 +33,8 @@ namespace LVL1BS {
class CmxCpHitsByteStreamxAODCnv: public Converter, public ::AthMessaging {
- friend class CnvFactory<CmxCpHitsByteStreamxAODCnv>;
-
-protected:
-
- CmxCpHitsByteStreamxAODCnv(ISvcLocator* svcloc);
-
public:
+ CmxCpHitsByteStreamxAODCnv(ISvcLocator* svcloc);
virtual ~CmxCpHitsByteStreamxAODCnv(){};
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxCpTobByteStreamAuxCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxCpTobByteStreamAuxCnv.cxx
index 65acb6d2fd9..25b4f65f291 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxCpTobByteStreamAuxCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxCpTobByteStreamAuxCnv.cxx
@@ -22,7 +22,6 @@
#include "ByteStreamData/ROBData.h"
#include "AthenaKernel/errorcheck.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IOpaqueAddress.h"
#include "GaudiKernel/IRegistry.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxCpTobByteStreamAuxCnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxCpTobByteStreamAuxCnv.h
index e92c008118e..8c63be227e5 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxCpTobByteStreamAuxCnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxCpTobByteStreamAuxCnv.h
@@ -38,13 +38,8 @@ class CpByteStreamV2Tool;
class CmxCpTobByteStreamAuxCnv: public Converter, public ::AthMessaging {
- friend class CnvFactory<CmxCpTobByteStreamAuxCnv>;
-
-protected:
-
- CmxCpTobByteStreamAuxCnv(ISvcLocator* svcloc);
-
public:
+ CmxCpTobByteStreamAuxCnv(ISvcLocator* svcloc);
virtual ~CmxCpTobByteStreamAuxCnv(){};
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxCpTobByteStreamxAODCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxCpTobByteStreamxAODCnv.cxx
index 7a8309e38ed..615aa38c9ca 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxCpTobByteStreamxAODCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxCpTobByteStreamxAODCnv.cxx
@@ -13,7 +13,6 @@
#include "ByteStreamData/ROBData.h"
#include "AthenaKernel/errorcheck.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IOpaqueAddress.h"
#include "GaudiKernel/IRegistry.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxCpTobByteStreamxAODCnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxCpTobByteStreamxAODCnv.h
index 145e726c459..4ece851a0cb 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxCpTobByteStreamxAODCnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxCpTobByteStreamxAODCnv.h
@@ -33,13 +33,8 @@ namespace LVL1BS {
class CmxCpTobByteStreamxAODCnv: public Converter, public ::AthMessaging {
- friend class CnvFactory<CmxCpTobByteStreamxAODCnv>;
-
-protected:
-
- CmxCpTobByteStreamxAODCnv(ISvcLocator* svcloc);
-
public:
+ CmxCpTobByteStreamxAODCnv(ISvcLocator* svcloc);
virtual ~CmxCpTobByteStreamxAODCnv(){};
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxEtSumsByteStreamAuxCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxEtSumsByteStreamAuxCnv.cxx
index 90f00925464..148bc64b0ba 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxEtSumsByteStreamAuxCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxEtSumsByteStreamAuxCnv.cxx
@@ -22,7 +22,6 @@
#include "ByteStreamData/ROBData.h"
#include "AthenaKernel/errorcheck.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IOpaqueAddress.h"
#include "GaudiKernel/IRegistry.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxEtSumsByteStreamAuxCnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxEtSumsByteStreamAuxCnv.h
index d2d573dfb5f..14225c0f144 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxEtSumsByteStreamAuxCnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxEtSumsByteStreamAuxCnv.h
@@ -38,13 +38,8 @@ class JepByteStreamV2Tool;
class CmxEtSumsByteStreamAuxCnv: public Converter, public ::AthMessaging {
- friend class CnvFactory<CmxEtSumsByteStreamAuxCnv>;
-
-protected:
-
- CmxEtSumsByteStreamAuxCnv(ISvcLocator* svcloc);
-
public:
+ CmxEtSumsByteStreamAuxCnv(ISvcLocator* svcloc);
virtual ~CmxEtSumsByteStreamAuxCnv(){};
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxEtSumsByteStreamxAODCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxEtSumsByteStreamxAODCnv.cxx
index a65207d9c27..9981a14eb74 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxEtSumsByteStreamxAODCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxEtSumsByteStreamxAODCnv.cxx
@@ -13,7 +13,6 @@
#include "ByteStreamData/ROBData.h"
#include "AthenaKernel/errorcheck.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IOpaqueAddress.h"
#include "GaudiKernel/IRegistry.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxEtSumsByteStreamxAODCnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxEtSumsByteStreamxAODCnv.h
index e93d4826ea4..d8e70b3515c 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxEtSumsByteStreamxAODCnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxEtSumsByteStreamxAODCnv.h
@@ -33,13 +33,8 @@ namespace LVL1BS {
class CmxEtSumsByteStreamxAODCnv: public Converter, public ::AthMessaging {
- friend class CnvFactory<CmxEtSumsByteStreamxAODCnv>;
-
-protected:
-
- CmxEtSumsByteStreamxAODCnv(ISvcLocator* svcloc);
-
public:
+ CmxEtSumsByteStreamxAODCnv(ISvcLocator* svcloc);
virtual ~CmxEtSumsByteStreamxAODCnv(){};
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxJetHitsByteStreamAuxCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxJetHitsByteStreamAuxCnv.cxx
index a51fbc3f14f..d9c39851391 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxJetHitsByteStreamAuxCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxJetHitsByteStreamAuxCnv.cxx
@@ -22,7 +22,6 @@
#include "ByteStreamData/ROBData.h"
#include "AthenaKernel/errorcheck.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IOpaqueAddress.h"
#include "GaudiKernel/IRegistry.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxJetHitsByteStreamAuxCnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxJetHitsByteStreamAuxCnv.h
index a8f9b350aa2..bfd78a1ea31 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxJetHitsByteStreamAuxCnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxJetHitsByteStreamAuxCnv.h
@@ -38,13 +38,8 @@ class JepByteStreamV2Tool;
class CmxJetHitsByteStreamAuxCnv: public Converter, public ::AthMessaging {
- friend class CnvFactory<CmxJetHitsByteStreamAuxCnv>;
-
-protected:
-
- CmxJetHitsByteStreamAuxCnv(ISvcLocator* svcloc);
-
public:
+ CmxJetHitsByteStreamAuxCnv(ISvcLocator* svcloc);
virtual ~CmxJetHitsByteStreamAuxCnv(){};
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxJetHitsByteStreamxAODCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxJetHitsByteStreamxAODCnv.cxx
index 0fd7698b70b..260aefeb342 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxJetHitsByteStreamxAODCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxJetHitsByteStreamxAODCnv.cxx
@@ -13,7 +13,6 @@
#include "ByteStreamData/ROBData.h"
#include "AthenaKernel/errorcheck.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IOpaqueAddress.h"
#include "GaudiKernel/IRegistry.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxJetHitsByteStreamxAODCnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxJetHitsByteStreamxAODCnv.h
index 71bf4f34500..d5c1ae4d800 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxJetHitsByteStreamxAODCnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxJetHitsByteStreamxAODCnv.h
@@ -33,13 +33,8 @@ namespace LVL1BS {
class CmxJetHitsByteStreamxAODCnv: public Converter, public ::AthMessaging {
- friend class CnvFactory<CmxJetHitsByteStreamxAODCnv>;
-
-protected:
-
- CmxJetHitsByteStreamxAODCnv(ISvcLocator* svcloc);
-
public:
+ CmxJetHitsByteStreamxAODCnv(ISvcLocator* svcloc);
virtual ~CmxJetHitsByteStreamxAODCnv(){};
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxJetTobByteStreamAuxCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxJetTobByteStreamAuxCnv.cxx
index c214a188f3c..661fb1bd646 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxJetTobByteStreamAuxCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxJetTobByteStreamAuxCnv.cxx
@@ -22,7 +22,6 @@
#include "ByteStreamData/ROBData.h"
#include "AthenaKernel/errorcheck.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IOpaqueAddress.h"
#include "GaudiKernel/IRegistry.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxJetTobByteStreamAuxCnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxJetTobByteStreamAuxCnv.h
index ed4e0f791ba..bf0a72051a3 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxJetTobByteStreamAuxCnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxJetTobByteStreamAuxCnv.h
@@ -38,13 +38,8 @@ class JepByteStreamV2Tool;
class CmxJetTobByteStreamAuxCnv: public Converter, public ::AthMessaging {
- friend class CnvFactory<CmxJetTobByteStreamAuxCnv>;
-
-protected:
-
- CmxJetTobByteStreamAuxCnv(ISvcLocator* svcloc);
-
public:
+ CmxJetTobByteStreamAuxCnv(ISvcLocator* svcloc);
virtual ~CmxJetTobByteStreamAuxCnv(){};
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxJetTobByteStreamxAODCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxJetTobByteStreamxAODCnv.cxx
index 79c18101784..2213ef2e29c 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxJetTobByteStreamxAODCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxJetTobByteStreamxAODCnv.cxx
@@ -13,7 +13,6 @@
#include "ByteStreamData/ROBData.h"
#include "AthenaKernel/errorcheck.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IOpaqueAddress.h"
#include "GaudiKernel/IRegistry.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxJetTobByteStreamxAODCnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxJetTobByteStreamxAODCnv.h
index 81532aea051..b13fa32e113 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxJetTobByteStreamxAODCnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxJetTobByteStreamxAODCnv.h
@@ -33,13 +33,8 @@ namespace LVL1BS {
class CmxJetTobByteStreamxAODCnv: public Converter, public ::AthMessaging {
- friend class CnvFactory<CmxJetTobByteStreamxAODCnv>;
-
-protected:
-
- CmxJetTobByteStreamxAODCnv(ISvcLocator* svcloc);
-
public:
+ CmxJetTobByteStreamxAODCnv(ISvcLocator* svcloc);
virtual ~CmxJetTobByteStreamxAODCnv(){};
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxRoIByteStreamAuxCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxRoIByteStreamAuxCnv.cxx
index e6f1fac88cb..713f9457f4a 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxRoIByteStreamAuxCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxRoIByteStreamAuxCnv.cxx
@@ -22,7 +22,6 @@
#include "ByteStreamData/ROBData.h"
#include "AthenaKernel/errorcheck.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IOpaqueAddress.h"
#include "GaudiKernel/IRegistry.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxRoIByteStreamAuxCnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxRoIByteStreamAuxCnv.h
index 9a7e4e0e22b..b97f1888a92 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxRoIByteStreamAuxCnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxRoIByteStreamAuxCnv.h
@@ -38,13 +38,8 @@ class JepRoiByteStreamV2Tool;
class CmxRoIByteStreamAuxCnv: public Converter, public ::AthMessaging {
- friend class CnvFactory<CmxRoIByteStreamAuxCnv>;
-
-protected:
-
- CmxRoIByteStreamAuxCnv(ISvcLocator* svcloc);
-
public:
+ CmxRoIByteStreamAuxCnv(ISvcLocator* svcloc);
virtual ~CmxRoIByteStreamAuxCnv(){};
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxRoIByteStreamxAODCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxRoIByteStreamxAODCnv.cxx
index 8d76f208e06..f43cfd74e00 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxRoIByteStreamxAODCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxRoIByteStreamxAODCnv.cxx
@@ -13,7 +13,6 @@
#include "ByteStreamData/ROBData.h"
#include "AthenaKernel/errorcheck.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IOpaqueAddress.h"
#include "GaudiKernel/IRegistry.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxRoIByteStreamxAODCnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxRoIByteStreamxAODCnv.h
index 9172d47fcf4..f8e3904fd35 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxRoIByteStreamxAODCnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxRoIByteStreamxAODCnv.h
@@ -33,13 +33,8 @@ namespace LVL1BS {
class CmxRoIByteStreamxAODCnv: public Converter, public ::AthMessaging {
- friend class CnvFactory<CmxRoIByteStreamxAODCnv>;
-
-protected:
-
- CmxRoIByteStreamxAODCnv(ISvcLocator* svcloc);
-
public:
+ CmxRoIByteStreamxAODCnv(ISvcLocator* svcloc);
virtual ~CmxRoIByteStreamxAODCnv(){};
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CpmTobRoiByteStreamAuxCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CpmTobRoiByteStreamAuxCnv.cxx
index 3d546c443db..958e4b3cbb6 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CpmTobRoiByteStreamAuxCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CpmTobRoiByteStreamAuxCnv.cxx
@@ -22,7 +22,6 @@
#include "ByteStreamData/ROBData.h"
#include "AthenaKernel/errorcheck.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IOpaqueAddress.h"
#include "GaudiKernel/IRegistry.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CpmTobRoiByteStreamAuxCnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CpmTobRoiByteStreamAuxCnv.h
index fe919de2fc4..b0ea22ddd84 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CpmTobRoiByteStreamAuxCnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CpmTobRoiByteStreamAuxCnv.h
@@ -38,13 +38,8 @@ class CpmRoiByteStreamV2Tool;
class CpmTobRoiByteStreamAuxCnv: public Converter, public ::AthMessaging {
- friend class CnvFactory<CpmTobRoiByteStreamAuxCnv>;
-
-protected:
-
- CpmTobRoiByteStreamAuxCnv(ISvcLocator* svcloc);
-
public:
+ CpmTobRoiByteStreamAuxCnv(ISvcLocator* svcloc);
virtual ~CpmTobRoiByteStreamAuxCnv(){};
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CpmTobRoiByteStreamxAODCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CpmTobRoiByteStreamxAODCnv.cxx
index 064636f38d6..3c4a2325b48 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CpmTobRoiByteStreamxAODCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CpmTobRoiByteStreamxAODCnv.cxx
@@ -13,7 +13,6 @@
#include "ByteStreamData/ROBData.h"
#include "AthenaKernel/errorcheck.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IOpaqueAddress.h"
#include "GaudiKernel/IRegistry.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CpmTobRoiByteStreamxAODCnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CpmTobRoiByteStreamxAODCnv.h
index 3107c236894..5f9999263bf 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CpmTobRoiByteStreamxAODCnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CpmTobRoiByteStreamxAODCnv.h
@@ -33,13 +33,8 @@ namespace LVL1BS {
class CpmTobRoiByteStreamxAODCnv: public Converter, public ::AthMessaging {
- friend class CnvFactory<CpmTobRoiByteStreamxAODCnv>;
-
-protected:
-
- CpmTobRoiByteStreamxAODCnv(ISvcLocator* svcloc);
-
public:
+ CpmTobRoiByteStreamxAODCnv(ISvcLocator* svcloc);
virtual ~CpmTobRoiByteStreamxAODCnv(){};
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CpmTowerByteStreamAuxCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CpmTowerByteStreamAuxCnv.cxx
index 16a74c5ca16..7629f6f787d 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CpmTowerByteStreamAuxCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CpmTowerByteStreamAuxCnv.cxx
@@ -22,7 +22,6 @@
#include "ByteStreamData/ROBData.h"
#include "AthenaKernel/errorcheck.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IOpaqueAddress.h"
#include "GaudiKernel/IRegistry.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CpmTowerByteStreamAuxCnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CpmTowerByteStreamAuxCnv.h
index 60d916aad70..ffd49a943e3 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CpmTowerByteStreamAuxCnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CpmTowerByteStreamAuxCnv.h
@@ -38,13 +38,8 @@ class CpByteStreamV2Tool;
class CpmTowerByteStreamAuxCnv: public Converter, public ::AthMessaging {
- friend class CnvFactory<CpmTowerByteStreamAuxCnv>;
-
-protected:
-
- CpmTowerByteStreamAuxCnv(ISvcLocator* svcloc);
-
public:
+ CpmTowerByteStreamAuxCnv(ISvcLocator* svcloc);
virtual ~CpmTowerByteStreamAuxCnv(){};
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CpmTowerByteStreamxAODCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CpmTowerByteStreamxAODCnv.cxx
index 2f8347b392c..de3a380d21a 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CpmTowerByteStreamxAODCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CpmTowerByteStreamxAODCnv.cxx
@@ -13,7 +13,6 @@
#include "ByteStreamData/ROBData.h"
#include "AthenaKernel/errorcheck.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IOpaqueAddress.h"
#include "GaudiKernel/IRegistry.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CpmTowerByteStreamxAODCnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CpmTowerByteStreamxAODCnv.h
index 174c9e24f97..0401231c275 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CpmTowerByteStreamxAODCnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CpmTowerByteStreamxAODCnv.h
@@ -33,13 +33,8 @@ namespace LVL1BS {
class CpmTowerByteStreamxAODCnv: public Converter, public ::AthMessaging {
- friend class CnvFactory<CpmTowerByteStreamxAODCnv>;
-
-protected:
-
- CpmTowerByteStreamxAODCnv(ISvcLocator* svcloc);
-
public:
+ CpmTowerByteStreamxAODCnv(ISvcLocator* svcloc);
virtual ~CpmTowerByteStreamxAODCnv(){};
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JemEtSumsByteStreamAuxCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JemEtSumsByteStreamAuxCnv.cxx
index 32789e31eba..1f9bda1b7b1 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JemEtSumsByteStreamAuxCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JemEtSumsByteStreamAuxCnv.cxx
@@ -22,7 +22,6 @@
#include "ByteStreamData/ROBData.h"
#include "AthenaKernel/errorcheck.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IOpaqueAddress.h"
#include "GaudiKernel/IRegistry.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JemEtSumsByteStreamAuxCnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JemEtSumsByteStreamAuxCnv.h
index 2363a580f19..975ada118f7 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JemEtSumsByteStreamAuxCnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JemEtSumsByteStreamAuxCnv.h
@@ -38,13 +38,8 @@ class JepByteStreamV2Tool;
class JemEtSumsByteStreamAuxCnv: public Converter, public ::AthMessaging {
- friend class CnvFactory<JemEtSumsByteStreamAuxCnv>;
-
-protected:
-
- JemEtSumsByteStreamAuxCnv(ISvcLocator* svcloc);
-
public:
+ JemEtSumsByteStreamAuxCnv(ISvcLocator* svcloc);
virtual ~JemEtSumsByteStreamAuxCnv(){};
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JemEtSumsByteStreamxAODCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JemEtSumsByteStreamxAODCnv.cxx
index d8d6206d2f7..492a95f22df 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JemEtSumsByteStreamxAODCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JemEtSumsByteStreamxAODCnv.cxx
@@ -13,7 +13,6 @@
#include "ByteStreamData/ROBData.h"
#include "AthenaKernel/errorcheck.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IOpaqueAddress.h"
#include "GaudiKernel/IRegistry.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JemEtSumsByteStreamxAODCnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JemEtSumsByteStreamxAODCnv.h
index 1c4f24f9158..e152ff4731c 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JemEtSumsByteStreamxAODCnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JemEtSumsByteStreamxAODCnv.h
@@ -33,13 +33,8 @@ namespace LVL1BS {
class JemEtSumsByteStreamxAODCnv: public Converter, public ::AthMessaging {
- friend class CnvFactory<JemEtSumsByteStreamxAODCnv>;
-
-protected:
-
- JemEtSumsByteStreamxAODCnv(ISvcLocator* svcloc);
-
public:
+ JemEtSumsByteStreamxAODCnv(ISvcLocator* svcloc);
virtual ~JemEtSumsByteStreamxAODCnv(){};
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JemTobRoiByteStreamAuxCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JemTobRoiByteStreamAuxCnv.cxx
index e05b38752ac..c51e9acd266 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JemTobRoiByteStreamAuxCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JemTobRoiByteStreamAuxCnv.cxx
@@ -22,7 +22,6 @@
#include "ByteStreamData/ROBData.h"
#include "AthenaKernel/errorcheck.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IOpaqueAddress.h"
#include "GaudiKernel/IRegistry.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JemTobRoiByteStreamAuxCnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JemTobRoiByteStreamAuxCnv.h
index e2cce0397c7..0206ffc1b8d 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JemTobRoiByteStreamAuxCnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JemTobRoiByteStreamAuxCnv.h
@@ -38,13 +38,8 @@ class JepRoiByteStreamV2Tool;
class JemTobRoiByteStreamAuxCnv: public Converter, public ::AthMessaging {
- friend class CnvFactory<JemTobRoiByteStreamAuxCnv>;
-
-protected:
-
- JemTobRoiByteStreamAuxCnv(ISvcLocator* svcloc);
-
public:
+ JemTobRoiByteStreamAuxCnv(ISvcLocator* svcloc);
virtual ~JemTobRoiByteStreamAuxCnv(){};
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JemTobRoiByteStreamxAODCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JemTobRoiByteStreamxAODCnv.cxx
index 404e94862cb..d8f1e1250f3 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JemTobRoiByteStreamxAODCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JemTobRoiByteStreamxAODCnv.cxx
@@ -13,7 +13,6 @@
#include "ByteStreamData/ROBData.h"
#include "AthenaKernel/errorcheck.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IOpaqueAddress.h"
#include "GaudiKernel/IRegistry.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JemTobRoiByteStreamxAODCnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JemTobRoiByteStreamxAODCnv.h
index 774af9fe69a..7357271f9c7 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JemTobRoiByteStreamxAODCnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JemTobRoiByteStreamxAODCnv.h
@@ -33,13 +33,8 @@ namespace LVL1BS {
class JemTobRoiByteStreamxAODCnv: public Converter, public ::AthMessaging {
- friend class CnvFactory<JemTobRoiByteStreamxAODCnv>;
-
-protected:
-
- JemTobRoiByteStreamxAODCnv(ISvcLocator* svcloc);
-
public:
+ JemTobRoiByteStreamxAODCnv(ISvcLocator* svcloc);
virtual ~JemTobRoiByteStreamxAODCnv(){};
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JetElementByteStreamAuxCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JetElementByteStreamAuxCnv.cxx
index 79bb78defea..bf11abfa472 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JetElementByteStreamAuxCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JetElementByteStreamAuxCnv.cxx
@@ -22,7 +22,6 @@
#include "ByteStreamData/ROBData.h"
#include "AthenaKernel/errorcheck.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IOpaqueAddress.h"
#include "GaudiKernel/IRegistry.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JetElementByteStreamAuxCnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JetElementByteStreamAuxCnv.h
index 4019bee4b32..f74316cfa19 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JetElementByteStreamAuxCnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JetElementByteStreamAuxCnv.h
@@ -38,13 +38,8 @@ class JepByteStreamV2Tool;
class JetElementByteStreamAuxCnv: public Converter, public ::AthMessaging {
- friend class CnvFactory<JetElementByteStreamAuxCnv>;
-
-protected:
-
- JetElementByteStreamAuxCnv(ISvcLocator* svcloc);
-
public:
+ JetElementByteStreamAuxCnv(ISvcLocator* svcloc);
virtual ~JetElementByteStreamAuxCnv(){};
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JetElementByteStreamxAODCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JetElementByteStreamxAODCnv.cxx
index 599902e3a9e..1de8ae9b45a 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JetElementByteStreamxAODCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JetElementByteStreamxAODCnv.cxx
@@ -13,7 +13,6 @@
#include "ByteStreamData/ROBData.h"
#include "AthenaKernel/errorcheck.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IOpaqueAddress.h"
#include "GaudiKernel/IRegistry.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JetElementByteStreamxAODCnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JetElementByteStreamxAODCnv.h
index 3bd6c884518..c0ae4ea3478 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JetElementByteStreamxAODCnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JetElementByteStreamxAODCnv.h
@@ -33,13 +33,8 @@ namespace LVL1BS {
class JetElementByteStreamxAODCnv: public Converter, public ::AthMessaging {
- friend class CnvFactory<JetElementByteStreamxAODCnv>;
-
-protected:
-
- JetElementByteStreamxAODCnv(ISvcLocator* svcloc);
-
public:
+ JetElementByteStreamxAODCnv(ISvcLocator* svcloc);
virtual ~JetElementByteStreamxAODCnv(){};
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/L1CaloByteStreamAuxCnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/L1CaloByteStreamAuxCnv.h
index 75dd4412c0e..f6ef770b972 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/L1CaloByteStreamAuxCnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/L1CaloByteStreamAuxCnv.h
@@ -39,13 +39,8 @@ class L1CaloByteStreamReadTool;
template<typename ContainerT, typename AuxContainerT>
class L1CaloByteStreamAuxCnv: public Converter, public ::AthMessaging {
- friend class CnvFactory<L1CaloByteStreamAuxCnv<ContainerT, AuxContainerT> >;
-
-protected:
-
- L1CaloByteStreamAuxCnv(ISvcLocator* svcloc);
-
public:
+ L1CaloByteStreamAuxCnv(ISvcLocator* svcloc);
virtual ~L1CaloByteStreamAuxCnv(){};
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/L1CaloByteStreamAuxCnv.icc b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/L1CaloByteStreamAuxCnv.icc
index 2fe454469f8..a42c397e024 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/L1CaloByteStreamAuxCnv.icc
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/L1CaloByteStreamAuxCnv.icc
@@ -13,7 +13,6 @@
#include "ByteStreamData/ROBData.h"
#include "AthenaKernel/errorcheck.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IOpaqueAddress.h"
#include "GaudiKernel/IRegistry.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/PpmByteStreamAuxCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/PpmByteStreamAuxCnv.cxx
index 57e7f5fbea0..cf365a12525 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/PpmByteStreamAuxCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/PpmByteStreamAuxCnv.cxx
@@ -14,7 +14,6 @@
#include "ByteStreamData/ROBData.h"
#include "AthenaKernel/errorcheck.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IOpaqueAddress.h"
#include "GaudiKernel/IRegistry.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/PpmByteStreamAuxCnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/PpmByteStreamAuxCnv.h
index 16ac063fc6e..1fb8d5e28f3 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/PpmByteStreamAuxCnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/PpmByteStreamAuxCnv.h
@@ -38,13 +38,8 @@ class PpmByteStreamReadV1V2Tool;
class PpmByteStreamAuxCnv: public Converter, public ::AthMessaging {
- friend class CnvFactory<PpmByteStreamAuxCnv>;
-
-protected:
-
- PpmByteStreamAuxCnv(ISvcLocator* svcloc);
-
public:
+ PpmByteStreamAuxCnv(ISvcLocator* svcloc);
virtual ~PpmByteStreamAuxCnv(){};
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/PpmByteStreamxAODCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/PpmByteStreamxAODCnv.cxx
index 14c96277037..6fc8233e318 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/PpmByteStreamxAODCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/PpmByteStreamxAODCnv.cxx
@@ -13,7 +13,6 @@
#include "ByteStreamData/ROBData.h"
#include "AthenaKernel/errorcheck.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IOpaqueAddress.h"
#include "GaudiKernel/IRegistry.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/PpmByteStreamxAODCnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/PpmByteStreamxAODCnv.h
index 4c04ae8ce60..5e6b42981e0 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/PpmByteStreamxAODCnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/PpmByteStreamxAODCnv.h
@@ -41,13 +41,8 @@ namespace LVL1BS {
class PpmByteStreamxAODCnv: public Converter, public ::AthMessaging {
- friend class CnvFactory<PpmByteStreamxAODCnv>;
-
-protected:
-
- PpmByteStreamxAODCnv(ISvcLocator* svcloc);
-
public:
+ PpmByteStreamxAODCnv(ISvcLocator* svcloc);
virtual ~PpmByteStreamxAODCnv(){};
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/RodHeaderByteStreamAuxCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/RodHeaderByteStreamAuxCnv.cxx
index 27e07dbcd79..7be9bc15ebf 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/RodHeaderByteStreamAuxCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/RodHeaderByteStreamAuxCnv.cxx
@@ -22,7 +22,6 @@
#include "ByteStreamData/ROBData.h"
#include "AthenaKernel/errorcheck.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IOpaqueAddress.h"
#include "GaudiKernel/IRegistry.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/RodHeaderByteStreamAuxCnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/RodHeaderByteStreamAuxCnv.h
index e1bc43751b6..d2c292baac8 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/RodHeaderByteStreamAuxCnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/RodHeaderByteStreamAuxCnv.h
@@ -38,13 +38,8 @@ class RodHeaderByteStreamTool;
class RodHeaderByteStreamAuxCnv: public Converter, public ::AthMessaging {
- friend class CnvFactory<RodHeaderByteStreamAuxCnv>;
-
-protected:
-
- RodHeaderByteStreamAuxCnv(ISvcLocator* svcloc);
-
public:
+ RodHeaderByteStreamAuxCnv(ISvcLocator* svcloc);
virtual ~RodHeaderByteStreamAuxCnv(){};
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/RodHeaderByteStreamxAODCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/RodHeaderByteStreamxAODCnv.cxx
index 0d8469adb1f..baa2602145b 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/RodHeaderByteStreamxAODCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/RodHeaderByteStreamxAODCnv.cxx
@@ -13,7 +13,6 @@
#include "ByteStreamData/ROBData.h"
#include "AthenaKernel/errorcheck.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/IOpaqueAddress.h"
#include "GaudiKernel/IRegistry.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/RodHeaderByteStreamxAODCnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/RodHeaderByteStreamxAODCnv.h
index 5cd3a354727..b9a4e91b93e 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/RodHeaderByteStreamxAODCnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/RodHeaderByteStreamxAODCnv.h
@@ -33,13 +33,8 @@ namespace LVL1BS {
class RodHeaderByteStreamxAODCnv: public Converter, public ::AthMessaging {
- friend class CnvFactory<RodHeaderByteStreamxAODCnv>;
-
-protected:
-
- RodHeaderByteStreamxAODCnv(ISvcLocator* svcloc);
-
public:
+ RodHeaderByteStreamxAODCnv(ISvcLocator* svcloc);
virtual ~RodHeaderByteStreamxAODCnv(){};
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/test/TrigT1CaloByteStream_entries.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/test/TrigT1CaloByteStream_entries.cxx
index 7da72e22765..423796b56f1 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/test/TrigT1CaloByteStream_entries.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/test/TrigT1CaloByteStream_entries.cxx
@@ -121,36 +121,36 @@ typedef JepReadByteStreamV1V2Cnv<JEMEtSumsCollection> JepReadESByteStreamV1V2Cn
// declare
// Post-LS1
-DECLARE_CONVERTER_FACTORY( LVL1BS::CpByteStreamV2Cnv )
-DECLARE_CONVERTER_FACTORY( LVL1BS::CpmRoiByteStreamV2Cnv )
-DECLARE_CONVERTER_FACTORY( LVL1BS::CpReadCRByteStreamV2CnvT )
-DECLARE_CONVERTER_FACTORY( LVL1BS::CpReadCCByteStreamV2CnvT )
-DECLARE_CONVERTER_FACTORY( LVL1BS::JepByteStreamV2Cnv )
-DECLARE_CONVERTER_FACTORY( LVL1BS::JepRoiByteStreamV2Cnv )
-DECLARE_CONVERTER_FACTORY( LVL1BS::JepReadCTByteStreamV2CnvT )
-DECLARE_CONVERTER_FACTORY( LVL1BS::JepReadCJByteStreamV2CnvT )
-DECLARE_CONVERTER_FACTORY( LVL1BS::JepReadCEByteStreamV2CnvT )
-DECLARE_CONVERTER_FACTORY( LVL1BS::JepRoiReadJRByteStreamV2CnvT )
-DECLARE_CONVERTER_FACTORY( LVL1BS::JepRoiReadCRByteStreamV2CnvT )
+DECLARE_CONVERTER( LVL1BS::CpByteStreamV2Cnv )
+DECLARE_CONVERTER( LVL1BS::CpmRoiByteStreamV2Cnv )
+DECLARE_CONVERTER( LVL1BS::CpReadCRByteStreamV2CnvT )
+DECLARE_CONVERTER( LVL1BS::CpReadCCByteStreamV2CnvT )
+DECLARE_CONVERTER( LVL1BS::JepByteStreamV2Cnv )
+DECLARE_CONVERTER( LVL1BS::JepRoiByteStreamV2Cnv )
+DECLARE_CONVERTER( LVL1BS::JepReadCTByteStreamV2CnvT )
+DECLARE_CONVERTER( LVL1BS::JepReadCJByteStreamV2CnvT )
+DECLARE_CONVERTER( LVL1BS::JepReadCEByteStreamV2CnvT )
+DECLARE_CONVERTER( LVL1BS::JepRoiReadJRByteStreamV2CnvT )
+DECLARE_CONVERTER( LVL1BS::JepRoiReadCRByteStreamV2CnvT )
// Pre-LS1
-DECLARE_CONVERTER_FACTORY( LVL1BS::CpByteStreamV1Cnv )
-DECLARE_CONVERTER_FACTORY( LVL1BS::CpmRoiByteStreamV1Cnv )
-DECLARE_CONVERTER_FACTORY( LVL1BS::CpReadCHByteStreamV1CnvT )
-DECLARE_CONVERTER_FACTORY( LVL1BS::CpReadCCByteStreamV1CnvT )
-DECLARE_CONVERTER_FACTORY( LVL1BS::JepByteStreamV1Cnv )
-DECLARE_CONVERTER_FACTORY( LVL1BS::JepRoiByteStreamV1Cnv )
-DECLARE_CONVERTER_FACTORY( LVL1BS::JepReadCJByteStreamV1CnvT )
-DECLARE_CONVERTER_FACTORY( LVL1BS::JepReadCEByteStreamV1CnvT )
-DECLARE_CONVERTER_FACTORY( LVL1BS::JepReadJHByteStreamV1CnvT )
-DECLARE_CONVERTER_FACTORY( LVL1BS::JepRoiReadJRByteStreamV1CnvT )
-DECLARE_CONVERTER_FACTORY( LVL1BS::JepRoiReadCRByteStreamV1CnvT )
+DECLARE_CONVERTER( LVL1BS::CpByteStreamV1Cnv )
+DECLARE_CONVERTER( LVL1BS::CpmRoiByteStreamV1Cnv )
+DECLARE_CONVERTER( LVL1BS::CpReadCHByteStreamV1CnvT )
+DECLARE_CONVERTER( LVL1BS::CpReadCCByteStreamV1CnvT )
+DECLARE_CONVERTER( LVL1BS::JepByteStreamV1Cnv )
+DECLARE_CONVERTER( LVL1BS::JepRoiByteStreamV1Cnv )
+DECLARE_CONVERTER( LVL1BS::JepReadCJByteStreamV1CnvT )
+DECLARE_CONVERTER( LVL1BS::JepReadCEByteStreamV1CnvT )
+DECLARE_CONVERTER( LVL1BS::JepReadJHByteStreamV1CnvT )
+DECLARE_CONVERTER( LVL1BS::JepRoiReadJRByteStreamV1CnvT )
+DECLARE_CONVERTER( LVL1BS::JepRoiReadCRByteStreamV1CnvT )
// Both
-DECLARE_CONVERTER_FACTORY( LVL1BS::CpReadByteStreamV1V2Cnv )
-DECLARE_CONVERTER_FACTORY( LVL1BS::JepReadJEByteStreamV1V2CnvT )
-DECLARE_CONVERTER_FACTORY( LVL1BS::JepReadESByteStreamV1V2CnvT )
-//DECLARE_CONVERTER_FACTORY( LVL1BS::PpmByteStreamCnv )
-DECLARE_CONVERTER_FACTORY( LVL1BS::RodHeaderByteStreamCnv )
-DECLARE_CONVERTER_FACTORY( LVL1BS::L1CaloErrorByteStreamCnv )
+DECLARE_CONVERTER( LVL1BS::CpReadByteStreamV1V2Cnv )
+DECLARE_CONVERTER( LVL1BS::JepReadJEByteStreamV1V2CnvT )
+DECLARE_CONVERTER( LVL1BS::JepReadESByteStreamV1V2CnvT )
+//DECLARE_CONVERTER( LVL1BS::PpmByteStreamCnv )
+DECLARE_CONVERTER( LVL1BS::RodHeaderByteStreamCnv )
+DECLARE_CONVERTER( LVL1BS::L1CaloErrorByteStreamCnv )
// Post-LS1
DECLARE_COMPONENT( LVL1BS::CpByteStreamV2Tool )
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMCPHitsCollectionCnv.h b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMCPHitsCollectionCnv.h
index bc1fb339f30..72b57c0ebe9 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMCPHitsCollectionCnv.h
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMCPHitsCollectionCnv.h
@@ -24,14 +24,14 @@ typedef T_AthenaPoolCustomCnv<CMMCPHitsCollection, CMMCPHitsCollection_PERS> CMM
class CMMCPHitsCollectionCnv: public CMMCPHitsCollectionCnvBase {
friend class CnvFactory<CMMCPHitsCollectionCnv>;
-protected:
-
+public:
CMMCPHitsCollectionCnv (ISvcLocator* svcloc) :
CMMCPHitsCollectionCnvBase(svcloc),
m_msgSvc( msgSvc() ),
m_log( m_msgSvc, "CMMCPHitsCollectionCnv" )
{}
+protected:
~CMMCPHitsCollectionCnv() {}
virtual CMMCPHitsCollection_PERS* createPersistent (CMMCPHitsCollection* transCont);
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMEtSumsCollectionCnv.h b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMEtSumsCollectionCnv.h
index 38411675d4a..39436cbe5bd 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMEtSumsCollectionCnv.h
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMEtSumsCollectionCnv.h
@@ -24,14 +24,15 @@ typedef T_AthenaPoolCustomCnv<CMMEtSumsCollection, CMMEtSumsCollection_PERS> CMM
class CMMEtSumsCollectionCnv: public CMMEtSumsCollectionCnvBase {
friend class CnvFactory<CMMEtSumsCollectionCnv>;
-protected:
-
+public:
CMMEtSumsCollectionCnv (ISvcLocator* svcloc) :
CMMEtSumsCollectionCnvBase(svcloc),
m_msgSvc( msgSvc() ),
m_log( m_msgSvc, "CMMEtSumsCollectionCnv" )
{}
+protected:
+
~CMMEtSumsCollectionCnv() {}
virtual CMMEtSumsCollection_PERS* createPersistent (CMMEtSumsCollection* transCont);
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMJetHitsCollectionCnv.h b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMJetHitsCollectionCnv.h
index 56f38721549..25cb9e41166 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMJetHitsCollectionCnv.h
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMJetHitsCollectionCnv.h
@@ -24,14 +24,15 @@ typedef T_AthenaPoolCustomCnv<CMMJetHitsCollection, CMMJetHitsCollection_PERS> C
class CMMJetHitsCollectionCnv: public CMMJetHitsCollectionCnvBase {
friend class CnvFactory<CMMJetHitsCollectionCnv>;
-protected:
-
+public:
CMMJetHitsCollectionCnv (ISvcLocator* svcloc) :
CMMJetHitsCollectionCnvBase(svcloc),
m_msgSvc( msgSvc() ),
m_log( m_msgSvc, "CMMJetHitsCollectionCnv" )
{}
+protected:
+
~CMMJetHitsCollectionCnv() {}
virtual CMMJetHitsCollection_PERS* createPersistent (CMMJetHitsCollection* transCont);
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMRoICnv.h b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMRoICnv.h
index 1db05dfac17..78320f95466 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMRoICnv.h
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMRoICnv.h
@@ -25,7 +25,7 @@ typedef T_AthenaPoolCustomCnv<LVL1::CMMRoI, CMMRoI_PERS> CMMRoICnvBase;
class CMMRoICnv: public CMMRoICnvBase {
friend class CnvFactory<CMMRoICnv>;
-protected:
+public:
CMMRoICnv (ISvcLocator* svcloc) :
CMMRoICnvBase(svcloc),
@@ -33,6 +33,8 @@ protected:
m_log( m_msgSvc, "CMMRoICnv" )
{}
+protected:
+
~CMMRoICnv() {}
virtual CMMRoI_PERS* createPersistent (LVL1::CMMRoI* transCont);
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXCPHitsCollectionCnv.h b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXCPHitsCollectionCnv.h
index 16288019785..30c117096d5 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXCPHitsCollectionCnv.h
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXCPHitsCollectionCnv.h
@@ -24,7 +24,7 @@ typedef T_AthenaPoolCustomCnv<CMXCPHitsCollection, CMXCPHitsCollection_PERS> CMX
class CMXCPHitsCollectionCnv: public CMXCPHitsCollectionCnvBase {
friend class CnvFactory<CMXCPHitsCollectionCnv>;
-protected:
+public:
CMXCPHitsCollectionCnv (ISvcLocator* svcloc) :
CMXCPHitsCollectionCnvBase(svcloc),
@@ -32,6 +32,8 @@ protected:
m_log( m_msgSvc, "CMXCPHitsCollectionCnv" )
{}
+protected:
+
~CMXCPHitsCollectionCnv() {}
virtual CMXCPHitsCollection_PERS* createPersistent (CMXCPHitsCollection* transCont);
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXCPTobCollectionCnv.h b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXCPTobCollectionCnv.h
index bf24f923442..dd2900e7dd3 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXCPTobCollectionCnv.h
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXCPTobCollectionCnv.h
@@ -24,7 +24,7 @@ typedef T_AthenaPoolCustomCnv<CMXCPTobCollection, CMXCPTobCollection_PERS> CMXCP
class CMXCPTobCollectionCnv: public CMXCPTobCollectionCnvBase {
friend class CnvFactory<CMXCPTobCollectionCnv>;
-protected:
+public:
CMXCPTobCollectionCnv (ISvcLocator* svcloc) :
CMXCPTobCollectionCnvBase(svcloc),
@@ -32,6 +32,8 @@ protected:
m_log( m_msgSvc, "CMXCPTobCollectionCnv" )
{}
+protected:
+
~CMXCPTobCollectionCnv() {}
virtual CMXCPTobCollection_PERS* createPersistent (CMXCPTobCollection* transCont);
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXEtSumsCollectionCnv.h b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXEtSumsCollectionCnv.h
index ea4c68f3725..84ecbe143c8 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXEtSumsCollectionCnv.h
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXEtSumsCollectionCnv.h
@@ -24,7 +24,7 @@ typedef T_AthenaPoolCustomCnv<CMXEtSumsCollection, CMXEtSumsCollection_PERS> CMX
class CMXEtSumsCollectionCnv: public CMXEtSumsCollectionCnvBase {
friend class CnvFactory<CMXEtSumsCollectionCnv>;
-protected:
+public:
CMXEtSumsCollectionCnv (ISvcLocator* svcloc) :
CMXEtSumsCollectionCnvBase(svcloc),
@@ -32,6 +32,8 @@ protected:
m_log( m_msgSvc, "CMXEtSumsCollectionCnv" )
{}
+protected:
+
~CMXEtSumsCollectionCnv() {}
virtual CMXEtSumsCollection_PERS* createPersistent (CMXEtSumsCollection* transCont);
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXJetHitsCollectionCnv.h b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXJetHitsCollectionCnv.h
index 1afa6c5316b..3910476de68 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXJetHitsCollectionCnv.h
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXJetHitsCollectionCnv.h
@@ -24,7 +24,7 @@ typedef T_AthenaPoolCustomCnv<CMXJetHitsCollection, CMXJetHitsCollection_PERS> C
class CMXJetHitsCollectionCnv: public CMXJetHitsCollectionCnvBase {
friend class CnvFactory<CMXJetHitsCollectionCnv>;
-protected:
+public:
CMXJetHitsCollectionCnv (ISvcLocator* svcloc) :
CMXJetHitsCollectionCnvBase(svcloc),
@@ -32,6 +32,8 @@ protected:
m_log( m_msgSvc, "CMXJetHitsCollectionCnv" )
{}
+protected:
+
~CMXJetHitsCollectionCnv() {}
virtual CMXJetHitsCollection_PERS* createPersistent (CMXJetHitsCollection* transCont);
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXJetTobCollectionCnv.h b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXJetTobCollectionCnv.h
index 612e5ce584d..7a3025deced 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXJetTobCollectionCnv.h
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXJetTobCollectionCnv.h
@@ -24,7 +24,7 @@ typedef T_AthenaPoolCustomCnv<CMXJetTobCollection, CMXJetTobCollection_PERS> CMX
class CMXJetTobCollectionCnv: public CMXJetTobCollectionCnvBase {
friend class CnvFactory<CMXJetTobCollectionCnv>;
-protected:
+public:
CMXJetTobCollectionCnv (ISvcLocator* svcloc) :
CMXJetTobCollectionCnvBase(svcloc),
@@ -32,6 +32,8 @@ protected:
m_log( m_msgSvc, "CMXJetTobCollectionCnv" )
{}
+protected:
+
~CMXJetTobCollectionCnv() {}
virtual CMXJetTobCollection_PERS* createPersistent (CMXJetTobCollection* transCont);
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXRoICnv.h b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXRoICnv.h
index cacd9fdc4da..df070d2d880 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXRoICnv.h
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXRoICnv.h
@@ -25,14 +25,15 @@ typedef T_AthenaPoolCustomCnv<LVL1::CMXRoI, CMXRoI_PERS> CMXRoICnvBase;
class CMXRoICnv: public CMXRoICnvBase {
friend class CnvFactory<CMXRoICnv>;
-protected:
-
+public:
CMXRoICnv (ISvcLocator* svcloc) :
CMXRoICnvBase(svcloc),
m_msgSvc( msgSvc() ),
m_log( m_msgSvc, "CMXRoICnv" )
{}
+protected:
+
~CMXRoICnv() {}
virtual CMXRoI_PERS* createPersistent (LVL1::CMXRoI* transCont);
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMHitsCollectionCnv.h b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMHitsCollectionCnv.h
index fdfd604b5fc..33de0b1e9ca 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMHitsCollectionCnv.h
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMHitsCollectionCnv.h
@@ -24,7 +24,7 @@ typedef T_AthenaPoolCustomCnv<CPMHitsCollection, CPMHitsCollection_PERS> CPMHits
class CPMHitsCollectionCnv: public CPMHitsCollectionCnvBase {
friend class CnvFactory<CPMHitsCollectionCnv>;
-protected:
+public:
CPMHitsCollectionCnv (ISvcLocator* svcloc) :
CPMHitsCollectionCnvBase(svcloc),
@@ -32,6 +32,8 @@ protected:
m_log( m_msgSvc, "CPMHitsCollectionCnv" )
{}
+protected:
+
~CPMHitsCollectionCnv() {}
virtual CPMHitsCollection_PERS* createPersistent (CPMHitsCollection* transCont);
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMRoICollectionCnv.h b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMRoICollectionCnv.h
index ba009416df1..19bb0e9aaac 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMRoICollectionCnv.h
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMRoICollectionCnv.h
@@ -24,7 +24,7 @@ typedef T_AthenaPoolCustomCnv<CPMRoICollection, CPMRoICollection_PERS> CPMRoICol
class CPMRoICollectionCnv: public CPMRoICollectionCnvBase {
friend class CnvFactory<CPMRoICollectionCnv>;
-protected:
+public:
CPMRoICollectionCnv (ISvcLocator* svcloc) :
CPMRoICollectionCnvBase(svcloc),
@@ -32,6 +32,8 @@ protected:
m_log( m_msgSvc, "CPMRoICollectionCnv" )
{}
+protected:
+
~CPMRoICollectionCnv() {}
virtual CPMRoICollection_PERS* createPersistent (CPMRoICollection* transCont);
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMTobRoICollectionCnv.h b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMTobRoICollectionCnv.h
index 0887a88cc15..bfd55559b49 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMTobRoICollectionCnv.h
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMTobRoICollectionCnv.h
@@ -24,7 +24,7 @@ typedef T_AthenaPoolCustomCnv<CPMTobRoICollection, CPMTobRoICollection_PERS> CPM
class CPMTobRoICollectionCnv: public CPMTobRoICollectionCnvBase {
friend class CnvFactory<CPMTobRoICollectionCnv>;
-protected:
+public:
CPMTobRoICollectionCnv (ISvcLocator* svcloc) :
CPMTobRoICollectionCnvBase(svcloc),
@@ -32,6 +32,8 @@ protected:
m_log( m_msgSvc, "CPMTobRoICollectionCnv" )
{}
+protected:
+
~CPMTobRoICollectionCnv() {}
virtual CPMTobRoICollection_PERS* createPersistent (CPMTobRoICollection* transCont);
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMTowerCollectionCnv.h b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMTowerCollectionCnv.h
index 82381a73dbd..b9de36988f6 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMTowerCollectionCnv.h
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMTowerCollectionCnv.h
@@ -24,13 +24,15 @@ typedef T_AthenaPoolCustomCnv<CPMTowerCollection, CPMTowerCollection_PERS> CPMTo
class CPMTowerCollectionCnv: public CPMTowerCollectionCnvBase {
friend class CnvFactory<CPMTowerCollectionCnv>;
-protected:
+public:
CPMTowerCollectionCnv (ISvcLocator* svcloc) :
CPMTowerCollectionCnvBase(svcloc),
m_msgSvc( msgSvc() ),
m_log( m_msgSvc, "CPMTowerCollectionCnv" )
{}
+
+protected:
~CPMTowerCollectionCnv() {}
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CTP_RDOCnv.h b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CTP_RDOCnv.h
index b3d9d6186ab..60ea8949bca 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CTP_RDOCnv.h
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CTP_RDOCnv.h
@@ -34,7 +34,9 @@ class CTP_RDOCnv : public CTP_RDOCnvBase {
friend class CnvFactory< CTP_RDOCnv >;
protected:
+public:
CTP_RDOCnv( ISvcLocator* svcLoc ) : CTP_RDOCnvBase( svcLoc ) {}
+protected:
virtual CTP_RDO_PERS* createPersistent( CTP_RDO* transObj );
virtual CTP_RDO* createTransient();
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMEtSumsCollectionCnv.h b/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMEtSumsCollectionCnv.h
index 95882c24e42..14d6b253950 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMEtSumsCollectionCnv.h
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMEtSumsCollectionCnv.h
@@ -24,7 +24,7 @@ typedef T_AthenaPoolCustomCnv<JEMEtSumsCollection, JEMEtSumsCollection_PERS> JEM
class JEMEtSumsCollectionCnv: public JEMEtSumsCollectionCnvBase {
friend class CnvFactory<JEMEtSumsCollectionCnv>;
-protected:
+public:
JEMEtSumsCollectionCnv (ISvcLocator* svcloc) :
JEMEtSumsCollectionCnvBase(svcloc),
@@ -32,6 +32,8 @@ protected:
m_log( m_msgSvc, "JEMEtSumsCollectionCnv" )
{}
+protected:
+
~JEMEtSumsCollectionCnv() {}
virtual JEMEtSumsCollection_PERS* createPersistent (JEMEtSumsCollection* transCont);
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMHitsCollectionCnv.h b/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMHitsCollectionCnv.h
index 53006c15f4a..f7dbdfd25c2 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMHitsCollectionCnv.h
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMHitsCollectionCnv.h
@@ -24,13 +24,15 @@ typedef T_AthenaPoolCustomCnv<JEMHitsCollection, JEMHitsCollection_PERS> JEMHits
class JEMHitsCollectionCnv: public JEMHitsCollectionCnvBase {
friend class CnvFactory<JEMHitsCollectionCnv>;
-protected:
+public:
JEMHitsCollectionCnv (ISvcLocator* svcloc) :
JEMHitsCollectionCnvBase(svcloc),
m_msgSvc( msgSvc() ),
m_log( m_msgSvc, "JEMHitsCollectionCnv" )
{}
+
+protected:
~JEMHitsCollectionCnv() {}
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMRoICollectionCnv.h b/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMRoICollectionCnv.h
index 15df5e70760..528c05dd92a 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMRoICollectionCnv.h
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMRoICollectionCnv.h
@@ -24,7 +24,7 @@ typedef T_AthenaPoolCustomCnv<JEMRoICollection, JEMRoICollection_PERS> JEMRoICol
class JEMRoICollectionCnv: public JEMRoICollectionCnvBase {
friend class CnvFactory<JEMRoICollectionCnv>;
-protected:
+public:
JEMRoICollectionCnv (ISvcLocator* svcloc) :
JEMRoICollectionCnvBase(svcloc),
@@ -32,6 +32,8 @@ protected:
m_log( m_msgSvc, "JEMRoICollectionCnv" )
{}
+protected:
+
~JEMRoICollectionCnv() {}
virtual JEMRoICollection_PERS* createPersistent (JEMRoICollection* transCont);
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMTobRoICollectionCnv.h b/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMTobRoICollectionCnv.h
index 74729ad9dcd..4dade1dc789 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMTobRoICollectionCnv.h
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMTobRoICollectionCnv.h
@@ -24,13 +24,15 @@ typedef T_AthenaPoolCustomCnv<JEMTobRoICollection, JEMTobRoICollection_PERS> JEM
class JEMTobRoICollectionCnv: public JEMTobRoICollectionCnvBase {
friend class CnvFactory<JEMTobRoICollectionCnv>;
-protected:
+public:
JEMTobRoICollectionCnv (ISvcLocator* svcloc) :
JEMTobRoICollectionCnvBase(svcloc),
m_msgSvc( msgSvc() ),
m_log( m_msgSvc, "JEMTobRoICollectionCnv" )
{}
+
+protected:
~JEMTobRoICollectionCnv() {}
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/JetElementCollectionCnv.h b/Trigger/TrigT1/TrigT1EventAthenaPool/src/JetElementCollectionCnv.h
index 2374b4f232d..e9cba0dd9eb 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/JetElementCollectionCnv.h
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/JetElementCollectionCnv.h
@@ -24,13 +24,15 @@ typedef T_AthenaPoolCustomCnv<JetElementCollection, JetElementCollection_PERS> J
class JetElementCollectionCnv: public JetElementCollectionCnvBase {
friend class CnvFactory<JetElementCollectionCnv>;
-protected:
+public:
JetElementCollectionCnv (ISvcLocator* svcloc) :
JetElementCollectionCnvBase(svcloc),
m_msgSvc( msgSvc() ),
m_log( m_msgSvc, "JetElementCollectionCnv" )
{}
+
+protected:
~JetElementCollectionCnv() {}
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/MuCTPI_RDOCnv.h b/Trigger/TrigT1/TrigT1EventAthenaPool/src/MuCTPI_RDOCnv.h
index bd908e67d7b..2aa8faa8050 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/MuCTPI_RDOCnv.h
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/MuCTPI_RDOCnv.h
@@ -33,7 +33,9 @@ class MuCTPI_RDOCnv : public MuCTPI_RDOCnvBase {
friend class CnvFactory< MuCTPI_RDOCnv >;
protected:
+public:
MuCTPI_RDOCnv( ISvcLocator* svcLoc ) : MuCTPI_RDOCnvBase( svcLoc ) {}
+protected:
virtual MuCTPI_RDO_PERS* createPersistent( MuCTPI_RDO* transObj );
virtual MuCTPI_RDO* createTransient();
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/RODHeaderCollectionCnv.h b/Trigger/TrigT1/TrigT1EventAthenaPool/src/RODHeaderCollectionCnv.h
index 805584d9ccb..ceac1a8184a 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/RODHeaderCollectionCnv.h
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/RODHeaderCollectionCnv.h
@@ -24,13 +24,15 @@ typedef T_AthenaPoolCustomCnv<RODHeaderCollection, RODHeaderCollection_PERS> ROD
class RODHeaderCollectionCnv: public RODHeaderCollectionCnvBase {
friend class CnvFactory<RODHeaderCollectionCnv>;
-protected:
+public:
RODHeaderCollectionCnv (ISvcLocator* svcloc) :
RODHeaderCollectionCnvBase(svcloc),
m_msgSvc( msgSvc() ),
m_log( m_msgSvc, "RODHeaderCollectionCnv" )
{}
+
+protected:
~RODHeaderCollectionCnv() {}
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/RoIBResultCnv.h b/Trigger/TrigT1/TrigT1EventAthenaPool/src/RoIBResultCnv.h
old mode 100755
new mode 100644
index 5e2e1c8ec8e..a07e959890e
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/RoIBResultCnv.h
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/RoIBResultCnv.h
@@ -33,7 +33,9 @@ class RoIBResultCnv : public RoIBResultCnvBase {
friend class CnvFactory< RoIBResultCnv >;
protected:
+public:
RoIBResultCnv( ISvcLocator* svcLoc ) : RoIBResultCnvBase( svcLoc ) {}
+protected:
virtual RoIBResult_PERS* createPersistent( ROIB::RoIBResult* transObj );
virtual ROIB::RoIBResult* createTransient();
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/TriggerTowerCollectionCnv.h b/Trigger/TrigT1/TrigT1EventAthenaPool/src/TriggerTowerCollectionCnv.h
index 9cc6bd19ee1..31b3ebe3c56 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/TriggerTowerCollectionCnv.h
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/TriggerTowerCollectionCnv.h
@@ -24,7 +24,7 @@ typedef T_AthenaPoolCustomCnv<TriggerTowerCollection, TriggerTowerCollection_PER
class TriggerTowerCollectionCnv: public TriggerTowerCollectionCnvBase {
friend class CnvFactory<TriggerTowerCollectionCnv>;
-protected:
+public:
TriggerTowerCollectionCnv (ISvcLocator* svcloc) :
TriggerTowerCollectionCnvBase(svcloc),
@@ -32,6 +32,8 @@ protected:
m_log( m_msgSvc, "TriggerTowerCollectionCnv" )
{}
+protected:
+
~TriggerTowerCollectionCnv() {}
virtual TriggerTowerCollection_PERS* createPersistent (TriggerTowerCollection* transCont);
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/CTPByteStreamCnv.h b/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/CTPByteStreamCnv.h
index 976f25987d1..98cf450d92e 100755
--- a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/CTPByteStreamCnv.h
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/CTPByteStreamCnv.h
@@ -9,7 +9,6 @@
// Gaudi/Athena include(s):
#include "GaudiKernel/Converter.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h"
@@ -40,13 +39,10 @@ extern long ByteStream_StorageType;
*/
class CTPByteStreamCnv : public Converter {
- friend class CnvFactory< CTPByteStreamCnv >;
-
-protected:
+public:
/// Standard constructor
CTPByteStreamCnv( ISvcLocator* svcloc );
-public:
/// Standard destructor
~CTPByteStreamCnv();
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/MuCTPIByteStreamCnv.h b/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/MuCTPIByteStreamCnv.h
index d7cd79b0ce6..4e95eaf6160 100755
--- a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/MuCTPIByteStreamCnv.h
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/MuCTPIByteStreamCnv.h
@@ -11,7 +11,6 @@
// Gaudi/Athena include(s):
#include "GaudiKernel/Converter.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h"
@@ -52,13 +51,10 @@ extern long ByteStream_StorageType;
*/
class MuCTPIByteStreamCnv : public Converter {
- friend class CnvFactory< MuCTPIByteStreamCnv >;
-
-protected:
+public:
/// Standard constructor
MuCTPIByteStreamCnv( ISvcLocator* svcloc );
-public:
/// Standard destructor
~MuCTPIByteStreamCnv();
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecCTPByteStreamCnv.h b/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecCTPByteStreamCnv.h
index 1d0eca2b81f..e8ab5a37bb0 100755
--- a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecCTPByteStreamCnv.h
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecCTPByteStreamCnv.h
@@ -9,7 +9,6 @@
// Gaudi/Athena include(s):
#include "GaudiKernel/Converter.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h"
@@ -40,13 +39,10 @@ extern long ByteStream_StorageType;
*/
class RecCTPByteStreamCnv : public Converter {
- friend class CnvFactory< RecCTPByteStreamCnv >;
-
-protected:
+public:
/// Standard constructor
RecCTPByteStreamCnv(ISvcLocator* svcloc);
-public:
/// Standard destructor
~RecCTPByteStreamCnv();
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecMuCTPIByteStreamCnv.h b/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecMuCTPIByteStreamCnv.h
index c785cc7fd09..093c57fd33f 100755
--- a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecMuCTPIByteStreamCnv.h
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecMuCTPIByteStreamCnv.h
@@ -9,7 +9,6 @@
// Gaudi/Athena include(s):
#include "GaudiKernel/Converter.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h"
@@ -42,13 +41,10 @@ extern long ByteStream_StorageType;
*/
class RecMuCTPIByteStreamCnv : public Converter {
- friend class CnvFactory< RecMuCTPIByteStreamCnv >;
-
-protected:
+public:
/// Standard constructor
RecMuCTPIByteStreamCnv( ISvcLocator* svcloc );
-public:
/// Standard destructor
~RecMuCTPIByteStreamCnv();
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecRoIBResultByteStreamCnv.h b/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecRoIBResultByteStreamCnv.h
index 50d8b285af4..ece0869796f 100755
--- a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecRoIBResultByteStreamCnv.h
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecRoIBResultByteStreamCnv.h
@@ -9,7 +9,6 @@
// Gaudi/Athena include(s):
#include "GaudiKernel/Converter.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/ToolHandle.h"
// Local include(s):
@@ -35,13 +34,10 @@ extern long ByteStream_StorageType;
template< class ROBF >
class RecRoIBResultByteStreamCnv : public Converter {
- friend class CnvFactory< RecRoIBResultByteStreamCnv< ROBF > >;
-
-protected:
+public:
/// Standard constructor
RecRoIBResultByteStreamCnv( ISvcLocator* svcloc );
-public:
/// Function connecting to all the needed services/tools
virtual StatusCode initialize();
/// Function creating the RecRoIBResult object from the RoIB ROB fragments
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RoIBResultByteStreamCnv.h b/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RoIBResultByteStreamCnv.h
index 1284dbf21db..2bfc6ebecfa 100755
--- a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RoIBResultByteStreamCnv.h
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RoIBResultByteStreamCnv.h
@@ -9,7 +9,6 @@
// Gaudi/Athena include(s):
#include "GaudiKernel/Converter.h"
-#include "GaudiKernel/CnvFactory.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h"
@@ -40,13 +39,9 @@ extern long ByteStream_StorageType;
template< class ROBF >
class RoIBResultByteStreamCnv : public Converter {
- friend class CnvFactory< RoIBResultByteStreamCnv< ROBF > >;
-
-protected:
+public:
/// Standard constructor
RoIBResultByteStreamCnv( ISvcLocator* svcloc );
-
-public:
/// Function connecting to all the needed services/tools
virtual StatusCode initialize();
/// Function creating the RoIBResult object from the multiple ROB fragments
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/src/components/TrigT1ResultByteStream_entries.cxx b/Trigger/TrigT1/TrigT1ResultByteStream/src/components/TrigT1ResultByteStream_entries.cxx
index cc564a2ea38..2f2e7589d1f 100644
--- a/Trigger/TrigT1/TrigT1ResultByteStream/src/components/TrigT1ResultByteStream_entries.cxx
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/src/components/TrigT1ResultByteStream_entries.cxx
@@ -25,12 +25,12 @@ typedef RecRoIBResultByteStreamCnv<ROBF> RecRoIBResultByteStreamCnvT ;
// converter.
// declare
-DECLARE_CONVERTER_FACTORY( RoIBResultByteStreamCnvT )
-DECLARE_CONVERTER_FACTORY( RecRoIBResultByteStreamCnvT )
-DECLARE_CONVERTER_FACTORY( MuCTPIByteStreamCnv )
-DECLARE_CONVERTER_FACTORY( CTPByteStreamCnv )
-DECLARE_CONVERTER_FACTORY( RecMuCTPIByteStreamCnv )
-DECLARE_CONVERTER_FACTORY( RecCTPByteStreamCnv )
+DECLARE_CONVERTER( RoIBResultByteStreamCnvT )
+DECLARE_CONVERTER( RecRoIBResultByteStreamCnvT )
+DECLARE_CONVERTER( MuCTPIByteStreamCnv )
+DECLARE_CONVERTER( CTPByteStreamCnv )
+DECLARE_CONVERTER( RecMuCTPIByteStreamCnv )
+DECLARE_CONVERTER( RecCTPByteStreamCnv )
DECLARE_COMPONENT( CTPByteStreamTool )
DECLARE_COMPONENT( MuCTPIByteStreamTool )
diff --git a/Trigger/TrigTools/TrigInDetRecoTools/src/TrigInDetRoadMakerTool.cxx b/Trigger/TrigTools/TrigInDetRecoTools/src/TrigInDetRoadMakerTool.cxx
index 28980c64473..6cadf1a62ae 100644
--- a/Trigger/TrigTools/TrigInDetRecoTools/src/TrigInDetRoadMakerTool.cxx
+++ b/Trigger/TrigTools/TrigInDetRecoTools/src/TrigInDetRoadMakerTool.cxx
@@ -5,7 +5,6 @@
#include <cmath>
#include <iostream>
#include <list>
-//#include "GaudiKernel/ToolFactory.h"
#include "IRegionSelector/IRoiDescriptor.h"
//#include "InDetIdentifier/PixelID.h"
//#include "InDetIdentifier/SCT_ID.h"
diff --git a/Trigger/TrigTools/TrigInDetRecoTools/src/TrigL2PattRecoStrategyA.cxx b/Trigger/TrigTools/TrigInDetRecoTools/src/TrigL2PattRecoStrategyA.cxx
index 77ea44813e9..31b7f7b8a25 100644
--- a/Trigger/TrigTools/TrigInDetRecoTools/src/TrigL2PattRecoStrategyA.cxx
+++ b/Trigger/TrigTools/TrigInDetRecoTools/src/TrigL2PattRecoStrategyA.cxx
@@ -19,7 +19,6 @@
#include <cmath>
//#include <iostream>
//#include <list>
-//#include "GaudiKernel/ToolFactory.h"
//#include "StoreGate/DataHandle.h"
#include "AthenaKernel/Timeout.h"
diff --git a/Trigger/TrigTools/TrigInDetRecoTools/src/TrigL2PattRecoStrategyB.cxx b/Trigger/TrigTools/TrigInDetRecoTools/src/TrigL2PattRecoStrategyB.cxx
index 664bd28c946..51651bbc557 100644
--- a/Trigger/TrigTools/TrigInDetRecoTools/src/TrigL2PattRecoStrategyB.cxx
+++ b/Trigger/TrigTools/TrigInDetRecoTools/src/TrigL2PattRecoStrategyB.cxx
@@ -21,7 +21,6 @@
#include <list>
#include <algorithm>
#include <iterator>
-//#include "GaudiKernel/ToolFactory.h"
#include "TrigInDetEvent/TrigInDetTrack.h"
#include "TrigInDetEvent/TrigInDetTrackCollection.h"
diff --git a/Trigger/TrigTools/TrigInDetRecoTools/src/TrigL2PattRecoStrategyC.cxx b/Trigger/TrigTools/TrigInDetRecoTools/src/TrigL2PattRecoStrategyC.cxx
index 790ee2e252b..58befccb444 100644
--- a/Trigger/TrigTools/TrigInDetRecoTools/src/TrigL2PattRecoStrategyC.cxx
+++ b/Trigger/TrigTools/TrigInDetRecoTools/src/TrigL2PattRecoStrategyC.cxx
@@ -20,7 +20,6 @@
#include <cmath>
#include <iostream>
#include <list>
-//#include "GaudiKernel/ToolFactory.h"
//#include "StoreGate/DataHandle.h"
#include "TrigInDetEvent/TrigInDetTrack.h"
diff --git a/Trigger/TrigTools/TrigInDetRecoTools/src/TrigL2PattRecoStrategyF.cxx b/Trigger/TrigTools/TrigInDetRecoTools/src/TrigL2PattRecoStrategyF.cxx
index d781495027b..73e0019649a 100644
--- a/Trigger/TrigTools/TrigInDetRecoTools/src/TrigL2PattRecoStrategyF.cxx
+++ b/Trigger/TrigTools/TrigInDetRecoTools/src/TrigL2PattRecoStrategyF.cxx
@@ -20,7 +20,6 @@
#include <cmath>
#include <iostream>
#include <list>
-//#include "GaudiKernel/ToolFactory.h"
#include "TrigInDetEvent/TrigInDetTrack.h"
#include "TrigInDetEvent/TrigInDetTrackCollection.h"
diff --git a/Trigger/TrigTools/TrigInDetRecoTools/src/TrigL2PattRecoStrategyT.cxx b/Trigger/TrigTools/TrigInDetRecoTools/src/TrigL2PattRecoStrategyT.cxx
index bff6ce578a7..1a11a02a2b8 100644
--- a/Trigger/TrigTools/TrigInDetRecoTools/src/TrigL2PattRecoStrategyT.cxx
+++ b/Trigger/TrigTools/TrigInDetRecoTools/src/TrigL2PattRecoStrategyT.cxx
@@ -20,7 +20,6 @@
#include <cmath>
#include <iostream>
#include <list>
-//#include "GaudiKernel/ToolFactory.h"
#include "TrigInDetEvent/TrigInDetTrack.h"
#include "TrigInDetEvent/TrigInDetTrackCollection.h"
diff --git a/Trigger/TrigTools/TrigInDetTrackExtrapolator/src/TrigInDetTrackExtrapolator.cxx b/Trigger/TrigTools/TrigInDetTrackExtrapolator/src/TrigInDetTrackExtrapolator.cxx
index 42277e28021..29b6906884a 100755
--- a/Trigger/TrigTools/TrigInDetTrackExtrapolator/src/TrigInDetTrackExtrapolator.cxx
+++ b/Trigger/TrigTools/TrigInDetTrackExtrapolator/src/TrigInDetTrackExtrapolator.cxx
@@ -17,7 +17,6 @@
#include <cmath>
#include <iostream>
-#include "GaudiKernel/ToolFactory.h"
#include "GaudiKernel/SystemOfUnits.h"
#include "TrigInDetEvent/TrigInDetTrack.h"
diff --git a/Trigger/TrigTools/TrigInDetTrackFitter/src/TrigL2HighPtTrackFitter.cxx b/Trigger/TrigTools/TrigInDetTrackFitter/src/TrigL2HighPtTrackFitter.cxx
index 64d8604ece3..86bbbf81ec8 100644
--- a/Trigger/TrigTools/TrigInDetTrackFitter/src/TrigL2HighPtTrackFitter.cxx
+++ b/Trigger/TrigTools/TrigInDetTrackFitter/src/TrigL2HighPtTrackFitter.cxx
@@ -17,7 +17,6 @@
#include <cmath>
#include <iostream>
-#include "GaudiKernel/ToolFactory.h"
#include "TrkSurfaces/Surface.h"
#include "TrkSurfaces/PlaneSurface.h"
diff --git a/Trigger/TrigTools/TrigInDetTrackFitter/src/TrigL2LowPtTrackFitter.cxx b/Trigger/TrigTools/TrigInDetTrackFitter/src/TrigL2LowPtTrackFitter.cxx
index aac70f3d72a..fa672dd0476 100644
--- a/Trigger/TrigTools/TrigInDetTrackFitter/src/TrigL2LowPtTrackFitter.cxx
+++ b/Trigger/TrigTools/TrigInDetTrackFitter/src/TrigL2LowPtTrackFitter.cxx
@@ -18,7 +18,6 @@
#include <iostream>
#include <string.h>
-#include "GaudiKernel/ToolFactory.h"
#include "TrkSurfaces/Surface.h"
#include "TrkSurfaces/PlaneSurface.h"
diff --git a/Trigger/TrigTools/TrigInDetTrackFitter/src/TrigL2ResidualCalculator.cxx b/Trigger/TrigTools/TrigInDetTrackFitter/src/TrigL2ResidualCalculator.cxx
index 5baadc29be1..d5f59dfad60 100644
--- a/Trigger/TrigTools/TrigInDetTrackFitter/src/TrigL2ResidualCalculator.cxx
+++ b/Trigger/TrigTools/TrigInDetTrackFitter/src/TrigL2ResidualCalculator.cxx
@@ -17,7 +17,6 @@
#include <cmath>
#include <iostream>
-#include "GaudiKernel/ToolFactory.h"
#include "GaudiKernel/SystemOfUnits.h"
#include "AtlasDetDescr/AtlasDetectorID.h"
diff --git a/Trigger/TrigTools/TrigInDetVxInJetTool/src/TrigInDetVxInJetTool.cxx b/Trigger/TrigTools/TrigInDetVxInJetTool/src/TrigInDetVxInJetTool.cxx
index 82c6392239d..56178078fae 100755
--- a/Trigger/TrigTools/TrigInDetVxInJetTool/src/TrigInDetVxInJetTool.cxx
+++ b/Trigger/TrigTools/TrigInDetVxInJetTool/src/TrigInDetVxInJetTool.cxx
@@ -8,7 +8,6 @@
#include "TrigInDetEvent/TrigVertex.h"
#include "TMath.h"
-#include "GaudiKernel/ToolFactory.h"
#include<iostream>
diff --git a/Trigger/TrigTools/TrigMuonBackExtrapolator/src/TrigMuonBackExtrapolator.cxx b/Trigger/TrigTools/TrigMuonBackExtrapolator/src/TrigMuonBackExtrapolator.cxx
index 9c210e997df..3e2bf284f03 100644
--- a/Trigger/TrigTools/TrigMuonBackExtrapolator/src/TrigMuonBackExtrapolator.cxx
+++ b/Trigger/TrigTools/TrigMuonBackExtrapolator/src/TrigMuonBackExtrapolator.cxx
@@ -3,7 +3,6 @@
*/
#include <iostream>
-#include "GaudiKernel/ToolFactory.h"
#include "TrigMuonBackExtrapolator/TrigMuonBackExtrapolator.h"
#include "TrigMuonBackExtrapolator/BackExtrapolator.h"
diff --git a/Trigger/TrigTools/TrigMuonRoITools/src/TrigMuonRoITool.cxx b/Trigger/TrigTools/TrigMuonRoITools/src/TrigMuonRoITool.cxx
index 2a0cf7ccde0..f5b4c8a7792 100644
--- a/Trigger/TrigTools/TrigMuonRoITools/src/TrigMuonRoITool.cxx
+++ b/Trigger/TrigTools/TrigMuonRoITools/src/TrigMuonRoITool.cxx
@@ -3,7 +3,6 @@
*/
#include "TrigMuonRoITool.h"
-#include "GaudiKernel/ToolFactory.h"
#include "ByteStreamCnvSvcBase/IROBDataProviderSvc.h"
#include "TrigT1Result/RoIBResult.h"
#include "TrigT1Result/MuCTPI_RDO.h"
diff --git a/Trigger/TrigTools/TrigOnlineSpacePointTool/src/PixelSpacePointTool.cxx b/Trigger/TrigTools/TrigOnlineSpacePointTool/src/PixelSpacePointTool.cxx
index f0c1d29bc50..99424f71427 100755
--- a/Trigger/TrigTools/TrigOnlineSpacePointTool/src/PixelSpacePointTool.cxx
+++ b/Trigger/TrigTools/TrigOnlineSpacePointTool/src/PixelSpacePointTool.cxx
@@ -5,7 +5,6 @@
#include "TrigInDetEvent/TrigSiSpacePointCollection.h"
#include "InDetBeamSpotService/IBeamCondSvc.h"
#include "TrigOnlineSpacePointTool/PixelSpacePointTool.h"
-#include "GaudiKernel/ToolFactory.h"
#include "AthenaBaseComps/AthMsgStreamMacros.h"
#include "InDetIdentifier/PixelID.h"
#include "Identifier/IdentifierHash.h"
diff --git a/Trigger/TrigTools/TrigOnlineSpacePointTool/src/SCT_ClusterCacheTool.cxx b/Trigger/TrigTools/TrigOnlineSpacePointTool/src/SCT_ClusterCacheTool.cxx
index 02ef64a1695..65cef3a6e18 100755
--- a/Trigger/TrigTools/TrigOnlineSpacePointTool/src/SCT_ClusterCacheTool.cxx
+++ b/Trigger/TrigTools/TrigOnlineSpacePointTool/src/SCT_ClusterCacheTool.cxx
@@ -2,7 +2,6 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#include "GaudiKernel/ToolFactory.h"
#include "TrigTimeAlgs/TrigTimerSvc.h"
#include "InDetPrepRawData/SCT_ClusterCollection.h"
#include "SCT_RawDataByteStreamCnv/ISCT_RodDecoder.h"
diff --git a/Trigger/TrigTools/TrigOnlineSpacePointTool/src/SCT_SpacePointTool.cxx b/Trigger/TrigTools/TrigOnlineSpacePointTool/src/SCT_SpacePointTool.cxx
index 94b400b5971..677511bf7b2 100755
--- a/Trigger/TrigTools/TrigOnlineSpacePointTool/src/SCT_SpacePointTool.cxx
+++ b/Trigger/TrigTools/TrigOnlineSpacePointTool/src/SCT_SpacePointTool.cxx
@@ -5,7 +5,6 @@
#include "TrigInDetEvent/TrigSiSpacePointCollection.h"
#include "InDetBeamSpotService/IBeamCondSvc.h"
#include "TrigOnlineSpacePointTool/SCT_SpacePointTool.h"
-#include "GaudiKernel/ToolFactory.h"
#include "AthenaBaseComps/AthMsgStreamMacros.h"
#include "Identifier/IdentifierHash.h"
#include <string>
diff --git a/Trigger/TrigTools/TrigTRT_TrackExtensionTool/src/TrigMagneticFieldTool.cxx b/Trigger/TrigTools/TrigTRT_TrackExtensionTool/src/TrigMagneticFieldTool.cxx
index 5cfe4875849..7c438eff9ba 100755
--- a/Trigger/TrigTools/TrigTRT_TrackExtensionTool/src/TrigMagneticFieldTool.cxx
+++ b/Trigger/TrigTools/TrigTRT_TrackExtensionTool/src/TrigMagneticFieldTool.cxx
@@ -2,7 +2,6 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#include "GaudiKernel/ToolFactory.h"
#include "GaudiKernel/MsgStream.h"
#include "MagFieldInterfaces/IMagFieldSvc.h"
#include "GaudiKernel/SystemOfUnits.h"
diff --git a/Trigger/TrigTools/TrigTRT_TrackExtensionTool/src/TrigTRT_CombinedExtensionTool.cxx b/Trigger/TrigTools/TrigTRT_TrackExtensionTool/src/TrigTRT_CombinedExtensionTool.cxx
index 3a7e4b39174..3f43402aefd 100644
--- a/Trigger/TrigTools/TrigTRT_TrackExtensionTool/src/TrigTRT_CombinedExtensionTool.cxx
+++ b/Trigger/TrigTools/TrigTRT_TrackExtensionTool/src/TrigTRT_CombinedExtensionTool.cxx
@@ -18,7 +18,6 @@
#include <iostream>
#include <algorithm>
-#include "GaudiKernel/ToolFactory.h"
//#include "RegionSelector/RegSelSvc.h"
#include "IRegionSelector/IRegSelSvc.h"
#include "TrigInDetEvent/TrigInDetTrack.h"
diff --git a/Trigger/TrigTools/TrigTRT_TrackExtensionTool/src/TrigTRT_DetElementRoadTool.cxx b/Trigger/TrigTools/TrigTRT_TrackExtensionTool/src/TrigTRT_DetElementRoadTool.cxx
index c5e2a22516d..96ae135d287 100755
--- a/Trigger/TrigTools/TrigTRT_TrackExtensionTool/src/TrigTRT_DetElementRoadTool.cxx
+++ b/Trigger/TrigTools/TrigTRT_TrackExtensionTool/src/TrigTRT_DetElementRoadTool.cxx
@@ -2,7 +2,6 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#include "GaudiKernel/ToolFactory.h"
#include "GaudiKernel/MsgStream.h"
#include "InDetIdentifier/TRT_ID.h"
#include "Identifier/IdentifierHash.h"
diff --git a/Trigger/TrigTools/TrigTRT_TrackExtensionTool/src/TrigTRT_TrackExtensionTool.cxx b/Trigger/TrigTools/TrigTRT_TrackExtensionTool/src/TrigTRT_TrackExtensionTool.cxx
index 2bd304c76b0..02f638174b2 100755
--- a/Trigger/TrigTools/TrigTRT_TrackExtensionTool/src/TrigTRT_TrackExtensionTool.cxx
+++ b/Trigger/TrigTools/TrigTRT_TrackExtensionTool/src/TrigTRT_TrackExtensionTool.cxx
@@ -17,7 +17,6 @@
#include <cmath>
#include <iostream>
-#include "GaudiKernel/ToolFactory.h"
#include "TrigSteeringEvent/TrigRoiDescriptor.h"
#include "IRegionSelector/IRegSelSvc.h"
diff --git a/Trigger/TrigTools/TrigVKalFitter/src/TVKalFitter.cxx b/Trigger/TrigTools/TrigVKalFitter/src/TVKalFitter.cxx
index f7204431d25..de71fd71da2 100755
--- a/Trigger/TrigTools/TrigVKalFitter/src/TVKalFitter.cxx
+++ b/Trigger/TrigTools/TrigVKalFitter/src/TVKalFitter.cxx
@@ -7,7 +7,6 @@
#include "TrigVKalFitter/VKalVrtAtlas.h"
//-------------------------------------------------
// Other stuff
-#include "GaudiKernel/ToolFactory.h"
// Other stuff
#include "GaudiKernel/MsgStream.h"
//
diff --git a/Trigger/TrigTruthEvent/TrigTruthEventAthenaPool/src/TrigInDetTrackTruthMapCnv.h b/Trigger/TrigTruthEvent/TrigTruthEventAthenaPool/src/TrigInDetTrackTruthMapCnv.h
index 9b03c9ad2c6..979c700457a 100644
--- a/Trigger/TrigTruthEvent/TrigTruthEventAthenaPool/src/TrigInDetTrackTruthMapCnv.h
+++ b/Trigger/TrigTruthEvent/TrigTruthEventAthenaPool/src/TrigInDetTrackTruthMapCnv.h
@@ -44,7 +44,9 @@ class TrigInDetTrackTruthMapCnv : public TrigInDetTrackTruthMapCnvBase
protected:
+public:
TrigInDetTrackTruthMapCnv(ISvcLocator* svcloc);
+protected:
~TrigInDetTrackTruthMapCnv();
virtual TrigInDetTrackTruthMap_PERS* createPersistent(TrigInDetTrackTruthMap* transObj);
diff --git a/Trigger/TrigValidation/TrigValAlgs/src/TrigEDMAuxChecker.cxx b/Trigger/TrigValidation/TrigValAlgs/src/TrigEDMAuxChecker.cxx
index f7543cf9103..0e16e2d315e 100644
--- a/Trigger/TrigValidation/TrigValAlgs/src/TrigEDMAuxChecker.cxx
+++ b/Trigger/TrigValidation/TrigValAlgs/src/TrigEDMAuxChecker.cxx
@@ -5,7 +5,6 @@
/** Adapted from code by A.Hamilton to check trigger EDM; R.Goncalo 21/11/07 */
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/AlgFactory.h"
#include "GaudiKernel/IToolSvc.h"
#include "TrigValAlgs/TrigEDMAuxChecker.h"
#include <algorithm>
diff --git a/Trigger/TrigValidation/TrigValAlgs/src/TrigEDMChecker.cxx b/Trigger/TrigValidation/TrigValAlgs/src/TrigEDMChecker.cxx
index 87d8be704d3..dd592db2a48 100644
--- a/Trigger/TrigValidation/TrigValAlgs/src/TrigEDMChecker.cxx
+++ b/Trigger/TrigValidation/TrigValAlgs/src/TrigEDMChecker.cxx
@@ -4,7 +4,6 @@
/** Adapted from code by A.Hamilton to check trigger EDM; R.Goncalo 21/11/07 */
-#include "GaudiKernel/AlgFactory.h"
#include "GaudiKernel/IToolSvc.h"
#include "AnalysisTriggerEvent/LVL1_ROI.h"
diff --git a/graphics/VP1/VP1Systems/VP1TriggerSystems/VP1TriggerSystems/VP1TriggerSystem.h b/graphics/VP1/VP1Systems/VP1TriggerSystems/VP1TriggerSystems/VP1TriggerSystem.h
index b765d73f9ba..268ca04a22a 100644
--- a/graphics/VP1/VP1Systems/VP1TriggerSystems/VP1TriggerSystems/VP1TriggerSystem.h
+++ b/graphics/VP1/VP1Systems/VP1TriggerSystems/VP1TriggerSystems/VP1TriggerSystem.h
@@ -36,7 +36,6 @@
//Gaudi includes
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/AlgFactory.h"
#include "GaudiKernel/AlgTool.h"
#include "GaudiKernel/IToolSvc.h"
#include "GaudiKernel/ObjectVector.h"
--
GitLab