diff --git a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/EventSplit.cxx b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/EventSplit.cxx
index a29c02f958661d21401769e42c194d9b9bc4c955..d2b16fd2438188a6f0720d3beee07eda25fba716 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 7aac11767ce549647af1f9620562078154c1e071..44ff061aa293cbd03465ad7de35d0761e024d4e9 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 5a2c16c7078bc6ded2d3d0d725553b0bc4fa6188..ef7665326a12067eeed33838fe825c042845da2b 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 9249276259ed2a77ce7934cbfc4af4ed37ab894d..5aa31386e09cdb4f71f4300fbb2f78d023275ace 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 12432898156a495a7c2c33b666077e2f63575c24..bad9879bbbbd8380458b1a7bfe0b399bc073ddaf 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 a48e516c0b06d9b2f55b7287486396b9913058ef..4a49fe71806735123f59c6fe2a88edd103901d8f 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 d0d6b7e3b18e1fdf01516a73b5b66fcd6738a3ad..7379758b92d258ffdc59a10e39beba839fc52661 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 ec76acbdaa251e2425c0a885f57a88c96679c0c8..de0045a7979a9ceeb8b60a94849381e1826b08a0 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 da91f247c491eca0064b8590168ca497744c67b6..91589792f8cdaa7012e4c59424bbf337e890ce57 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 4c756547df909605b01a469c7f57832f371ebe26..858cc4fae998ae399fec0ddab6da3ff02b4772df 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 6a103c504b7af85ecc740150642f03c8bd08f0ab..e77254dd942bb88e8590707b18e0c009f93e3db5 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 8572cdb6665c43b0c820bf936cf652e14cea20d3..d556ce6f2e1c70a8d94a559991eab7d30ce2d2c1 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 b94f9f2ba50d7414cbe32c141cc5e678923870bb..34d8b381c8615c2ba4164c532272191b60c445df 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 bce4fec90b5838f287d7c0469ea2d4bc296d5287..62f1e24bef2d168f90e78f56bff4533c5dff3bf4 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 10ef73586c699389649c38ebea0e8dba9f17e08f..d11249193162bcd3be6f4e8fc2a7febd4ddb96cd 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 7a6a5381f90a79dbf132ac62bcafc23750048bcf..c16a67a290de8a0638ae51c2808a37237850ba6a 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 29dbc0b0b726855e0acdc155b90b54dbc6c1beee..01fa70a3d838220d0ff3a0a362346a36e5f0d662 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 1067f962f0e9b2b392aee6c8b0c83a4e52fe3f18..bc8dffb13d386e7b1a09cd718f184cf1fda46431 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 624c3d77d4e6005b676cfcde177fcd9e32dcfa50..095073b9966995f14df904b9509a2bc28e3ea19b 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 64a7adf0e6862c59cd2ed339c9fb99d66be61909..e2f652b5e8f7073d0dd84239d0466dff0a905877 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 c77057e3673cf0f357df85c0695450c977ac4819..62b249123dab15a45dbbedae401d25d28b29934e 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 a1774aef4d5d727cbec236d5bf4786c518226709..fcd9846f0ac3e59cf71021c2ae372a4c8e39fe69 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 b5236be20dc7d64211d8d05b1767831d6b8c607d..df31f0033f2372b8a916fcfe76ac00c5a2e21ad2 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 5cf8c3b2c936fe4aff90053125a071bca1dc3547..7de1cd9b3231aa193b8d73f6a831a7a0ce4a9658 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 dbcf80b3675e865e795f52e9a36c7bd1864d00ca..4dfde74fa13292a96c50d30d80d3f980755e3fda 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 ee9a1a2234f4f82f108eb16c0daa30ecfa3ece17..5d4b0c15f5b95f2fb63f5b0e1efe841373311193 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 2804f468938c62338e3378afda6abb7f0a894cf5..114b319de88b6469c6ce22f5f09efbcfac977b2a 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 e94a2cd91b632b32a5b595d20c0b53c6c679c49d..83cfbd6ee18a0222069586c87bb6a20dfeaee75a 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 dca8aa6c211c097de1c5ea7343f05b4bbd39008a..1de1fbc8ea7221a708bd2087af13d9fa367ee0a0 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 52c36308bd90ec832a5138dd50f2f9c153bd8e9d..5a363fe594650852975bfb73d0f877be5b348737 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 b886ef35ec75fe799b8e1297767b0c0407497cff..4052cc453aceef83d3f736a76ac75cf0b5069478 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 28d61cbd5a82fb8897bd2cef34e8f0b10b814b96..a02419ad0e6c1702c4df68bd0b0c1fc49de4c54d 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 f916415aa50c1d8aa720cf8949961991e7e9f217..ba8e3f1fdfb26ec2ea380729dd7310d68aac3d75 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 1aa7cf519372604e32910ef353b064ed5c0bf6ad..14bb966c6f470d3be99ccadba9484e46b252f45f 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 4e73f909b45b8798463c06b6c3abc3e2fbdb068a..ed3312422d49c5832bb7800f62178c28e680418e 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 ff7661b2ebff0876a50e8b74176d8aa17fbd672e..0633d183180de55e839b07faa09ea5e621cad50b 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 acaefde10dc094cd813ff5effc4307f43c39db8b..89147beec0b3a9ad4a7e58ddc0ba45ac20735889 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 c97532b305534f56ccf19245ccabc36cb7752910..7130ce1ec38e431bafa00f74c3ffd320e91382fa 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 d0707efaefa5b8445b139133b0f46ae4412b8f84..d71327f40d7ed9b96ae58a037f6382ce6a7c3c0b 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 5df5f5299030e401333da5198d2302083cea78fd..d4890e074e1a29704d3ac26f8278009c514213b1 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 57e0d3752ecf857ca0f2bfbde2f8c8e1856bccae..6ffb829c5d76dda677bcb4d0c8153852782f2569 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 1088df667af4bc77d82c566258b8ab9ed56c5863..d251b41b1fd641e13deb068077ce423810f412f9 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 22f5b79c4016a1c4a9c2633088efeae7077018d2..dc82fcd47dd37649f3d325e82f7cfc60f475fa67 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 5cd8eca113e152e0202593ca79e4c174fd2d056c..68d51f74326b095697f9c15c474ccfed3ae50ace 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 ef9d4bfdac79c6b1e998210ee8d3a1a42ebad00c..4dface36083de7ec0b76ece6edbdb90c5eeeb5e6 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 7647b55df1ac7e806c1873f8724186d33c42bc72..ddce0756263db3520cfa0a256fbb4c0c53cfe30a 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 9140eef8da656602af0f270a3b097941474b61de..d1c3ef0ff6e2fb5ec7bae75230f0a8c64def7584 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 f26619d5d2d249f204e620c9470b7c3638131481..69e9a3b55617f10b1ac267cd3a6c2147b53c6866 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 a4cb9caacb677f95ac50723624270f01dea926d9..4bd84ce047cfa47a900c54ac7e5bd1aacc679a79 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 cc7fe401ecc9a8541eef36a422bc564336addbee..e3e959b72e8154634353e12cb09e9acf5a894c15 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 94bfbada71a669fc442b5826476b339d63804299..d8cc59137cfea06c868f3415d8eb8835c980d31b 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 8c75261ccc119faf2939050dfd10ee17bc7fe874..027688ce4cf926d01c05b0a2011cf4764be2ed77 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 4291eee45aa4fa753c0b4cdcdfb9bf8f45b1f60b..4f943338d07dd8c9b599998c73de59b3d9bd3436 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 5f3185b09f46906aab23c2546d03b219c881c588..16d12898adab8c829016f389c944e8b09644db31 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 46c1e6e0beb0318cd06911d888bf5a9d1a1d41d5..40648bbb526ae0b4c0b9694bf24dc37cbe66cb41 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 455203a123df9127610a92714d734fb212ab230e..ad7b48efa43254aef6808bdb0bc6719e69cde089 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 10e48b8a6b1bc5cf898aff05c8e89d527c912242..2d82a83be4524672a165fe4d249069cd6cfeb9ff 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 dc0edabd8266a9f94d1465e957bdd080843c7748..e96997320a01cc240b284c843677283277cbd987 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 76f3781eb9a929d67faa33335a7fd9a438d45799..df53a3351f74c2d63a9272f3670f05488bb57573 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 4e39b06a60b2f749527b5799ae7e00d8354af224..067e3a34a801953f4a30a043d13210d19ce357d9 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 0a49469ffd18c231dced596ac6f4046c6901ae7d..02d7ef4a37496cfeffe8b4f121cc355416fc9abf 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 109f4ffe7f762ca85c86799abbc6f111a43a8ce4..5e1d9b02972680c5e6d660c9e98b19450461a221 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 5232b5a953c6bcb76198ebefcd44cb28bc185b90..133f4c8b63c733800bdc11e78b0daa04f674b2fe 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 fa4c6323bc5fc01b0562c9037e68859b3cda68e3..f531004e7f9c9ea69408bb9b7b79c072b6748f98 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 ab49ff44310a72bfd7f72e90ff2d480f43e51744..be2dd7b01a6cd42e3f5192b937901c23acd3d664 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 89dbcb5435acefef75f592a6be0712cc8d28bdd1..6349a795b1ac511f0b3d1181fd907ab61ebc937c 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 6371919bd66bada5a24646378080af1c2ff8a25b..bbe8fe8f60fe388f63ad283041660df770f16dea 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 9587a9d9b16ccdcb203abfa763162001c503d833..8acf2077efdac4d77b30411bb625444010bad52e 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 0009eb0e7a263a99f39f41ff1fc66a2ac8599382..ff58489dbef1b84b49ad6c87c00a219020b95b0b 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 dfc5e73d2fa6b3c25c3d2ea1382092e36b1bfd59..992a00f4f1f246f21416b2d7cf346e274d5b3367 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 d91d61fd8a2ae67ae27344c56275a4ba462481f0..d94b3c3189136baa6d9e7ac3b8becbddbd913fc9 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 34b7596626fbcc063b08bc182c67199218b7595b..ffd583db11782a7ace6b9db20dfe1cc03c841774 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 0a5c71facf9a91878970cbb3f7546c3e07a5738e..686eb0acc991137922a762b1a1a97e15784e9b8f 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 d153057f3dd4bccfa4dcd46d6a2d7c817b679471..871fe8a4aa0d536088fddf4a05f68bc087483d17 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 0cf9dd52a4a13c658888b504a428af743c4a6b07..659c80a08ec256dcec9a9d47cdc6719c7f685c64 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 c1a19f873abef2b293e5407c14cbff15b57d3d7b..22154fe0c1e4ff2f5eaf06c7dd9bb011c1ae755b 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 ed2d85dd3e9024a3ed656359d67a3d72726e440b..85ed9f1c73ef99bbe778f382145193d4c400e5f9 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 c683a057dbeb91b369a5c1d62ecaa3fe20db75d3..dd26f31b26dcef225ca61f5fa20a011d5d59a17a 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 fbad3d5bcdbeb1d621cd3c475931a138275f2e7d..41cd2686a4b71f8dcf9da46f7bb0213e0200a3f2 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 9365c5735861628bdb9cdd2363e54db5fe4e5cbb..5a63d1c9be31435b53034d18b25c060ec9332c3e 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 7a69f594ce15b0c30c6091b10a87fc513c9048b0..f4d15b21d75e31ea862c8f4e6801527f5c5ba338 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 e380109f2c54a251e1a74a2254fcfe6189180033..b2aba401d1538d0fc27525c1d7957b9b1f791251 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 7382c2bec5fa3c63b0148c727cd7ebb6c03440be..716c39baec901002a0ff8772a792b59c0e388e7b 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 847aa8f3d17a4137264f91fe0c8e6a795479ba7b..1a8019011c47736f5056073429802ff496b8c3a7 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 034addbde343d5b8f5f5196cf4848c401d12882d..5875df464e02432786789904bad7ed434c883afa 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 44c32749b744311073120853951d1d9e15dd27d7..884cb81ee86fd5e47fb653d66b64393e5053f0b8 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 17d626fb742714c0ea623253e0d01aa61995a667..823392ead408346cebe50365b3b237264c4f6481 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 69f2f71e98234d773a4f2b07c5d5433a7b02fbd8..f4427802a1c06436626faa7424de8691f4e6cb1d 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 f5e44648f7562af66be0c5fb4ea38cb909050ce4..2c3681bf4f4f78c2b82a23ed88e7c85329519a83 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 a2882908dc455fa43da28caa228993d4f7574968..1dca7facd9f0ff911650144bdab216ecbcc0747d 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 1742ce62db675158d28033e2ec0a9f48437322f8..268bba0cc9d752401b3e7fed42210f59bbf6cba5 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 47b5b456b5b0825f1a679e6393a4640bbdbf325d..10e372b9258bee4be005598267b552355db3ae8c 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 a563cefbc9c53e041905c00f6c97fc977f34332d..b4018679a99f76d8ee3839495ece87d7f9be37a3 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 415dfd0055bb67940028477c30c995292feb74f6..16719e30a086b60f75899921ae7c2462764280c6 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 cfd6ebd04c6980d71f559ecb8840abaedd018d59..9c989beac36e465332dece7bf0e4789f27d8846e 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 547dc6f9cce72f745c9b383b77e68f68b55de38f..4d49a3b6d939cd02320500ebd72e34f049159b36 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 641832c3c32531658920746162e490f405159593..4e6cda010def89d1922d097fe07d7728b7257fe7 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 5e1696b817693892950da9db5a98d94491189670..0a24e50e40c38c9f0314404b5b280460625a9326 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 9417a8efe6cea0409e679b7f8e6aebb74372c020..4a8c9a0db5d7c8b5d5b0e20ff1ee77e9ba7da982 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 e58d0379485ddeec8d86d308df26253c29bf38fe..221a2a0d700e202b661b0397332d6f1f03956978 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 65a5259c5d8093a582ab7f31c5d4643670858449..edd6117e761674ed6fa85bae8bdffbe1277d0343 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 09e925a1dd14dea574b9662a5775d8b2e4b08d6e..df2aafb192db8976c80544e12978660d1ae4b3de 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 240f47d8728384fd6516400751db24036c181ea2..a647bb807aaf774e7c641eba8a6e0586218dc9cc 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 1d1b0603f24bda46af57b0370dd70c9de5cb13df..ed75f874217b430d806ae02542556d51e863fd09
--- 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 f632988b7c077f148895f78fb8d1b2ac811db96b..4bbdf192c5c8e0c813ab23572e625422abc0a684
--- 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 e460fb40d90f474cbe51a16b29f8a9f624d9c7b5..2ca49a1ea56aaefd715d0c81752158f828b3e142
--- 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 6736b80ef8ba06673a9def569b10dd5c60e1989e..dd2266d69b66da3761f6c366a1336304a0bf4b04
--- 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 6d62dc8668fae7adc6e716c64c9ec5c6ba18813b..db71e517caf17ad8fab26a2b523fee0b21e62124 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 ccc946105142ffb24d48990fd75272954223aa80..64309a5164fee9484c5ba8d0198828623c4295d1 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 e23331e8cbeff1998836afef6244bf06f0a62825..b2ac5e8aae73e24d551e863db872f5fe8b554b25 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 a5149124bf81e9e76573f218b24c16ddcbe9856c..f983879de4ca0c370576eb10c443545138484df1 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 aae8d7d1e6e1a924f606882f602f283b92620f9d..ff18f35a937993ac19924e2c5983c8e5b211c4cc
--- 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 4b33978f318bda0631c669ac6a97f76db6d0dd26..82446675bdf78093d6201b7da910160887c01240 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 657ca1e0f0206b5ce952ff40f868f888ceb3b534..1aa689bac64371d802ba0e42bf1132b1bce4485d 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 b0c28d5aa149f963b51ab4e4387fdbf4a5249a2d..3f24e54c47d14bc2127630eb903f0297ddd002a6 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 2af23de22bdf1541a277b995b40d164ffd6b3bf0..454f3f9657780f54387eade463a5d11d39be9083 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 47f9e79bf6207a410226a2c151fbcce20a7d0082..8caf3be74e31f3044356fe80846669c6fb4fec9c 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 5a3a19ec43f44dd5e89c2e2b26d233dc78d7919a..bfbc1e2ab0da51d033ffe20eaf7ceb29861d4b39 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 9322595544ed8a6fd59a2587f6b305d9ae13eb4c..3159591f5b8c6c4ce3371e392dc77578c4b4514f 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 46c1fc7c104ccc116b3e0b289a76418fd926e223..7a905e1c606efaf2c430b766cc06cba477804b17 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 4173b2107fee3dc0725f98569dc9974881fb3890..544e3d7dbbaa0a2acf31dcccfeb8065dce77817e 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 b0692b1b2df2e68d22c2c03985088ad398a3c6fb..b851f37c920007233769813062d7008830109a53 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 ef3bbfddf2057f56912d6fedc43612e151387bb8..c07f3805f3f4286f2cff24446de4187a93f4ae68 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 24f60b168351fd5b5d7c3fa7e63f746265691d49..48dccb0aa609d1810f1ea44a350cf6c195cf026d 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 1edb89f63708662f24ec5d742aa67d8f74c0530e..1575c2bc5df8ed8ce27db8bc0048e546da8dbf82 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 4779763d96f0fecd3ecee80259fe8f96e28c3a85..8a30a260d638dbf77dcac89fba6cec792af9d344 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 564bf3bf394c53e99196d3955b82af95ff368d20..4dc23c14c8602ca9f9b09810e7084681b1836168 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 2b690fcaa773f7a1203c9fcf18950906be9ddda7..6baf31373a7073a95caa5be5ff8b50ca21004ba4 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 6a3ecda645089c8060d0beff45a1dce158d606e0..96820b9bf08e8f15a2baa91009a2f614818dc40e 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 64cc1d5cbd9c860402a408d16f81f276ce68924e..d27ecd974acca040441215746085fba7e7f0fdee 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 a3e7ff59c9ae463659db6224abab768b4d8820cb..029d09114d85aa09759dded8063e649aa8e7f689 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 a162817462e77f6b7565e0dfa1dcf036282168dd..35b1aea0e1eb7972b3a9d192fa2c09ddf6192010 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 a763dbb0718288a945ab518e76faafdec8f2bef0..93dd2a240a298d9a596689ddfbd1bdf0c29c0ee2 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 23c3ca6e2b83182ed277957b0ff2967a69718e41..1b9bd89d2c316684804a286e8815a91312bac3e6 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 d7c096e908459f0d1add532a00b4ca266e66fbb4..e1bee6bd0eac644e7c7a6e02407190584a3fd4b8 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 4c4bcace5ed0b597c8c904c8423f948cbab68d1a..ca7886b9127e8e575318f681f3ad7180bf5c9b17 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 22a5b3e107e36d0708a84efa4d84b09de58315cc..66bc7220d58b3a7cfd661d0fb91f47257d673a7d 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 669dbcc41f78a8e6ccd1627639fd66f934a77348..17558f75ce15b41fb113230110b3276fa3a0e741 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 19fea431560405b0c068cb5e2c8b3e411fc7ac93..bed24c95153a6b4d6dd5bb1b63fa3553188a6d2e 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 95991685f4445662a3aafad9198f26d1e3f184da..7317ed737b191bffcfb1f2d7e7eab029480ed233 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 f4cfb61488dd1868b4d70d33b6f7b2f6f5e59188..5f3f0969c8c1650468a04f5c62a1eb24fca3d458 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 ea87f78675e30f21645d4eeb53ac810b302a5878..0e036b55724f07225d4beecd729956fe6de67655 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 dd08f5b59cdd41421ffe23774cc4b10b70d1f45a..102a28164fd49ac1e2f708101f5d4a6a7a4143cd 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 114b0ed6b59513212f4b810efc2fd8b8d8c477df..4addde6098deaf02b30723ef148e8db2112cde94 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 82128790dc799a85b6eed50c98347228d36bf83b..1f34be01850107edd938487e7db7f79a120498e0 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 a0853b7b3ade795e9fc9f3ac4afa6ee549140c7b..6ed8dd17e3d6708c90c43ce89536dc9d51b47c4e 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 9a565c2f67e2efa49038efe1114038dd51fa991e..dd619ab42d5f5498d1d7355b5059a6210bcad067 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 edb95470cba9415c4f56ca82a2ade591bbaa05ef..a0f02e1629d2e38e37e7ad8a898025d76ff5ebf6 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 c0e03bfb956f76d703a850625b56466bc5e3c3ea..c9cf0157bfe0e5e4fce7b5da7e918b762594d2a6 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 afe1a8ce6ab940db8cc6bc4f48f40e91134cbe38..72f3cf6c744fcd3eafc97db37d2036c55214adb9 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 cf944958c0c171c3b9f732e5357900618891fbc3..366ce06e9e14df5044133f09469adc268a35a450 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 ead0553ac11bdbbf44ef488e0c92d13f263a39d9..c4702e54d67b4efe703176ebba683e0f786e4ae9 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 ad0b89481b06cc10602ec87440e5ef107ed4bf16..f3970f4fb152137949fa04ca7d2fb7766e6b9a12 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 b882d9aefffa2c845ed2eb084b54367cec57adfe..ed69acdb85798b160e0d0371b74fb1f8c4a3bd42 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 4fb925ebcb2f333825d1fa2bb62119ad9c5e446c..33644e4593509f09d544f72c9783b06673c05cdb 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 9789e486ee3b55083be7790dc656362d1bbea61d..24b6f1ee6b243fe0baca8930b4bb79a70e18e27c 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 2b51b420e03cb2ea8a32afe6d644dabf06a49db8..11c51ef2535edde6c39691f00b044e7cb070d40d 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 0321dec17d000c5a7b5b06fd65fff7545e1d7810..93c1c3d3094bc213f3239cd73baf2e6fbbe56fd3 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 54052cf559296972754e7168efed8cc5b032f551..c7a91d11e262460be11e707fe45745cf3dcc1ffd 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 73d0539316f40fa22887cb8feb5785992ea63d39..13d8a6a1a64c2b61a0ec88f9938614f9bccfffd0 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 d0ae31d21b0361d5417da86f0340898da6802e34..99b75e9f1b808b26fb36bfaddf590eec7412abd8 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 26324c96c4bb97279c4a43a8d46427facd686277..5c88b25a77a68fa4ccab52b93a0e2c3a4a7ef058 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 9938cb40118a86c37055a95deb467a884fd0cfde..3898be1c95e439de476e96ee061a4918dc3a7635 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 201394e92dc3def2305c6c5571e1e608d361d72f..d9a47d8ad82081511f022d9e48b5aa222f58c989 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 535bfe0df4aeac7408f5e0515871c73e89602f93..1cdc6bdfab73ef335fd46c9576e59a02cc1be96c 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 878d7201d61f0641da17a420ad13efc351a5b89a..5d50032b4d91523e0537736a11f720ddc270064c 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 306831b480e0a7ebe830fe09fdd022b57279abb3..254bcbdbcf6ddd13a23e06af4488b7ed0097356e 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 fa3a0b8c9820927b81d37bff9780b319d1e791f4..ef176f61bd9bded28229a49eddde45d8fc50db27 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 1034bad7f136ed089a29ebcb01f64cd65814dcff..eeeadb888f4b9b128d46a67e05e662602f7ec0b9 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 4b6ff2358171e0df87259107ca4ce1bb80619175..1c6e7e0eec9b90cda5a5ff846c6671273b54012d 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 c0fa8fb4d41864461cb7e0ef5d1edf96843f4b61..7a6c2d05a7507aa51364ab08784f5077945645a3 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 59fc481bd192f8f6cf02da09831590f5e62aacb1..18b5b2b90d0162ac52eea36939ff81537b3d5dac 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 d16f092ab87bb2a9df12a554684837aa0282d6c7..97a2f40b1252118bf0a9e38b1bd63d4b60ae279a 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 3e21bb99366b827288db39995b69add83956ca18..0356c5964d348ef1b41860063b64adc2236c14ad 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 7c1ea86e6c43517ba4f3a77bc30c78da31452249..53deba1888e4942efd8fa0b8bab3b8810ac1dddc 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 5bb6046caec7da31e32fcc34b10bb38dc4b29435..7cedfb126161156ed70e0a72c6a7697d1a77fc00 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 5a21025a6efe6ec91eadbe934358bd026d00e06a..a1182b4a4d0f6a80c00c331a3cf05570444322eb 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 4e4e2756cd4bc146645df9d3787a3258489ff943..0e0ffe7cd050adb6dd0941c32c6c3538543fd994 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 a2f05901f8017ad96a8dcb56378f33008ab9375c..151fe2270343c186b321b0afc04ab30a5ac156a3 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 325b346789ea0996ebfa0d9bc0186dc9e3f3dfa8..9c940c63464b96bfa16810de6fc50642c496924a 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 4c465d6537a07cd3ff4f2ed53f409496dec23e6a..6da1525341345778e49450454c1f507408cfea96 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 c34c4e0a48e6d3605a22f6d52f7dbe9b472ffa0d..186da425619d29f179825834bb9f2e4a6c8b07ac 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 55638d3cc8de6f67e600f86932fb9ead71439d74..6e3c5d1c9457251e87374051ff43a7bb6f9f49bc 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 91f040550ee4291e19ec5f44e1c7a5025295f7bb..b5e8a3a9febeae7eec6959dd013f2c3ba97fb0f2 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 cc37a6baf051aeb1e71a7503c14f0648ccad0105..97ee00da2b3ed3e261b0cabb3db2f3f983644942 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 448d6e6933638187783242036bad2844dae317bd..4823b46cb06537fe807ebafc8f51718593a755f9 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 6f4681d03f299c6bea3bdbc02d6d963c8ca02f8d..33cb7198b6290ed0479150745bbecdf5edca0e85 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 8badae33111e0d6db1bd50c25770abc2f5f9a414..a9b1f4b30292064a6b237519edd0b0b931797c50 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 1a457972fe64c39f8d145da4db1ce76664d9a502..b7a7fcc5a95a995c68e515ad543d2d4910169801 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 1c6bc6178d5ac307e82ab150905e09d10590b914..9393b27b1001ddb90515ea2bdae435871ecb8864 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 d4057bfd405b90c75910d5a86237651d5ace2c94..ab5933ee4e04ff61b84f6a37ede87a00460cd8e9 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 64eec442a8374b7732285b85e117099e7cfad33b..7ef6a42c6b24c8576c21bc5067af3902bfbeb2f3 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 83a198eda8aef6466ba68202ed84eb4ad3b110fe..b8b1c5ca164170c9dff0da2e9ec734c6c12642b3 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 42851c10178f34d634c0fbe29fe12e38d1bdca03..2b6a053451407eba75819d162195cb4c04fd6578 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 c191910168a842b85db8a4651e8b959c0602244c..d1eb94b2d3911847232763a0b17c3d8dcd2ac320 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 fee0cd19ad4c7cba2769323aaac4f24315af5f10..295b9e35b0d60b1bc9dbe885561b97bdb785987d 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 04cbf97b0bc9aadd46fdbe3fb0e75786e1185507..b9c7dd5941c2bb996493434475e64c037c1c877b 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 2270d41aa35518420e97638e0870ca84659ee5e0..728724ff992427c61e8e47540f6ee9c2a3026db6 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 0e8e0a284642510f6e995081220990f431e9010d..4f646b6007008222d4c87fddf0b72db7961bd529
--- 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 094e65274bb432139e3bfc73c47713e79e6f1556..9a232e6f616a26c2a01f444c84e903a534460ee7 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 b062ffa924d760c6887fbcb2fbe73089d97efdae..dabe4d9eb6c743e7531324a740b55275017c4347 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 b24415ed4a5bcfca51fba6123fa0992d222e9342..a768588af9929c1e94d8a83a37ade70cf9ca6921 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 c472421f149f4d40e2094312f3a5cb4713bfb4cc..e866fbbac114887cab9206b9690faa78ab412186 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 e72a2c27c1ccfde97a75d97010b58507bdfe2c37..a1be1fefd89c2a048d58de00cc747710bd0f2489 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 9802a3f51533e423f596d9d672982af920933a79..57aab600d5f7c8019ed4be4b20de3ebc9fd7e5ef 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 38dc26a4a99d08fa886069baeee8f8b1a9fc3b67..090c74254638dd4af42279dafca4eca2a93682c3 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 6575c1d6820bc802f65220a362dfadcf934f8d71..2890fb6d723a17790398b850e225d051853e1d2a 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 3a23cd2de6a68081c87babf8a4f2ba7c8f0ab7aa..f82d98cb5f65a8fee6c1d801d8616ab9a43bd986 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 e5469a634ecd521b3441031f12353f0abfda0780..9cc7aed4cbcc3a3e2881ace33b684547a6e38511 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 ecb73ce9738df9da8970eaec836da84236fde1cc..384d2763ab32b03a6e8b9db6fdb77319cc723679 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 974246155ae747aae8c61c79b2e5b1c7f79cdc60..e37dd02e1ef6fe4bc3e2d5c525f3fd3d13df75a6 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 5ba06c1e29f89904ddcce4bc81e4b7f52661eda4..9cf75e0b297bfa8a72492aa112974e6108aea2d5 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 f19a4194872a81d4f1907c2410522d7a2fa56b76..7707c860c421d536219d902a7212d61212940f3c 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 2fdf3499f900612c2e6bcfe249955655ea15d599..9e3295bc5929faccfbbcf8580588e8153b08c11b 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 c50568d7645bead64d7abb36da5eb66dec352e77..752bcdedc0a58856aed0cfe0de4e2b5a007f1b7d 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 55375548307d8e79490b8b0c29bde21ebc50db8f..120ff1539a19c66a3a2fd2f74b753cd09eca59a9 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 dc947998b26b5335de6f65b25486e74527d111fa..2572d08afabac4b1ef19cd014da40bd448280907 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 cdcde47b6a4e4f4f7ff43cfa72c4229396beba31..3ac2bacce4d234142f26e08337e5b91a8dce6d6c
--- 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 c7a7a1989e84ada2ef718c1eb02d8e6605192a83..52e1332f7b91ff03e6357ed2dc8887a991ce0e3b 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 47b4103bb80a55d68df6e148cac9f8dec9a2629f..4846fd91710c2d61bfa8f18076233b6bdeb0d9ac 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 8b4f0b798a44ffd77b153ee629b1df7f4fe8a28c..1928f85020e6f0a2831dd86b9a75ce9c545ea471 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 3c9d54839e43472152951add942622c3734f886a..e332acfde8f37126cb24bceda17ee0d63a2b4436 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 82851ac2463b0939b64e3a80936291ac5ef86dad..fec195d143edc2145ac4720f8afa69b1ea9a5529 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 fdf226b982ba12b62fdbe6042c339b42a3d9a9a0..24b58314cc2980df14e343a1102ffa92917d06ac 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 8ddb135b421782e1473f0eaca0ced2e70b855679..0fa6ca53325c811ecdc75728a30380c820625e82 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 3732998609fc01e39865605256326e960f9bded5..2eb0244f4266807b57b807d70422023ae2a52f37 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 9e8d4020940d4387d76482a288a68be554d1632a..0a94b1b773cfec650a54de8a17becfe127342c4b 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 eabdb4fafe0e8aa0e220cdd4b4d31ac20b174b27..296037a0e13d990662d253ccf67031a8b76f9be2 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 a4b7fcf3e348c3235300af32f4022a41816149c6..6a7a9c2b95a18272761fd0b45416dd423e7c0a9a 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 9a5cdd8ab3c355d07b717546c165db37e2190a3a..ad145625025ed190ef954cf15cab3b48a95b9231 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 81cb8bf25306f597640cd555a7c2cbabbdbf2049..1f8768e29f2980d667ce197cc88e7a87a081417f 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 88dc9efee32b7d878fad1e0101b72e356e01eb99..4f389b1811b9820ccacaec5d935db351ad18b4a4
--- 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 b0be0c15ba6070785f8e7c87cd62f34d6994ed2b..4d3245aedbb349fb973f239891b325195767ca52 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 12b073449a88e8f422ba47ff45abd6476866a2b2..82310455e2a1ca57c7252b42628eedf85279decf 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 28b2ccc0dca8efbb98086aa9d97944ba1019874c..d860ee5e076e4464a02e06c609cf89795e36acc7 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 31db103a1078a90569cfcbd93a372148a4acd216..2a1a40f78c449f6bd17c1521bff031b69fba4388 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 63cecf1062ed53581fe0f4d5bcabf07f9adcc4c1..9f96ec8299d195085d9b90e11954b73b5df55f3e 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 11601d722fa53bb79a957989603efa86059f6b37..04800941a7bd2241b998ddd9224fa8c52e23c1de 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 b578a78242d3b033a1c371a89ab741fd7396b72f..72aaf9d5253977ff680c99ca675f687a6247c4e8 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 4ff3fb3bb49fb2e2fcae9c19900ed2b149116f45..7c27696c5140b2185c0e0a97db666429408b4642 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 0461b7826b01ec2ee4c257453575b52ac9b78565..ea30ab2561dcd93b55fd7921bdd46adee8b5968f 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 50edabd6c4074b62c86bcac8e2f0e8ffe84fc84a..c2a22b81b223b173a37f018783fe86df7aed4b37 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 50e2f140fb42905d197e2726aed2e662728c450f..a26fa2f1c0dde13985bfac864d543499eedcf7fe 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 a99e0cc71521254c997c7a4b7e8450b5dd11ea4f..bdbe85d3a6a9d9b4cf46498e5201f1811393a010 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 9f32e3418bcef1c5ced769dc07f1a944ba85fdc4..6b7f68b4b01dc45e6e6f7992c8105b93c75f1a44 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 9cab4af129457740ef87c44a524fb1884dd69414..7703d1542f6363af54aa7db0e2af38626d8bd9dd 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 573d1e6bbd3bef70b2c2165a73000801be7d5249..9c59cab60d03cbc501476fd48df34d8ffa26c421 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 13be2f71fbcdcf2c2365fa81b027e4105a311ee5..805a42a936f71c1f1bb5712aa0c4122790484b0f 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 33aa036aeb66532b13321528c8964308878e8bc8..9866fd7495516ea9e48c070f03f8030cd7df46be 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 96eb3dc62c1c5d5e94b03dd026ccc3039cd1ee82..7d448fb6de3ade2ba7bd4d5fbe1688fbe2eefc93 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 0cfc32ad52ed8da70aff96a98bb221cf605f108e..465403492b2b3433b3bc18c44ea67f9c75a35f56 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 c7c1f9a86431ea7080bf1e24da1474b729cbab75..825ccb26beea1cbe63e1ae6ad2a5f1b4b839b220 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 bd9e82e5e2ef62366b6ccd43c567f0b4bc65f3d4..e9c7ccfc4c4a1245100e1feda86b8e8f8d86ab6e 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 009dbe27a3dbd8b63fb6dde3c4b648931e21d848..f3f03153d4fbb6092ee8e2abb182c648a9a66e03 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 062ca42143472c917fed678e41b4b76bd681cd26..1a45b17093fa8eb61ad2718415914bebfef607ec 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 7663716b4133888f3b363130acb1efba62e71617..1fcf025f49f9c131815e8225a1639f0ee3b75ea7 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 0edbb347355d1fe4439d793ea984c7ed90209f4e..285e51981ec2000e45f70efa9bfd1ae3d48158f9 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 4a4b392d83d596c400da9c01a7c4bcc809068007..7c1dee3f42bf76b0fcb3ec9c22a505c0e3d15f02 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 536b2ced6f75c7e06ec2520c87d278e745989f4b..03900ac4c27ea8efa3838d2186f40e4bb9f1e821 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 008b105218ff99ac4e86d18c05f85a7c908af98b..94f730dbae556cce85a23b12fd09e185d481c745 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 094428b078a2ddbcb62ad2b9584e249d6658ad89..cb0059a86bae2d085a409c60e88178bac04c1caa 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 27abf0a9744de16a53baee1ab3f8c94cfa18ed7e..b7d262256aca01fa4ef8d1368537f426390326c3 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 b23a17b0a9d9e5a68f64df0b19b798b80d6b6020..276139525a6ff9a1b598e8d419746c50c87233e8 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 b1075f1c1e7d03bd2ce27ba5c1f72da6fd77efe2..d1bcb65d2920a0de488ac4437ca1f813cd9b1b6a 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 56410be9ef40c7f73a2f4325f5f79f1e186c2b8d..b272417dcc276a9fb4a032584939be23fbe4b8ae 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 1c559c85c6b5e58528963745206aaa1ddffd65d6..06d053ac9e886ff7f7bb45afd5d41f87a1ebcaa8 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 e9c36943a83c80b53f992fb4b99382cc44c18820..0937c86e3f730ae5d9e06b48a3791b79adf6a0e9
--- 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 8b0227406ee8146d2181b5664533664c2d45a824..63b248268c1d6d3b8f6d7001dac4228fd2b4a338
--- 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 42cead1f4efa82b23546d0319222c1c0393ce53f..800757616629e0a944b5fa7a05e56d00db8c9acd
--- 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 61c4f06a57491c1dfdaab6b86f472c3470946148..c352546fe3eed0df45a9def84b63cc15203e69cb
--- 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 1062491cee9f7c6d2bc658673c290c6ab3a36db3..f7a9302786f8fa83d99d433e29658c02fb7dc8b7
--- 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 e738f29f12378063fa39573babbb354a76e1f7dc..b2b50f2d95af32ab8a0aef6fbf4d893bfb5038ff
--- 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 3a96173ec4e16c976493bbf0b7240168ed83c439..8804f39781c8557bde44e2382d16b60b17f1c2fa
--- 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 c6c41334f5aa3a12d9c30898849516ad00ce5dd7..4f036fa03fb9f187c83b8b6bcd39e73c622981e4
--- 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 570b6b3bd239bcf5cfec34530f2e6b7b39d68261..229925664ada58fb7d6d10285a1b0a9ead0411e9 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 ee3cde9e4b72be2545721ff7b40de7f2930993ab..2f02d983608f210c117361db6d519d69a4464c77 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 9e82862989e3ffa871302a1bdcd054a1cdba7fb9..66c08c64ffd5e0e72c950bec4e224aa25f4068c3 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 ad0286891c82b3e9f7aeb65aaa5482a06505a129..cdaef25db6d81e7a0e88844d8af214216b5037b9 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 46346f1b954052b9f3049832d306b1e01d3bb9b5..4e0dd7830139bca6d121e577951bfeaeae8ea113 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 567ddeca780a60d9d3d328824b51aad129574e32..653b709f79667dd3731c1b7b5f93c112553a1365 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 a161ce6f56ad19d1102add9f8455edebba8b6b60..328af80ffb38c6f50e36e1a7f418057fc4de46a3 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 b86c6ddfdc94796efad1b9723bf2a4721c5a5299..a77e8209497d21d256b8a2d1685b7cbf94fab78a 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 1d85c7a303fe4399e946da2dc99e9841f9153ce8..1fdef16f373e4295cd2c71ea7e5fd32d5c00f5d6 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 3da1affd7ffe4522c746497f419eac1bcb7209f5..758951702bf4292826e727a9b549aadd49f7366f 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 d465136586a613268d2b2f49255c4f3bcb24863d..b30ad0ec16f291e3109432e5fb3fcea6f64f4f0c 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 027a1e159acc2fb668316540ab8afd943651cbec..61f028c594a02685aaf166789831f7657c690b44 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 7c732c1adc67d11897dc43789ab0e7e1122633a0..8fc9018e2289dd7d3d655c18794ab41be4eae981 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 5ae704fe943aec99c78230042b4a6cb2445f13a2..f45e3ab03c8c99019281ff83f62ebd0497de673d 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 3ae53a511fee2f77b5270276217f4080e5456d0e..9c160bc7d1dcc4394ae75e6c00c365968bad7daf 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 14caa163a9b9f7a95c855aa271259faa3f0c1cce..d9d0e50edaaa5c9bc4165d900716b994d4f5b815 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 b761e4d10013df69e85c013421945521257d2dd3..ef4b23321d693c979faf588e8eff16032714da3f 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 bcc3e5ea0f197db46f043d3f62a32ca921fbc2be..b1b113b583a85a1f147dda628eb48fb90c30dbda 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 aa5c495a779882dbd825cb99d71a94f55bd0b29c..6f172b6ea1f2cfc88308c7cb7cb06a600d3cbce0 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 49e3b51721eb157aa2e1672a8a0fd0b1ffeb437f..142e4f1993a6dc89dd7897e8107f58c855bf4b0d 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 ee46ba310abd5ccd908e6f2e806f3bacb4090c8b..b1ec20707787d3ebd578ae52a27ea03fc013a741 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 e32a38bdf4c571ee046bd6f9042b4635fa40b392..bc16bbd366c526ef1fb00c2f82a9de1f2397b5a6 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 92decc31bfd162ae1e7f37d0716f2e6911536e84..b27fc4e4790bcff12fa4a1bcba63daabf3459748 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 c80ef83f6d50a7d294b2b75be51360337c3c5faa..687f7682eb07e93abfd5298e276b105acd65897f 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 9de6d5cbae4c8f858cc37282aa2afc544c22a6f3..efe5cfb1bd312a453d590af811426ef48fb20933 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 108c2f3e11e6317757c4a3437fd663a60f7868d2..6d634a651d8367badeb163e6779fa50e8c3100fa 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 4a2d322ef88afdc2a74bb32e2086d4eeca4a77e1..36f053cb2db254082f73b48897fa42758a9f36e5 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 dbee4527aacf4c499197cb87dc892e07578d1982..d8e393186ccd7c00d871d3647e8ba1e05a67e3b0 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 426906a1133de385eda490944544766df2894834..890f100d716d02d83f9c58502ba211cf5f6b21f6 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 981c2099f56099f6252d8475be84c941994f37cb..8c1e32d1d4a1f6d8e6a0c2e0883d2b5ce6ec03cc 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 7da6d4831bc1e9acdda90274c62e85d9aba82030..57355643c187d2503a713a6f5a48388cfa5efc13 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 264fbc38e1d5a59d9dcb448535a699948a8d495d..7e8bf602e9cf82a004fac572cd64b4ea11db0777 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 1539c2b316892cc729c642e3e12505b25b55314a..e23a1a6bec9adede411dc8077daeb3c70365ceef 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 e8728b1d8119cca16569a9288f5531bb8fe2a7b8..fa9ed3d1ca509d6893b1b8dcfcd503df58e101c6 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 7e22fbfbc084026a58b513a13a660e52f3943847..8b6ce3ecf260ec1218e4cd2020d02201b7265c8e 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 155c2d0b2a2ad6e82c1fcc50db1735a10d0e5302..4a8735df01cd11c9202af0d5ca2667909556de6c 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 3bd548713e946458b9fe6a4f692102815c4fc379..c818897aa1034b44a24c72480dd424898b08551a 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 c7b87b6f687231094d254b66b758bd77dfd01836..9025e7a098900362cb306de9915bfada72eb671c 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 c333938eeef8ab8f971264077e5fb51803c76ceb..67c82265d505938135a984f0ccb6ffb3f5ad1968 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 7bafd93829fb849c9db5175f4cb4e19ca18a4665..6a6150be4fb786fd5d3a0de1a9d36b5c127853a7 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 756d1fd4724b309fd65af7e9f15830805def29c6..fe4351725549cab779b5f7bbd8fd4e1126ffd985 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 84c2079caf655149c8af0b60b61b6888128ba288..d36fec71fd5480cbc81b0d426f7080a02f838ffa 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 0ad1befa9e49aef58c448695d1ed55631d770471..102121dd4d5ebd21aaebef792e1c46cfb9d4295f 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 357aa0ce7c0abbe19282031e261ebe4b6b07f8de..eb6225a1cdb429bb3123c733efa0899f0047cb41 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 e13a1c1c1abc288368983a80682360fd6c7ae901..f23e43174efd6253adaf570c6b9d730c711cda3d 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 442c48301ef4d02a4651335174934c401ad9290f..11fc13c147a0d718d3192ea152bc4de40c94d562 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 40839827cdf7ed37d3a6d8a736fd789f5d076e1a..89a9f3652b6178148aa0ac17c6f27a13ca1890bd 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 f7f2e99a763a1ff8bc5228a5cc9240998878c4ef..3ed3088d05eaecb0e3ee784d8225c77f9dda3f43 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 7f376bcde6a2d1f8823fd812635b2397b20229f3..c49538f43478e6b3263f2035a5de3532b297f6a8 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 3c1750b4f9235f54b52cd8afb01967c000dbb7ad..85e4f99048f1a871dc5572112e2eb7e59b1676b0 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 94c0ad49bfd91a3afd8b97092d1d874f2f1a6e49..af7434a2f37d8c2773add6aab69769397322966b 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 4d954caf88bbb47a5b3188a5f773c40183631822..f5ad85e8f2b19e49f7fffeb03ee92a6b7d8da875 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 159ac84e0acfc384fb05849a7d9d44d857fc240a..0226519ce56fb6be50210da420741036fea14b45 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 0cb6fbbfa6479ee54b8e9289b7ddf81ee43be172..8eaa7f4dc571a2d36707adb766954ec80cd3c6b6 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 0060b58efc8a3265a1f0bb137f71aece94155d70..195268cbab4d6b0f8cbac0b3a1eca82e67e04b7f 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 679a7ed6a9d196f15cd737e90d591eb5bd77b44b..dee9e8c31500d970553dfe171a02e1c154c743ff 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 ed77d4abee4d3648669d70bda5c9f2062cb91911..d1ae6ffefe252ff4cb2f1d29ca249357b6fa88c0 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 a4b2e17d20ca413e04fa6a282d58266c58855863..a22185258b4b5bd80b5ab511c26d41ee71b1e131 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 6b849aa9a250b9373f304f72fec2df6173dafac2..7315901548baa4ded654213029226911ca57049a 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 7e9e2bde732db970f6334e5f84bca914258bd19c..934c977466a08a23c2493a5f8ced2bf336288aee 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 cbb00a8ee2d933100687ef11e88cac32ec7cad92..e9c29e6e8aacae182752e3e889777b8a90b654ca 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 5139fef0eed1c90d9a5c591b61a4c30b221c3d95..6c6a513cefdd61d1f7d0a34bac0c1f4ed4134878 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 afb2c666a90990d414faa4898e666371872e629a..56e71cf7386f81ef28d2e189d54ea97f0a142734 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 295126aec310850c25f755ab54208d86bd45937a..19001569bd24cdcdbd9b9223fc72278ac490dcfb 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 d4c966d31144a1dbaa0c094bd14cb31e427a8392..8b49de7edb4c70409e7d042531ae352ea6c011f8 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 7f01e9dd4643901fa01232d82bb509151b3e17ef..d37dd395622a6f1f0d4c3a8d6adf54c6d77cc1ac 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 f02b32c8e0aaa7abc2ee82fba8dd8e376b993d68..74ddb0f5253c5b51284ff5a53b744e2b8185b734 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 dd2ee66372379aaa67264f7c370828eedc296b25..ab2188b6048becc5490a1df0164a70d76c7bc0e7 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 ce0b9b879d326278346935452595913fa8557536..433261bba98a9d382e1a6c36f6c1804665ee52d1 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 fb3ea069088030039b95ecf520cdc05614eb74bb..d37117eaeb7a53e82434a8bf088a5cfca15e7f6b 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 66acbb8abdaebff4c9fa6e919085a2dc0cf5c453..a544a444f453a4d1a4a0200819cf6043d7b48508 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 367b98ea9c5547485b24e5e3353b61fb14c733fe..7bbe99eb1a9e74136658e84bc67da11460386c0d 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 882f47562a8107384e7b2ccfb84144e561eebaee..bcff21ab56df58fee734b84e0fa6c5df5586d6e0 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 f05ec5f097982834f3a94c9906ec9efcdcc525eb..eb4c50dcad106a8440f85979b311717bb79d14ad 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 5ee294782c0f4ebc204df8400f389b375a49abb8..f65fd66bef3b7d24960f29f7ec60bb8574065247 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 0c9bffbe29115f7fb5ab93bf50a69d78c0634365..748e89a544ecedad86be3a3669c65bfc789d5ce2 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 dd3ebb2f49e0e5a815af11b948d0b96d9707073c..6d8dabc93ede1faa27fc894cae82a44301ac878f
--- 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 c30bff9536c9bc5e528585c9377dd844e83fc474..38eab1972dd0dd899460e9606370cd040e26d363
--- 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 92130a5dc44c171289aa70b3aae687e9c67c2bd2..5212da02dde54553cfcb4241037830aa9f8daa3c 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 c72eb83550ba29e657920abface55e6f5bfa1f38..21345c02005632c743f72707e32ea2e246c773c0
--- 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 c5b58e341589c0532ef8390ff41328c40cf8b6b8..82874be680f2276cf6ab1ec40363798d3aee47ab
--- 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 a702e15e30f2dd0fc2e02c3e3b4e5e3d15fd56c6..eb01fa918de548ee8000c7a6b1cd1bde1fccd806 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 7ea52f46f9a425701eaa26cb1d0249cd1d395d46..e7c1a1382e2e89c2f5cbc027793b0aa4af471ce6 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 f44189806ccdb3b1e4f02f65eb5203c95fa945f0..02e0e3893a0e9173cebb82f9dae58cfcfd0d8d6f 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 b270d37f5fb69f88ae9bbf68775283565f0ac4fb..8bb1a319290db9f5adf3f7e77f04d77cebc84ca2 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 0bc1a3b636c62ef6e72ade2f78ad860bb7c0d60d..36f2a35fea81e0be5a0ebd2d870ac18cbf620d8c 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 ed45e3ed9db696fd8d095f509c2e0bcdfb1a86c9..0aa8a473611b4ea98f02cfdccc8742e149eba196
--- 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 8de1b3e40c07d4a1ceb35df2219532008ca1ba8f..3ed3dc8ac2c680e157187ea1d60f87fdba56bb4d 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 cad8244326bd66c12c0673e3b4548e9866870064..d0e0c34aa038ac7e6eeca5a2fa60a258b9c4bcac
--- 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 4e1cdfd373af5e812322aa1c22281a297f61c163..7d5026e41ff4329a10d51051de9f2364d12b51c5 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 c48b66f9239203249e5e63ad296ffaa2e6b26791..d65f0a5bf7544c70a960b28e4c91d6ccbdc879e3 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 b274e9f86461d29b36986a2e0fbbc43fe4187af7..57850dda2aa38ea08c22c3f05e8909af7dd283ea
--- 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 81e1a097530ef4aa86feb20ed312b4d92c1967f4..33ce6100f671a59d78d17fa397fd68fe4a064e1c
--- 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 875baa8ee1397e6bfa41125a8e06932ef12dfdcb..d0bccb567080c196596bce487967236d4cad8717
--- 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 95eecd73977deba446644458c9ffc5583fe40438..55cc9bbd7520de457bd7f950e9b6cb2294a45294
--- 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 4995cefb63e8c967caeba1390426cbe931881cea..ae1a1fbf73be1cdbef6216d4b438ed5f88e68e03
--- 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 59f6672fc2eac103174cea0b5283e922b9b16da6..1b894cb2e3904bb3a1d5cda9442ea6c4e16188e6
--- 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 b19f3fb1f6ff91f6ab5d43a872bee3eadd1375e9..b70143deff48198f30420b0192b9240b2789fd98
--- 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 dd23a66445cac29110e7744431cddfc01ee91d7d..194b65ed1fea983785f8422cfbdb82791bf8619b 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 cfea84cb8fa352279cb4f08154f609a03f409fa4..6f9dfd3724c1e6709d19a1ada6a09464c7b38ac6 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 028b878d502e252ffec6ce1b55e970c147b90e64..9557dd8dfc9937db1d7e057faf8ffd1b42b5d228 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 6731050c502204d82c0ffd6e07b14c26b3885a76..f6463608cc4ae05a69d71b55345793e1845668f1 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 b8ed1301a2cde3c86c16997151b6c648b372a587..625c78bdc0acc95f47583f6301a15a34cf4223c5 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 4ce81750f83c05463ee35c93ab0e4aeffe712c7d..f3d677ee9b0e5294efbc9e723eef706c16902332 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 3bb58a3d59e6e6d4994e58f134c68f1c849afa29..341faf9bf489732201b662882ac5edfc9f9fe676 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 1605dcef6110179da5cb2b72632cd2af5adeb6f5..4bf87e9a6a7059179f88ebcd77f4b1039c441236 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 dafb2b283e5adb78b9b8f13efe92cbd3d813214a..7540c4757b0df5bede52a914e4c412f54d5d104a 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 0b42d074bae5da6e4743b2e98ab05ba1aecbf02b..e11849d324ac091119c91bd3aade5010f3b1c9a4 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 e23e72d0606daa30b958a72beb88f4bb28f592a0..80c50ca3da03f7e5c17fdeecc97fb96b96f78a41 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 42a8d320de4038ec8ccf2152b92188d2c7b79ea1..9585de294f998c017a91c1d610add32d42c3ee58
--- 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 cffaf3633c7689e5fcbcec84624293b5af7a7e16..30447cab416d4d5c7cb71f53c58a0207d91840e9
--- 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 f22eb80e50a8768e0d5c67480b3d185736bfe4c5..255cbfe7e89034aeaf3a7f6f4d2ad4d9eae7cf5c 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 ae4e7b35abf5b86e6d5e3fc9c9b5e3874c7f377b..990a7d3c3e79e2bfd5713ea77703c74bc5142a71 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 d4f382120608b0c87acd6e0358f091813aa5b97b..e7df66a21b21014118ccca08b57bdbf6668260e3 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 7a641dd03e369fa985040f1697838096676e0c9f..8cacdae794db182e0ca1be3c0a2f1776c58189d2 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 bfeb0be9a01a4d198e9b589bcbb925ca5ee02d15..d7f3738cfae4dbcac59aae46a6f454ec738197a5 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 85a62823453586232cac6835fc7b74cba35b266e..58674153d2e060ddbb11ab16cc98e6ac39011dbe 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 370087dce85128e16e80812e1fe3767e638d8671..f25679e28d417796629ddfc82f50da1966a67bae 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 ea7ea06c1d04fe8b55bcc84989d926019c7fca07..dafde3522f29ad74b62993742bf1cd3714f8de9e 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 137917154e2be56644b9ff6be87cc295149734fb..a456993b6bd1db306c21107bd6bb59373b510631 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 4e5513ccda318491b0224e59ef82f37f9f409c2a..5fc3bc72d67e84588db19e486dbac60c6351fcc9 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 3cf5b44b0dd7c4eaeb1057de88a6396a108a4d50..6287bc261fc0d662fe85db2604f47ef09f6c9de3 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 a031d49244beb82cc2b2f85829ec3d400db57af7..f17a0f17de635a1bfd35c9d9e0170d0cfe67c658 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 2e4e1239426cf799a173de214f7081d3eb0ece15..e6c2a1fd67c903241efa999638792dda02d2edac 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 3715ede6ed419928e3a245802c5ee6a3455ac0b2..1bfe59dbea931e4e4000cf0f985c6eafd0f1d83d 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 2ba57c9b6a306b10258933a898dcb1df4a8da454..6a1f599bc64a5d5e6b4d99b17ce3cb07c961fbe6 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 175754e51b79dbd6b85d32066f1f2887713a6f13..ee93a8e77572e295910e781ac48c1bfc7fad41c3 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 62080ff05d298c434917725388e972ab075fba5e..8bf7c97538ea747429ca493204e91d435f135303 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 4a72d1794e4d2e70388d4ff697a481160488c62d..443bbef409f896d8e89d8e59d53cdaa4e51cd096 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 0503e3d6b8bae2e470f6241680160140c7a2dc40..9ec03702ae48e83b76816d3a3522d3d1d8a6ccb7 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 41406a2e8c487807d453ddd49fe9b1632401d827..7ba71de8e586d64eb2da15faa8d4ca8abdd34b45 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 28dbc3c437b59a428b56e4ddcc7cea0c53462737..ef9530e468ffd04e14011605f805ad6451c6b73f 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 1e43e9a72afce6b022c44902ea758715d71650b4..c753371b4d985e92f840b0616079069aa646feb4
--- 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 d29d686ef519701e1aabac040a8cddb8401f1775..fc5dc78afb48da304edb180e5ab97d5c613256f2 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 ced994aa2035ad7fc5f04c8b2f7bd964bf537111..1181935928bf0c3825ff13b123eb34c449f65bb0 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 677686acb801d717fb6ae117d2867411b5386634..f07a7e7de15a11c8cf590bac1dfb308edfc91604 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 79797a87f6f9e37156f1fd4c5983e63b351246a5..cc59fd788788e6cec09451a42d02c48a5723f83b 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 656bda855ff77fc9032a2e13b331e40a08f4fd59..1ee319553733f681506ec59d7f271757360c1287 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 204e2abd14709d758714cf239e7ea5e47f5775e5..b8acbd1f17aa2f0b506d2ba91e16174ece8b4950 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 f1eda7f0178397e71511fc34f127eaa59eafe0fa..7659c50baeb72ad27a43625d9f1567c0b89a4374 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 fa23a84bad27f795d00c7661701e7ba29998c5f0..943b1081f031b9222de4df0595bb1b8efc0f4953 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 ffd35018d61fd77f8cc62ebcef7cf5164dbdb3a2..707e869b1aac1326537e6b8b1e1f762ab65f0690 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 6986c536b25e3baf0354ade08581717790384d89..3422efca7c032b7692301a55e99a99a2466c9e37 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 84df4e6f693baed1627943117d58374c42642221..803c666d8040121972ef2503cd97e5e91bf8100e 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 34ae2118105f04fecbc33b7c79454120df1d82e2..25395d0240f42c017794b1dd65ccde07701c55ec 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 dcc0ece1c8d89ec63386523c911e689a2f023663..6a387db251cb7fd06a5aa584ec5641d15afab0ca 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 ce13d97014297860d43ac4aa47425c367f0ec8ae..3e72b75a966d76e71f142e2077e9e83388cd8028 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 8032ee8fce2217f792d9fce9f3d1101fa0ff839a..d4d74916e72a7be3b4fa98f9e82fc4cad3425bc5 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 ba384f1f5a1f84019ae2f24c3ff72e46d1c8553b..ece6d4fdb1138b5e38a52f866343e8024707351d 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 e85f0980ba32b1aee092c635f66318525fd9c4b9..a611708bf34afe0d1bf1893ab0a9830d43c576bd 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 8bcdc1cbc6d64a6d617353d1913a201671e58d80..eb1130c5819769e00bbf09d9e56fdc3a93492ca6 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 6247e3c0d712790147c0d2beaa503e0ac34e6fd1..cbd7edcfe2c46ef5bba85f883d50ec92c2e362c2 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 9d9ff6facef889e9c5774ab0cf47dedd4e87b7ae..5ed52786b056103d66e10ee59dc95d510b602e07 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 1a77aab81b3fa94cd1ba430ea6c0240dfcad7d71..d8fa4e644af979ce66fd3cbfb470250f7eaea6dc 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 0ec666cfcf9b7770668fd2728e2b74802df3fb3c..e9f0b1143618a84b51244ab87d0a8c1a69400391 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 9deecfb88f677cd24a1143eec3a856406a708e68..424657976f50377a826350b4ab964f46bb6c9f6e 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 c006b9377faeeb5030f95800cdfe45a74a7493b4..8870ee3643e738deba9d686f2183de38c9491ca4 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 f53a52e4aa2928b0cff9c0444949c52906b02a0f..74d45175834fc353ffed253ad15a2ce3cead8603 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 395eb9492ebad2045c93b34af78822ee5b5ad568..3609a1c8e5d6d63df874cf71dbc79089668e6967 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 fefa78d26715d34e1dd18abbe248b24faf5412c9..6054bf0527da54ef6a5ab845df631078a71db0be 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 9f431495098232b2609d1334c67994606455e4f6..9aea56b45290f737b20379a819c7cb05af9bea05 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 c90f83a8f14226565d11b488d6ee1ec257fdc446..563455f8a74074b0ba544421c7f839022b076c7a 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 e452a215ee6bfc7ef5a4b802634bc0ea7a8dd332..7123a38f66a0b625d91e14e92d7401d94ea76832 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 4f5f34682ebb782cca97408ff63855cf414d6634..a8ef7ea1e94f3c242edb708523b202ec81a0209f 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 193c1fc4cf61e37bab513ba53f2e3994494d21fb..da377d20829c4aa1da2ff753ec25cbdfa3082f5f 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 3deb9eb1d59bfc5e85cec4ef7d13a05d121ae917..1af69811ae0f722b199dd7caa1cac0b24f470070 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 5d4732b675189d46cf765f26e0da28881959d695..4af0043dce263281a657a0de160822654b7e3844 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 821b694ed982da4f8e79c9acbd94db81be2d0fdb..e3e858d50d6a5ec9c5e115a33977451049fc0b04 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 b163652faef9627d2bff7751bd8141f8afe096d6..fe31c8593023df11511faf599164cb83802c35f9 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 1a4c15735c435cf4e40bb755730575e89654602d..65d66ef310412554e66dac516f3fda680878e6bc 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 7c2f1f2addfbabded679a4e411e20dd0af27f5ac..1944c4d64e23a84f8f33d4015edc379e3d891243 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 9477a44f7d53218f2fcfd254a4ce629b42b43d85..2787a36a0805f0e462bb95a64d8ac54161724cc0 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 481e8ddab8d4e4f92ec0b820c2ecc8df63e0095c..6d5f6c5349ad78fcd9287fd9dc667b9fbed65033 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 781876b027b58bbebd53818775ad461363589f9c..e0c364409fd071fabf8e22145525f2aea8d7c0a7 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 8005bb20f766c3e0bfcd0c4ae605bf913974b003..14bc53741ba1339640a88a61f9bb7e42477eeec7 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 0217c616a7f88d8e6ff064a97278832c9cbbbdee..8e6d8069bcab665354a82bdc5f8437206849444e 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 60c3ebf8fd279dc2bc5d2697082f8fb4c86eaac4..37cd1f75313d95a1775e48dcf1a3f6755525e8e9 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 35847aa123c16d211462a71e91850abc315acf05..b0bd6c56cdc9c439e1929564c177277415ecd37d 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 601b17c8380e82ee0d4bede4f96612e50d4d9d52..368da5314e86d8a91c97531b44a78e4c71d2488c 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 f818c381c16e808722b7e0f9aed8a1c6953386f6..51d8348b882d620d35cc6d54df7397005a904908 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 701a872577fe39061f4f823a820a97953f3bea57..59084b2887ec7130ace5f4171e4e777ccdf30fe1 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 d339127ea314b4e9361c87af19915233e0f0648e..cd3621fcda72060e37b41dbbffb8cf12e91f14a4 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 980e0c5f5c8cdd91c3100f4b73816a84604b05e5..f8dcc007fbaf4975406eec6f9a05fc69d986e4a7 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 413647712c6bfb4d7aafbb147e76fbce6edfdf85..3fc0793f7df4dfa4f8cdae5a30bd258a3f1e1710 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 86b1f23f61fa8c5e68e8505e3fa999159842126b..eef947586bfaf4c23deb9497438177b9fdb12a3a 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 0bcf6a3a2c2f3f7b2e2b792aa2657b0487e4c4b9..36a98ecaa7bb8e120feb1fa719b32e6303e7e94d 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 a94435f3117d28e61d892a2cc6ceb76f56d3aaa9..823e39d4f09fe732099f05ea927c2c0c0d4d6afd 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 9a5414408790879f7753e7bc6662f6a5c65d0101..ef3ec7303fa40f2e101f9c5f255906fbe85ac838 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 dd081425de4a3361e0739aad050787d6e9f4e2b6..576872f6fc46e903ab0b1da64e6ead0d1bdff74b 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 33ccdc91b0a77703deaa158900ba827654529793..b9354aedcc943bf87cb72851f17195d381214634 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 e8dcfbeeaec67bb10505bd60adaad41cdbf1d13f..440ec4d19c26ab9804fc810e6f41055fccab462b 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 e08ec18cfe8e44d234ffd321f6fe0ec1d959d1e1..aff1d492bd1de37912492deebc3eec685b5e9797 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 d6591a4a4a930388e2f3eeab701e92438067c31b..bb957a0b853892347adb813144c6d76c7d320b68 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 1fa4f0dd58d41699977bbfde3e3a4e332ee6d5da..2d75254cb02a2675607fbe675779dc57a6d8e597 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 5accc28c50c23024f786a06c90602cb667f81206..a091921a8f7957cc776060eb434dc4a0d7da4788 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 f92f39564745ad744fdd8a2ad96c42d0010df36f..3aa33d766ca0de65fc531a55e39554690c20f86a 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 ff893f3c161dfdbf92c418b083acaceec02d3032..9bf7ae15d18b65c914daf4d1196be12629e94119 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 919dab52a00e8504b994ffc1f114f1f22727f2db..5a12431ade084eecc8f520a472159fef488aba0c 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 d1d7dcd7468b03bdb15ca5fe299f48f207575999..d80dcecb5d0e96ef952b2ae584e5293c686207a0 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 0d6ac8daeff52eb8de2352f37a99d0c491ac1688..682d03573464829d33b6278678408ff440497c27 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 7767e605abc11dc368b08f03eb9471ca81b1a3b9..06bc5a2d6a70b9c914aca43193eedf3c1d866026 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 f0e2211ef9eaa3640781b9a3285ed955fffa23b2..7660e19bbe64fa82f8fe465389f0509b4230f2a7 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 9da0a5146190d787662acffde135c0fe23522f4d..e8cf805e67e211c96a61d59112adc7dd735deda1 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 425aef88a58f3e47837b5fdfa7698315e8976db0..d12b62b2c7b02cd7c074f7899264369a72bf50b7 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 f3c17f56b040320e61237f2dabc4cdc765eb568f..064444de7458611cf81bdc8cbdf46721a4edb980 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 63aaf52381f70ef371dcd8bff87c5b01200b3834..73f0ba063238eea4426660cae4ff54a72571dab8 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 4c03657b5fa8d36c8ed43c6454dc1f02841e22ad..c33a0d70c6b9154999e2428e77e3d2e34e3040ad 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 33e8d0749db304f6e2726ee413ce60e4eb5fdee0..8252859543db0b2faf6a35e590f556a650ef7a7e 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 0c80bb7431230ac142b99e01e0ec929eb9979cce..a568aebe15801bc676a26b59c2a0ad72f762c0f9 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 815b30edfba9538387a128d220c8fc12f7c874c6..682932873dbc53abffe1ddad95e0578639b5e54f 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 23510001e45ecfdf74a3178501758ad51523ec4a..8917fd0d87365b328d165cae1ac6f2a385bbb6f9 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 e7c7017e05547bf6a5fe594f066e6faf2b3982dc..579f351d33855abcc52b0c98d340626248adbaf3 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 4032949ce65ff8fe72688ac7f411b300879940f8..1229f30cc2b21ecea43d75f9c1a48b65ff3150ae 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 3a93da7cb0ddb879fc96f5adc73628b7114ae301..d10406a4aa120b7238ebc6f7cd97231a19bedec3 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 b1c0bc10b6e4ec1ec8b09ea683dd66a6a8828653..b92a05fa5c228bd7470073e93f6b49391851f21d 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 58b9ec74959515d9e1823b2e81e52d51cc1e29b0..67a99eae0328bef13a1740eb6bb75b0e31c17ba2 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 cfed3c56d73834dc46d0931ed2aa51b5a164527f..b809191ed602ba5660a6a00e3c15cd76ece87f2d 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 d941089de01d46ee884c54668c7ea1fbe3bd2c76..9eace74305d9d0e04f9dbde8e1bfb0fa7dfa3b0c 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 e295483864d0c8838cf288ce515daf2f1f12b796..22de77f0afa207d9241f58fb5d6d65cfadcd416d 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 433c3b9bdb0f1219547572e3adb9df88d05b4e09..c31161daaecb6b140891092b3b002c393db35786 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 1fb3a75c3dadf927a4c1635769dd925a2b9701db..d0187a5dc167e937a1539a431c69f13d1b134abf 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 8f0ca68db1cdd99371de5ef6a3649640655cc480..f7405e2af5ccb53b2d995f2b6dca9f5e1be748a3 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 8529eba8c8c7192a02c0851081eb19d73c516f68..389a4b8d8a5d7b66d4a29209d4ab302406da4611 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 64aa1571357d9b5858c2ace6089e87d095c1b628..30bdaaa7deba8b952821d91bdf4acd4c99f4ec71 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 87a017a047d72f8d96c6578e235a8314ed68b3ff..be821f2a4c91b4beadc5a6187b2a61ebe4f1cda9 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 eb90d149e355508f4a12c1cb3c268755b06ab4d4..3bd4982bf99ab6e6327f3ab578215a94ab2d8082 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 c04f26b9960d75030e18e9c48abd5d261bc4ea67..d521acaa47cf9effa7abb3daf6018dedb5f3652b 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 ca9968ebe43e3e2f7a69a18de31cd80d69cd02d3..c58710c08398fcbb264127917c37122d88f99594 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 010f408a9c7533a8e898a20aa2aa31e4717b151c..7451dfc49846f011b93cc9cf16b69a70c621a58c 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 3ff4fd177a4d8c948d9e3a48529c0eac9f0e83ea..49c677b2a2367a9f7651ebe0deece4efb9f15314 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 6c174239c909eb50e87455dc34ac96cdbbb6f6a3..0a839af8f8f90098e89d0227e0812c872f6269b5 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 318d624820c5c6153b919973dca67e940aa1b770..da901a3bdda22dfa82cfba96c15fc5a8a48cb57f 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 ce8e4453dd0873c2d9a1eba5691f87611d3ee2c1..b26759fafafc9e50b7fe13f7c6509ad52d089a82 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 56cb43a4dacac9ce78234aba9a7dc89e66942ba2..791326199686d07ca65fd3cc5b1297b0a925d59d 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 c4b081c5857cfb201050c8e82515c35bec908eba..bb462013747ddc3ae475bd703b5ec98fbbd0f2f8 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 84fd51bc38cf7be104854d52670661523c920de7..9208b25a4a92bc90e77a79723d061633b478ac69 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 6d3dda657fbb503c74c341eb504bda6b74730b17..a63858c99a34413190013266fbacbb35097a55c6 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 c83a7210def522730c365b9ea35b96760a3f88a8..f5c028bf12ced82d8078968aee9b51cc4afb0a44 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 636b89529b5baed84eead22d2fad329a5f9e4f47..3fc72ff28c58bc529087ee98f3cc2002e95241b5 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 219f067c5f9e4f798625c9e0e59df97e40608a3b..158cb8b3aafae3aad5fe1243d9ee460c8964665e 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 983b1c7fc5b37e08040c2f4a4d5af6a12990f4b0..ba5963b2b6f1c22bb3d51bb591b839f17f0ab3eb 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 a50fdc285de5a5cf89077f0b02529ac449936993..e8de798a1f0a998362370b213e07f56663f9b770 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 3e9d553648cbb74ea0b52217a8a5af59992f81ee..bf7eb62af635ffa859d7d4d70d830cfac6d0c1be 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 ea3aca90e2980f8ba2e13b65d73eca6e8da75f5f..1843ea587f41f414ae474ce2eb2128b2569f47e1 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 13743a2dae146ca354f6eb7ecf7b0f9aaa55390a..31b867ec33589b24277396a31ab0ff0479816218 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 1c9da2c033ffe030123e254c12c8e665cec67774..22c442f0bc8da7deb2fb84727f7e9d381407c8c4 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 ce2cb42f80a37cea3615e7ef8df1883955be792e..64b823e113b5b10100ba376e9ac19f5299ef232b 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 3a96fbd299ff86c2769e6bcccbd6c71e159427c8..d68e4dac49309fc256423775b6f0652b8ce54894 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 b26f5b77f3310d2a6fc7d29bd0999e966dc465ab..d50bc8e832ae3b2eea05c01801f9e4ba48adebf0 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 e5555a53836ceeb8cb32b82397f386e6fc2d3d05..c23371a91980a14098543000614e96e817067ec5 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 25f571a2bcef8d20f8df73f2114e19d9c8b49679..381234fa9a44760b2a8593a41a905e626cea3398 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 a5dd56c7ace3741eec7930c0d409e290dd93b652..ec51192d5f17a87d68963c357864772ba0a54840 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 e25e4d85e703f5414e7db5b2c596a9d7c4a52122..8c109c29e92009527d260cf51a1378811ac19fbc 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 8f6efd6015d8a2b062d7f942448cdbba2ab2e6ae..e61c6cd460f6185c7dc0e6fec0c2e51f8a42a97a 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 4eebbaecee83693ccd08ca6624856a5ca8ec656c..4f7e8c7170d4aa64f0cbb7bec12c825c15d07140 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 c47696ac418ff8c3fb5f61dd12850b1366050822..388a96604ddd8f84c776f7f1aa96da8250cbc382 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 3baea0c9bf76e8fe524d3a685e8471b946afc5c0..404e3d89d8315c3f0628f166bf4f6753f2723eb8 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 9dc1afec1c5221a98fbf100b2d0600dc77f26796..c7dde6a2f472c7a48e7f43daceae9b9b697c967d 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 89e2fd0804138b7af399dc56f3a1262bd295ce4b..ddf4c2d76260eb22be030c825fe70e901e4ba09c 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 351580d0fbf51b8252c56286b36c09402e5a5482..ad24776b414eb28a2d01ddd4fd74d9d00da021bb 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 8875b3f76d09bdd474b0bfcb3ff131d13ee3d57d..fb8210a18371708d3966e1189fca0cb1e9c96ded 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 5cb22ee766ed794aad2e638118f2705f387e26cc..7eb2590672a6db528dfc0ae1a8485d2240488229 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 03735622efc968a89646c2a41bd36a0e77f3f541..c14054c5f1d295ab44f1fffd7a0409cdbbae95b4 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 b08dbc9546095723e1ad7d52b4a6684ce18e1023..ea7862e94cd55849890c47e08be734c046e9600d 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 af5a2f36bca40518e94d52e988836c68ed73b284..5c1df67066e78255e714f600f5623170d99ccca1 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 5535b72ec3a12bdfbd18477c9db215b7a8dc5f5b..a5056b77a12c01b4939a5d16d8169a03609c6453 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 60bfd635b1438b669b3d590f096878ed22f39c2d..13ea3e1f570df8f14fed7e6eca45248d00d524ab 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 6d9d2a542fbc41c566340e80787d6a0092c98dff..83c8d6898b9e3c649c29cbee2f85f0875b937bec 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 bae4ff909469fda18034d99804a5d5ee42b919d9..a05259cd9803f1c1d0a2917719999c2dd167082c 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 078b9a1dc5970ef19e2181c4e3fc09f7e37f3523..d227593bdfd3d2b2cbde1a3670890819c0060b83 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 d257579296e7bb5354b7c3f64df860dc0846b670..ef1993324fcb61c185aa001a978e3e884065eea4 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 c1627ae98bd37f93077c7d1b13f81015cbeb1825..c9531cac564ab517937794d486851f10e05d82b8 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 71095304f170c64b56a8734d5dc068f5f06f731e..0d7a05f0a14f8722813a255611ec39c65e526282 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 a445101be528c98bfb9e36cd488f168c53824507..f32333713444a666d9d64938b81634594f17fc60 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 342ddc392c8df933347a96bb883e4ff4307f6b68..c6199a7623b72a180a5888ca14963e64d85f8589 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 ac8769eb794cdbebd384b66801a5e7847bbc7d26..a9555042aa375b48dec9d44cb96c26e00dcc89f1
--- 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 ccb9d8135999ff25e3d12f3ce96248f7885b677d..db1a2745461017c071e8d1d75ca5b1dbe1e6d889 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 4c032bddf7d46ecee5f66b7949b0e6c197c66859..7fd9ff2473c74b4fb18ca5c1832c8525b828b921
--- 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 28378af5aea18da026bb4be50ae74e97dfc62210..57b11fbf07c0a62e4abab3abf32ee1277983353c
--- 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 d4961a6f7bed5b1ae7a178e5f79b421c9d29c8e4..09c1e6362e9d23977f4469c564328e7a690b5ad0 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 575cb99211315e2854870baa75d392ab9eef322d..8454b473250b939ee3c84fd4d6b95602a99f2594
--- 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 a92281884835bf67a191946c5df27723fd8eb5ac..3f6e2a7efcd892f327237739ea661f6ce9e9662f 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 fc6c4577ee0dc683549bb6ccb38ecd6555c4ad4f..b23242a484581a93a28b400d29e7aee394b4e538 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 2eb0d987f3af646dc6234c9a8594ee1fff6ab41b..04e21e8bb66ff0df295bd7d095499f7cc0b9f3a4
--- 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 c81311ed0aefa91373f2e122d0c6526a81be0460..0eb183265dbb0f6f4327a6c459f488d4fb426803
--- 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 f823fcbe6ce1550a2ff9eb753f544ce21e12f2a5..5d1a8c71eab5d8fd0e92d759e709606ea58968d8 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 2e94809909013ffa6beb764fbe856ca840c1a5c8..cc09408b9666781450bbf21caec241da27df8ad6 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 0e54b304a793e4db3e6b2cb631930dd09de991a0..9b7a6e8586d00f65f16dfc72ae7492c3095b7ca3 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 d0e97c8d713c57531a32d1ea4f2affb8ee52beb5..463291fdd918bf0efff7d075f20291e49210a824 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 a6b3687c20d23bc5b92de672bd8c4e5811492938..10cb0ec0f3d73554b698856d166630efbb790f95 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 8b274bd8e8391fe2a92853ef7ec5a9aaf8c6ce56..a493d4bba9daa241ab568e76e1b9925f50e2406e 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 c6fd70ea11fb9e0d707b40c1990e3b2899c60a80..1bdc22a31ddc81dee33d6873447b6675c74f5414 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 fd36c40d84681ab7c47d8ccb996b33d38b7d1628..33b83ac8c5e12cf601064f2701dd20fbf024bfa7 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 cf25e2f8c5b21c412a9621749a9bc2e32035b630..4e7a13133b2de39332cfcb08ec25920932bbd09e 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 bd743742dae65e9b7332cc29166d410ff1fe97b6..08a8fb9b1e018d250f0c393e3782c7c5acb3a9c9 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 d3c1f25c2c51fa029894d38510089d1296f01792..48177e36b920fd6c4232a4558e80cfbf1bfb9901 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 d71981c1cf64922858d4126dac023dc7f2343b8a..4acf7ff108398ce144065b5125f03a8f0d34160a 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 3fca7cd3d81790ab962d6b275c40d808b2247197..a95048288085ae5d36048384fa409ed2c244bf41 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 318a6cd1b1161d34c319ad14c025fda4f9be754c..5db1afa7a5960c5aecdde6d7a0d4c7b2032a53b4 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 d8d85a220393560cdab8cad4cc224f1895f98fc7..90db5389b3eee4a1b0a54fc31a7818b55ee742d8 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 2dc3d9623c11dbd30326952ed39b8826a4ede896..56465f1d39bbe64d83ba201e703fe745ecf7725b 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 f5394ba2f465ff24a4ca1a08242be6b6802b4fb4..567e83a4bb45d1f12febe2dabd437565c4c495c4 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 993b8021b623a7d9eb9cd4524dabc98e198aa5a9..c2434e36e8635193bd30a34641b0c49d655d6d7f 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 3a6bdad019a82b9a9d44635ee18f6038b03988d4..2781a475aa4876060cce76b3fda98dd72fa87881
--- 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 006005e947d05a48d449b5d604e2c3bf4c20e956..b7a0124396cd27056a2f00efcaf08a4c2e7e2d8c
--- 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 67e394a7e128347161b78fe5af766538aa10ac4b..b175ef493ea807eacc550059f59e1c15a6c9f199 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 3814f53db1907019cd8363aecf4419bc27cf8a86..94bb6efd3e44a7633b32df8a6743321bcc51360d 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 a5f8fa5207304b9b94b29ad68b75f566e58eb3e1..157116f0004200788d35e2aae6581d2aefb43b52 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 4ed814a201adbeb3ce6b180d1ae74297619c45ec..c11c68cf92cfd393fb9bca9b0a13529c093f13ee
--- 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 254fee6b92378d39e8cb4ad9bf7a697ac590d1d9..247518938a9ebaafb55f352fa94854ec07694b5d 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 d3661b33b9765c900a2bf1193b5e24d2c399fcfe..088cf963009e2e49647d9483e91c746fc06ff44f 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 6321a289aa1a855447b67b1b1c5fcf642e2a1a5d..eacd0482290839530462a8884500cb6c530d1e3f 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 2274fcf4de7e705310c19eb2c5abd749d2711cfc..82b1af9b89391fe1eab1125b93b866fd3590cc08 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 438fe6ac1eb78d830ca702cb25b64cb211a33b3f..69fe8b5d178b37b123f89daeeaecb8e515114c38 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 29b9382e785dfa19055d5c0781fb01032a39150e..5a5817e8e8de146876f160a75f904ac08a5b0622 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 e8d55c6b224e607e69f027464f9676bf81a13f17..e3914cc625d9140524b0e5432df8f679c3115732 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 66b27a02f160cbfd5e56d0fe127166ba8a9f96e2..08f938109446fde0216d35ab4f46379ec7437785 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 0d8a35dea036240d2f9637726726c989d632e37d..729b05809719fd6a35b6073487336709c69d3502 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 c97a1065c9bbad5f8ec83ffa0a075b76eb5d1fd3..958605f398ceb8afff1d4cb07308ffcae4252ca0 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 9f93525b0009b15b29b595ea638d13a4c05dfbc8..00dca0b206b994a46d24df30a2d54c296d88227a 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 4dfc756521de65e53d102c7e11eab6735f9e133a..3d942e9f930ab2330ae33dcb507e68b51f8e409d 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 216311860df81e5dbaaf589588f4d55cb07e4114..f094e87356405845136f6508f05632316c791043 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 afadcb953ee8904a97804cbae4c66788dcd89582..1c4a7af0c38b6d72a6b7bf6f9b03185c21a271ee 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 83720c5a7f68847d4022b6934d1735b2c7160382..a5d0cf2863fc59a3c84e5e68218163db8878ab35 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 e1d20d66419208abc4ddc6c3ab2c18001a082df2..aa5c9b17468a09411007a5b1bc63eb1890f6de88 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 880886bcb8904da06f903a653a3db4d1b3f21b9d..cf7b05790f7071cee5ae2104e4369ae51dbc1e6a 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 5fab092976dc758327ae163dc29d084cdf8cae99..6b2212cfb2093d1e7e6d3dfc2db4679a308be802 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 efabf0e9570d1012f5b661ad0fac9740ce373541..0a22cc9190a9583043bb411ef0303344cf991722 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 30d5e21801676d2295a430608b058af99522a861..07a4c24cead3357c3df990c5b544451cf623d8a4 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 4ab7395c0fa6bbbfdf701ca7097f2eb061083acd..b6b42df01c31b955614be6fbfe11190536935f1e
--- 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 d6ca026ff72cfd9a7b78a49ac2e50bf9458bf88c..93dc752d58165cd205a48fccc7dd9c9c2b8b7d12 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 a2724e19e1e82687d0904115a455ccc64b4683c5..e790f2cf5638695644e232250596de8cbe518ffd
--- 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 8c7c64bc8d4d18d507c81b75ace5df7b5d72a4c8..79b9445474a8e22c42f7831889fc6ae80be4d3dd
--- 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 9fcaacdede3149d9d94b4c50dda70caa16bd2d23..ee866fa5ddcb05c458e49b496efaf41fa68b69a8 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 911ca717e3b7f458d49b626b8f6931a5c580bf17..8ce204ad89cd99657efaa6d010d23e770b569ad2
--- 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 d2fffacaed1c55b1774d46b8ece1bce67c93b3a1..28fdaf32e92741c82ccf201369719d40fb2c5287
--- 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 059af1e6d4244a76eef5e2789d2418066b06d6df..4f2815e0df1487c4a6635b5fcb49192b02bae4f8 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 6f513d2fef2a2b244d1e0ba56de4d5dcff5a401f..f545ed632ce8a56ae638a3414b9c9c168e36eaf3
--- 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 83253ba468c7015a275683c4f3b66d51fa7ebe5d..50abb13ae6bcbb8d59003f1d61689bbd43303347 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 b13ba77ce005868e1e5c509746d85b8b26b4afa8..8176190bd99aacaf7e33be9f398539262bdddc88
--- 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 a4d9216c82b01724b6882ba73247dd77f78336c6..a578d67c2cfbdb86a4c9dd8da263350678838078 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 953f031747a24d4c9e7314249fb928d2ad1a6928..ddc822586c7354792a47f9dedc41ff48eb125746 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 93d92bed0751b2f585a33a1dceb243e2416ef36a..1705c4792b3d6cf349d51f44159d6d41226bc884
--- 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 fd4eec0cb2fb44cdc5c00a5a40f1cd76cac3c2b5..3d0c720d9f29ff03aaac564b74325719d5b04c8d
--- 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 3da66ce04d05433e95952ad789e565ba32d97968..84c59c788f56c333ff97bb056dc5924d02ba1d79
--- 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 ad0a40387c4b328e02ada1a2bd250852493be993..26b9e4c4447088df0aa3cc782db446fefb45d976 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 8f2a82cf569dcf9cc610a679993b732baa5df2f5..40323b94ab08532b4f8ad4e279e08262cd37cc39
--- 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 a47fce75d21fe56de050a62e557765efa97625ea..0e1ccb3b12af00340e3eff0a9e2674d4aefb5ab2 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 149db076588a2461fb0a50f84ac3fb140197849f..4f413f6e931af8486730ead483ace6e1d6cc3b59 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 5e777faf0a1cca00a8fdd29a272bdab89c931409..8b3457fb76cb98198d35e2ee2eb1e2980ede3092 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 aa00078056e2141900f0868ee3a5e17645f35e6c..8a07e5dc01fc1fc2e168fe8ef4b6231bbfd5adb0 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 eee4410313af74af2b1fefdd5862908218e6363f..2affadff16cfc62fd6796aa337cc8486a99f5827 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 4ecd9a4b88ab810ee4b89790a2a336d38c3ea24e..2648007c85ff51b3f2758931a8061a952a66a4a1 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 bca378a1c5d21f0b6964ed9443b5c0cc8ef210ba..4c8301cb79b71122d17df6164a6af4dd8c4b976d 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 96d8e25a9fdfd6f3e069d1b23748e1088acf18cc..a932339244517bcf42b5bf7c6b9c6f0ed5c97bb6 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 84756c425ce0d6e6cdf48a3587b3be18b4e0f58b..369c5f6e5952b7263eae8ee4e527cf18f823dc80 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 be85b7c72a3d490db66b7c6c782730ddff01b06d..64ab9a7ffad1c2d0adfbf251429ba92aaab61a73 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 4adf8f71859987381fbcec2c64c6a061b5747452..48fe7668afb8f5138af314d80578f046592b34f5 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 86f58aeb060c2dbe406d60edc5cfc409087d5136..94ec96e12a96db5f390390203c7a396bef599fe3 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 073eb8cc1972001d68f87b26253c8901dcf6256b..4c95ddc9461fe6b15900b73741bd7b93a3266a3d 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 fa9ea04666258ae15c6b1f9e01b23b1ab202d6ee..9629f0502818c00a4505673fd24ac1bc4ae4a055 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 6e03273ea38b4c6eab297fd180abfef54787ead8..2c20b8a4f839a2156a1df84d9113369d958285e8 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 b9ac61b6b81a338b31a279f24c29dced5fba679b..c9f8ace5c28d476b1dfb335b1dbbca22542c308d 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 e0daeb7db6d4ba138216a8d8e8d0466c98b724f0..cb02e03983c4bec3726c6ce9fd45a708589c34d7 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 c351d5eaaeddb5842433b704cc283801570df8f3..343563d4103815bcf147281a8ca1177fa7510b6b 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 5618c5eb14cacd677c1b7cd2b9dad5eaf379a113..91177eafe4733c045e15c2dff09c12748e92dcdd 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 881cbb898e2133ec54c6f797f0c689c93d522808..8730509cc2d217bcb7082d7d46d20974d412ed5e 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 712eb5f7c3b9e100969aa0dce6ff0c704480c722..3b256e29471d8aab56240b884dea4959173bcfb6 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 3e672a92ad2d29a596513fc257f8c4a56b6c5632..4c117cc89157593c8eda03bf954194ea0aafd3a0 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 36844e275763e6ceaadfe1c9479f9f1fc30f60ad..4d7b56c55e7c7beb1bd0b880686c5420f3a7ff7d
--- 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 d119c53568c0f8fd9dbb02f76d9a92ebfda8b97b..3dbb1fd733d6ffac2efbfb47b813d4da1f37220f
--- 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 cc133747a328ce295a9d4ea30b48a548b9a3664e..78b125ac69f0cd2fbc440212b982057d19503cb4
--- 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 143882965aa7458bf800908b9654985d944c3bf4..7fab00d1c0a5307b4164f7c4d9e52f7ec1cb6d16
--- 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 15aa6d91b1ce98db9488fde8145c6f15acc85815..bc56efa3e942bebd42f3cc209743966dcf8c5bb3
--- 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 c1df6a607a7c89753db19ada16b29d8c583f454e..dd9d9731583b7c992500d87bf650b632ef25fe5b
--- 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 95eebca4004a6ad4454b674d052aa626e629afed..cc32d70db5faa463ae19614f28d6136f1ad4395f
--- 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 e259423794125455c6c64ea670f53b4fd4484915..12332c970ee2666ddf343a1a7f703c794bd9377b
--- 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 75f31a8852a768cd98aa98f31ae8d595690a1ba3..2c37755255dddfde84705bf1008b1aef48860d6a
--- 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 5cf2ae37c0e98b22e2f34bb3b28ac286b950c3eb..2ab33182efe6a15bc1a9603f408cd22f3b438e79
--- 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 055ca8f0edc99850117846290f5174aebf472f2b..80cd6a657f62457840bacf3e2dfedcc671fd2c12
--- 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 89ba5be48c4a18d339e56d1d3f9e1f6aa04373df..f4040473f292294166e337112672dcdf2ce1f8c9
--- 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 a593480753ce5da1764d4412e2614f3cb85f28ae..ffd16961f1f647399eaf344575221eb5f6dd2a8a
--- 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 f614ed02d32477ed794ac77cd2a67c84e41442a7..9442df20423cdd21b1a2a4095c1616e988637ed1 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 67c2b45bf5a31975dc7cdcc8753ee0feff73bb8b..9f222c13379d5b1dc0631d3208666bdefebc9a3d 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 76c51cf0cf79a03066b218a3bab3d815f07cf409..bd7cf6c85603946fd5acab3bf45d30dd09d5695d 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 45382ce4dcb9bfa2353c600a209e70c3d5346299..2bd9a1c9722a0d83f67ddc992b7e4a85e65a5952 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 68ce3e38a957d50864e4ece74a46c9abfeec5306..ccc5cc79375f073ae2de2282de6e2171a2301d4b 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 294e707cc867b0d39187bfd20ac21a9721264010..a4a623f1a64341df7dde4b89852f044ae421351b 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 38f91ebcdb99557b243f54ff52d7a78d8872e4d6..eeb0646b0ca3be728846d90394fdea682cd799f1 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 5bc28afc706eec4355c0d5c4bfb89705ed6af55f..52480759fefd47002e54bc38272bbfffe411b5ff 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 08a90e1706d8f76540b58f87930a3f8040d94cea..0afe4bd65ffb6f08db4cda9f4f87686cd61a123f 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 a1c881e635a84d71cb9feba6f4bb0dc60fcb4b51..52479b4c2508ccf2c49d26125afe4c5769f160a1 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 7e804278320eb9cec8d219410e16e87dad199e21..2303357e1030ba9394488a5fc70afd87fbdf6115 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 4eabbc1e48b06f2ccd3f61262fa8a321b6c9b63a..e2e904f17769e60ee543caa9365e93dbf45cf075 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 65af1a3355b068ad9385b7e4570ea2f6fa3f3bee..262566a7185cfeb978191af83e32528eedbb9de4 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 b0f1dbafcb5309130f57d301286dc9f8f158aa96..718fafc34220695cbb93bc7f2625cc74923951e4 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 2ac7414c4c28adc4b88711f19442ff16098aaf26..e2458aad9c32fc6a570fa20d9b5893ebc59900fd 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 c11e30b880a83ad9702dfd904f2f847f88f0b341..4b3eebd43ad583105460e3405645d8eb4b0ff23a 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 befb1f53cd7d37e54da89eddbfd00b3da44be89f..6614897453db40ba9633ef4b1e9912792374680f 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 07df9d94568624fb14d1ddba41fc6d01a6f946c9..7581ff274006015c3c757de6056c8f57fe5e8f62 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 bb502a0844fd5bbd1626b94bd2e395566a37f4ae..d0f4cd615672242bd126e2d0cc74c76c78997b05 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 b55350afa73ce01f8e7418276be98560ef495a79..3f79a1dcf60572ff3792d748b388fc2586657df4 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 80f37414801f6142600710005fc50ec19bc798b0..58af7381c2531161600f504a8f218fd7d935138e 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 afba67ba864627c5ff51edf6275bfd2f8eae4040..45ca45e804b39333371cd3560ed9d2e5dceb97ca 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 7b77545d8733f975874bc760a9aab70836378390..9d8d73c6418bcffe78b008d170dc6cf3b2143f43 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 484d859622c066ec36fa092be0557035340d34d4..d2f644151fd973749155e0edc0a13e624915b82e 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 8502822d3b4ad9fdb4cc9e86162b33411090ae22..090c2eae596901c79437b8bee82ab1a1fd5682bb 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 10e56a6c293fee5d66666fd3f27bc54f2bcdc073..c6ca4f49d6adbcead0b2934401255591791f5efb 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 2fed9828a7144b2943d579d20b1c49d40e34b5a9..188b54f7c2b4686abdd28f63ee8534e42f4f531c 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 563b68b3c8552843d9e3063d040befb228ab9364..05c9d6c5fcc08692c31f6f21cb1c9ab5ac0b887d 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 977396f1e1f7f3d49d3b2d480005ec2ab8282e45..964dee7f41ae520327b631f7f881869e7f4a096b 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 52cf290aeed76165d8b419710ff43d7dc62b966e..562cf24d2ad6afa54b4d7aa0cf8646895a9a0490 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 2a1ae8764b7b80329a77e5105174a65c19c2a944..bba979193c5382024dae3ca1b784003e196e2271 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 7743d5ca30cd6eb6544ec62bc8d268a51ab6d1c1..1db0338c2e0a91ce2ab26a437e02a04698885c42 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 fed4c6801c56476cf0f8958108418756c46b4b35..a9b05beafc7979310be1212954826a7da7bc86ad 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 0d9f6befdf8607faa6213fa6ffcaecfc293ab6ff..b3a8c5ad0e31187c40dede3c2a7522545cd357be 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 7322bc94a2eae76233120889ec18bf087e403646..cf1c653261fe913a75d0a168d1c1c3956f8bb6a4 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 48b32f62990b905c13a59a31da94b54f483d2673..4fc0fdd5c648ac19e9fecd803737fe10a227379e 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 65b2a7ccb6999dda36a9b35bf4a184d78f782679..bdd2633a0399ca33459c6ff8aca5246fa34c2988 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 4d265c3ade109b0b32198be58f23d9dc2d7b0339..1dcbc6e3549cd0a4e54c3c8452eabf0e224bc6f9 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 b6758800abb33c06aaa0b670bbe11e74f1fd4868..7068179cbb49aafb4c06c05974da310abd24dec5 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 8a7d14919965ccdf5adcb3a597f4dcbbeb4a215a..f7267321505fa52cbfe6be105c05befe0b8aed07 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 e99e763fe3e1aefecaba2df579179889905b0cbe..37fd7435e37a562a0e3783ee390cb842893d8659 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 aa2a6f26828afa68d935a1e000fd9734268e1d40..6f83dd2d74aa654edc2222f3193ae9cbc32e07ce 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 812ea17cd30a06b8d6f5d4c15930da8ea50533df..8a5276338ef28ba2b97b479bdfc5c927940b45d0
--- 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 718cb50455733b14a944732fc58070a1ed20fa59..9aceed30c49675335bfdfe86bd112dc0367de5ff
--- 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 c788daf42572af2651e3e89ca4ca5b1ec0e7dda0..bf7a8bb5e6bb03afcee3b6a9edf373088d64673e
--- 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 da8a21f4288ca7c8c6c155b7bb8301eb34469934..6f075c9bccab808167af3a5e2cdbf6c5b33fb85f 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 1d158669473b8ace75d25a08f178298a640aefa8..9f5b23670a4b45dac220fe24eb305b4cd4c305f4
--- 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 bcb66bf49a73e2a7ac98778a8507f10b2f485de4..daaa9f53c77e1cccacf222b3e6b3ee6b9ae5d16d 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 c5b97b364461cbb68cef324e8d4920eb2c4bb220..eaa715aa984e4ad39e2783bc335f5c4d1516c21a 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 7320794e2bd9ad68bd1867ebcc9e17d8d3504164..389bb34a9420039255356b5e855879e7f6adc97d 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 41b4e9775e490ff056d696484658750de4b8a3da..1dc960641a33494a5dbf7ffab39f397919f5c5a4
--- 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 a59ef928e7cbf2097ad67c3a0e1d2adbce9efe31..2a04196573bceff72f942db5d82bb2de54ba2ccc 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 abf7b8896255930185444e08947fc30436eefaa1..f6dcbac32f392f25a9217b281123082b38c9d9b3 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 c6727d1253227ba7854aa4168ec6fead0c9ffdff..5d4f88e11bec223a5012457c74056e37833252da 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 5fccd38b7578fab9e56f6f19c8973369f6216e2d..6d72d3dcaab57cb3b30dbd05d221ced08f65ed1d
--- 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 96fa3a15c25f90bca6c37c584eb219df3b2e3141..ac7ff052d9268bab48a4c99c5b9ebbbc3ddadda0 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 fbfa1aee224a64db222ce4eb593329320ca3ff35..2bfc26e0e03f4e18f6c918e24043c9292ed6d5c8 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 412283e32a97ec7866f32d6cf21f1041da3bdd28..452562dc774e00f08840fd40b1eaaa31fa9b5855
--- 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 1de05ff6c5a8a2365bbf69bc62cb842a97334367..e4995daf51d1ef8b527232a48c00318163f745f4
--- 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 5a82333a7a08af1decd68482666d905feb0808f0..11e2d09e7ee461e13101fdefed39fdb8e4f41253 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 e2dbd67cbe8419d27f5516fbe394df5c16ca8937..c8da50fd698f1f633a295783ce0b7abdddc9bb6a
--- 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 34692f2c2c7c29900f675ca04f0c299c7b3b3046..15dfd020fef5f67e50e144cccc23586c42416ec5
--- 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 bd10f0262cb46b5da9ee380389e885b020a2e6ee..d64e43427a8cfb10a7c3a28403963883b6a229fd
--- 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 7437282e03a2638d5503fc916d050cac2009c185..e4d6ba23c0acce0da66bf4f2a04acccf910f7935 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 a4db9676d1f0e1fa019296ee3b9403fb323954d0..0bebf8563fe0a42c2410eb4218b629239a54be40 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 e35fd3bd9da1d7fbbb0a380cc85009b64c54e120..b8735c4074195f0cdfa31e9603f5724ac7d96926 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 17fb14660a26083b1d4ebd023935c3240e47b05a..c2ea75afd96a713d41e7e95f81c19d63d4d79277 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 1932ca1faa3904f487711aa658df5f2cc93d09a3..c2f368de44ad7516c5c859e4f02966e8f401f16e 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 8af7705bfcd62efd40c021048c59eb0391c4fc9f..d3b0393202f522b4a4932f026b279da0a1daaef1 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 eb64bc6faefc6e7eaab8f27f34cc280e8e027f19..a07e1ee1a738708f4505a34292f92287a9fadb1d 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 7acd42e850f64d973b311adca6705b5410298e04..ed27756595488e55dabab02bfa1628552a867221 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 384cb63fca254c9838154ee02e3c6303df04b2c2..255020efea4f0c64d6ad03e27e6845e85f1b9f35 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 34d2e75c77d13e2ea5dad97ce97702e80c05949e..0dedacd28b69b2158bd1722446753e497a68e5b2 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 2ec492f9f56cbe3f14a7f75b7883a45e79b29af3..9006a3db14d6e19e2af3808dc730f21d35a6a225 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 a606f2a1cdb2bd3cd2c8cb32a76af94e077426a8..8c8e7991e627697b1312ecc369a469bf6a41b8b4 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 3a19a0f18622edfd3b73bcdfd21f5bc5a686fa0b..7e7fa73bfda23b16d5fe3c3205272bc42c41608a 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 2987883fab8fc300bef5d5012951d8db0f12f4ec..bb0b18423ad52ad168a5736f207b71dccd38a9f6 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 b4a2ea83193f91deb3b1db0d1a5d3ef2fd115985..81699bbe0b699cd4a52acca02a839a0ac6983d1d 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 672974f6d2016ca273b5c2aa7994af9d19015694..825c01072bd7cffe6dcbc636a928709aff07b450 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 c7ff2c8ca3e42b66f8d822177cd2c9814c0941aa..af8956bb2deb5020d26a9dc1a52e4b923e4e0bb8 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 ba42c4fd4eb6bf72cc7014be7a89b230b40377e2..c2e9e040189a9c06922308c92038861b69558157 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 8faa604272927d98b443908709e4b17be9455543..cd3c9d2cf4d8678e669aeeb23104173ce9ad53e3 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 4e9f5361992c9770c605d774ff6ac6560ac03b6b..d21992b019dcdfc92d024270d2afe41fb439b848 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 1be343b71647a71fe5d8dc917289f4c274112ace..3e99d2a032cc75e3f20096d7ffd65e4f283de027 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 daa6e1b6750bba308135a26619109cb19778c949..60dfedb78bcd00228a881c19900fe021ba0c9f68 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 c856026641495f072390369411fa7157ee51efe8..8548f28dc3bde18a26b242b86c440685fc53c8fa 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 a0c474cc0380e178286bd6bcf61e55f727b06db9..52f530ff86f9cb2b5dbfaedc721b56ebcf466614 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 35d74a73cd7e57616972b190730d799c328001d4..1fb1fd1c03558c69552b6b460f58cc3ba4a5e2b0 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 9f02f7c26cda02c4dd36bf2cda8af1672a4f06a0..232acfe3d38a55ccda3720148ed6ddb2db8a08d1 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 bb1f997e8fabbbad1c67a1a8af77e38aeecd655d..9145158d5a4fc6861933e4ef200f97a557b1deb0 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 0c9333598d17dedddc7efe95b12aa8445c542dfd..6c9564d6b417425cb6a1bbfe8cb59b9d381464f6 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 218a84610119d382110d8a5a92dea6669f55322d..0d98a273dc0161e5072e600af84394ed3a92f144 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 068daf6b5173f66c732220691bf8c2bfbeebcac8..a70057af893f3042a773266cf41db9e68f9a9287 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 0328a894a73f807809d46213ada54657e933aa9e..1d7659f7b99710a77215014cdf6c538fbca3f2dc 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 c4c387aa0105b6102088828269eefb017019c881..87e1f9631860f3fb41f37ebb4e9be05db5540259 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 e70e79dedd0ddb6a650d689bcc28a4af5fc7e9cc..9849c8d4c357fdc89516461d6715dec587fbb393 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 5d877854a1ed61fa0e0e72ee6cb634ace0e2fcc9..9fa357f46339b3775c081e0c0a49347ddb13639f 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 7bd735202f680d846a5926fcd5b91f4f4f4a5874..b966e64927755f3818294fcf88f3754c9a5375d0 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 955e27699c721d70f9b3e9ac239f472ba01ef1e0..a5a3752855ce7bb80ad973ce8854f3569e16d13e 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 e4bf6474e1f78a73febd2094d6040cd40106b329..d431f36fcfd66c9d9ffed2ab7a990ec9be061d5d 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 20c2c3409e6d53f0dc1a260326c569d7cff5ee3e..47b884c47e62aa27c6c3a26d36fbf780a27d7f0f 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 da10e70c87349ba845bb4c62b20e46cabc3b8045..06d37510fdb7efdbc717c1f13c7e0aba6ad78692 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 580a57da787c5deb231cd8506273e28c398aa94d..86296e21e35340bea355912e50b35cba29e084ab 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 0548a8dbcc56a5a14a8cff5902064ac5ac3cb04e..9c6e066c247b53302ea63f68f34e1c665d119b84 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 080f43a0131d347128775d686cd7a5306718b4ed..05f0c721a01d83dafba0eacfcc645dbf6b7156c1
--- 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 4d8da25bfde6cc7c66ad68ec9da6355179fd50f0..30f8d12e90352744de0eab163f9360625d856ba4 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 b1d58f159467b7fe328308a56f5862e72fcd38b9..869ebe2814178b8e89ee578b131feac4b375df58 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 970e6a102a76dd399829bb31313ee3437279dc89..ed72c1126602c432b6148bebc6cb0546388ba512 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 2e37a8e1edb1b69ac11757c0e93039974be83a67..724d17182b47df5b23247bac937ebe0d6ae1df42 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 cba1ceca98ccf386bcc69ab4bf2121d866eb39ee..4b44a8168bbeb9d7d44341a8c0a7366243535dcb 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 c297e31e36257cd2a5f31a59e6034c6facd4b26b..63fe0ef1def27d6492446b84f02317c424556044 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 6e11aa79dc63fd964d9e92fa3aa8ac09204598e4..b15e8da75cbd6d1c43e11965cfb2aadd46a05b19 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 469fce2e6cb09aa62feccab4b717187f7829ba21..17dc2d42a8ac28237d6bcdbbb2649d482de572df 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 92cfb867853f14cf71e8a041ae237166961640d4..d2d7d8c7ec936dad813d203d3649c277cfa646b5 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 822048f0f701139b09eace2898bb8d14db1ed821..435e542e1f97e86608f5bd996c11ad3553ed41c5 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 03fd44f44d6720c2aea41260b34a145d87f99967..b32f1cdb5ea15c948ce1c6cdf3897c32b938e7b3 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 f99d08877bd0e6a185a1189d569aa5c995046ab0..7b64e9fcc77ffc90420e3b6364b5c5bffcf82e48 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 305b44ed8e014aa5f75d472b9f4000404a2ff903..076bcfc9f778f0034fd761b0ab6f1fb338d72880 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 b4221ccb6e4538cfd2eff457beeffcba4793b857..8770c6f45d9a5e022391180148561b537f3a04db 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 94392be6b92f76efa9f76fd0f4aa0719cd6bca64..2e6123c356561a10a67e8d2646b85a88363a16d6 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 d4654bd8eb8ab3f1a52d0fad8e17671ef13d2dd1..661e82b90a74174c07b0cda94b0ad7b3425002b1 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 de804349904fccfa5b105d733050cd1dc040dc67..08db4ed8007e2fd87e60cc968f63f471c3382bb1 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 2df68bb049f1abdc9f8cbd7c2178917ef4b745b4..2bdafa5c218125c35beba8ee3c3106ef72691b86 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 3b6a22ef0b3e47a7b6ed05192b12ae6f90a168cc..c7f835fd17e8d5a99af543b7d14846c07ff8757e 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 f12f2f1ccf64ad84cfc5d9100ad45eec3667a22c..6720ef65482625309098f57709fe006162327cbd 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 4479f6122f6e330895a68058713a04f6797e3d9f..82f506c08d94afda9400a2d9a9ae4a95f1a857cf 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 c031600ba6647e79b9c8deb2173ffc87d539cd4e..817e38b851d5dd1967635f089aa0e460e0051b6d 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 5b645b14a4d335371790bb859cde66c95c80e72d..941761a2750011836282d48ad1d4644a2165c8aa 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 46361a523c3f2b8f7b29527163c47146c4d95c02..f770ad1d05ac1e9b9183bc2277779a8e297f6420 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 1bd1e12871b03784847e131db2c652f39e02dd0d..829509f4b2fdd775d32995ae8084ad22114535fd 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 99bea1a154b215393beb87aa26d49389d5e881df..15faddcd4918401acea197bea5037d94bbc9a504 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 73ceff1ab8918bc76a0ccb4de8bd86c1ea2a7b78..85b774584c123066391798028a0c225c97fef3c1 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 7722d5cf7ac9774ad8169ddc662e1e51cd9c9f62..da7ce06ba0bc2bd041d4554487b8f63ea4b7b65f 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 1d9e530664196bd96a8ff7832091cd47c091dd04..356fdb332366118ff74d251591dc6caab89b32a4 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 0e747ed985649aa0ed904a4d510c6afd79393499..3056b3b28ace5d9f799b3931bed0f2757e6abf0c 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 3d0db4e0d45039d66b95faf1550767cc686e3188..400420210065e389ee8b48da0ebab19d9af2f9fa 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 0f61bb57b348a69067255291592f08620135eadd..056ba1aeaad0419691148823adfa382508d9f92e 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 76ea669641c1c317069b480347c9a9fc8a5732a8..d54d6d44d45a389e47991f1db447b0b0a3dd6329 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 96d9e10e25af8e3d2bf06de6eeaa43823c2d2c3a..1bd55f6adf8fc299e0d474486a4e42e4413769a2 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 b0e86e31b7ebd782e5aa2d1dcfd63ad0a8ace1b5..9e150440559a70a84e4a9bc90ba87a5e88c65818 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 33d48cbb71ab6211b47be3d0e1224adea54c5381..8baf76302a9c186c067387db3133e1217e8b96f0 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 924e154bd1856942ba28a4a123c7b89c3bc36a2f..a4068cca1f4e65741e389c617e651e7e2ff2d31b 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 fcf8bd639d1aca243b63dddd16c0502531e13c42..c82ed2ceec976156c8886c4b4ab8f0d4213ac0a2 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 ae9617c695e3f7a45a065b93dbb23cf51a9cb580..aa0271a95c0031be62a30e956f21ab1d14ad4db9 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 14785fca7ecae831bb738dee2cfd030151c49f05..09ea6a5c7bc27b5d870fd7377b24f95ce1bd621b 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 c9a0980096f72a8cb96e325298b772ee425d221c..1de02a315f7684444d7e1dbde9e262eff4354444 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 1773d691b7dd3d27d59b9a705542c64e183f259f..7223eedc926fbae57944794abe84168286259998 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 15ac360c7de17925167843dc11aa512f07a0b90b..2c2424160acd90820af8b720fe125c392378dda5 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 bb119b0bc381ed376982e91d11ac29534f02d67c..5d501d1e79e216ebfc32f14b4962b16b31b33fac 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 b37b683d0f1501cf8b13dca11a11012d0a1524b1..31c83d0627ee15c9ab1ca5391c1b85c9193610e0 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 e56486b3470136101bfadd6db60d904b73364560..54f138767b7778e62d73464e58843d546525a210 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 0d9551f28e762113d917a6d86ebb682227e38194..78dbce2eda68a679fa07bef1da35a205c3ba2354 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 85705062d1b109b065de93701cc02d39475d4776..2d567c93e34ca369602fcab6e8aebdb5b2e6ff69 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 329a5101ac94bea1291fdd78dd745d87bfbdb8b3..774218c6ec03edf90a906e5ef4415e43a383c827 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 82e49bf06b03d6f2d15839d059a7c9a30cef329b..e9799c36ad45570a05f53b024b1e69821e6acc82 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 a088c50aa5a760da815e42796305168fd5b1f2dd..d116ef8dc9bbd23f9821c0520ac8b70e9038ae75 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 7d80a1070ffaccd0118e298890a29b464a70318b..b2f566a03ba4c19b50bd79e514c77f33404f15c7 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 cc1fa4284edb833798ffe982fc6512a111ec7b6e..22cad33605218b29561e6e6a919eb17223dbfb5b 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 affd77cbeeab72b5af7c7d26f03a4a03b199dad4..3c73f7d18dea9be6aaeb3fe7673927130083ca0b 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 1e31baf8c591f13e95f414c7ab8382dadda3cd01..f81814454b1d57be068dba92de82c43aafe51ad8 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 327a3d8dac1c4be42b7ab607f8cc0183f9399b06..2c21aded5cbe029e4a7419d0902e4976ca8fda3b 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 7a78f3d0ee9d23729ea9445406fc241b07c1774e..796c429292ceec702e36104d84c3a71175398bb2 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 c2d51b2707d51652e91e06bf2ee01bbcf0c5ba41..82c13c99b19e84cbdb2627244eadc8a89d181c55 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 12cbc0141a690fcfc66a053078e884e94d5532f0..c25e8729a624fe751e8ac72c4fa1d73d67de72b8 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 905bff0086d7c2a6879d149b7b94f23048da59d6..8c8f15d675bdb554d6afa6a303e942e324e89a14 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 ac0607969d17e056e3d07ef3b160bec05acd249f..366ed5c175237f77cda2352432392569ce9345c1 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 bc9b69886d93998995f4b7593c878872fdd97c8d..49fa7025db0baa6605facf24ac736e4f4e04c23d 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 009c82382707f683a16af4be51746703ad5fb303..420385abf0c77cf52feb05ca5ae2baa6ef9ef4ee 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 e834616c075385fd2e2895b6d9f0b3b67fde4973..fbcb8e97fa2fec95b0ae970bc610eedafc514bb7 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 f3f27c9c6a31484ae52b5f478fc80be61bafb2ed..f07dcfd148d6852fb93eb0b43c8929b24a429d35 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 54d82fad565fbb78f82fe7452b2abe9b188533f7..92c22406a88897d1f5a3d67418770bfc0f4a31d2 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 1b3859a2a636bc45af734e039dfc29cdf8ada4b4..56a840733a0dd41fe72b621ab132359f47d080fb 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 687f408c1d6d37130ee06b2843bad01c5feb8c6c..054bb441c64e1a689fde3583763b4b2777acf100 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 bfd9a39787ec17665162d269f75904fc92862461..56286fb3802de7ba538452f8cbbf4feebccb0889 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 500e9a1e4ee684d8ad90e009fef1448f0b367fca..b5ba22cdc8bb4db0d1e0b0888bd1bb010a4cf808 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 78dcabd00fe475821c8294e33e72a651a8ab88c8..8d2a969da205310d510ba92f7e5607f46ca829d9 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 3e03f75e0de7bdd82a87c0456e2ee1d286a26203..a51adb750639d2d7c3bf9744fbe304c2a9c8d946 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 48dcce6ca189479c7a58cbad7339db071c0ef237..533a95936a251423d3bf4650a07decd7312a6073 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 d9977ea8fd79b5eb011f9e337e535fa5ccf720d1..368965e35566d7a0e64f7d97c45fe8daa99b5fb5 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 f7fc65683ff973980b9174dc14a29e9a76e2a028..777ce4366ca569211055409d655c925903af9d83 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 12484e5b3fb6c581631771f44c98b3664f5a788c..466a176f0d5dc03c40690fdbde9318026c63ff48 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 1c80738fca8bf82411eeafffee7311cb8002b467..d4ac573ef3d7ec83c12c623a49e3c42a7e8d1026 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 aab3536ec4f9309b38feceb14b8afeed3f95965f..9ed21fca0006beba6603cffd34759a0ccc7aa8b2 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 686fe4a5f6663ccdf199baaf7239c5c97ef83a29..5fe8213051e24b3b9fc04865b494c2c58df918bb 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 b55dc3b28de44ac56cde156b1013f11ea776db77..874cfcca17b4d8ff4d517c261b28a554a2d338e6 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 c68f220336600372f847b91693719ff138236daa..ffef3abf3a7921e67c4253e8d15c35713050b8c8 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 bc3b6868a128cf8ea767aba10dfaa97f3db4c9c9..bfb7ed046b5b49d53010bfdf24bf18c946cadff6 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 ec671a68ddd53d1e63bcf35bf862d7f5de0832a5..3e2d0f85d79dbae8558db9dba496a2faa1452277 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 460d393bdc7b5b2810ee3cdebb3d071947e09616..5552d52215d3bd023cac91b107d92cc1ae6271a0 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 60a6c0ff31026ae1ec785b8275cd47c40db50d48..3a39bec7b0fbf94dec694a1e2ee4d689fd2ade98 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 0188cfa148f1e7b0e5898dfb50c799d40250840c..dd83259e8321aa34109e6788dd496617292aa82a 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 741f6db5e3b39ebbb700ba3a4cda207f04c8496d..84f842664b373b703decde9a0febbfac38f77b21 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 aeb8659d0cd78bb4bfc673b7d50fb5e88f0b9cde..fc4c004c1a9cbd36e526a3636f96cdd0902353e3 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 5a92f4767aa98723566f1a48730724de510fc8c7..37e3f675e50d32187f93eb391144552452dceec7 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 cb2fa92759d1043032ee79283b755206815e9728..28ade26af1993f485c1c140c6666ad8c2751daeb 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 78ad5a286e227e91c767bafdab299c2e5b13fbcf..d05fef84932b81af318bb2b2df81ca6aa21c6973 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 d10fe52f8a36ed659a8da476d99b6d4beddefcfe..27c1cc8ce6142f1335d4b8e6c329a9877ee26c65 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 2c6b1498e91a03794214e15ab369e914af66be6f..f2543ca77b3192b43a478ce0de61b5e58b80c508 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 07f0c0d66ffcc96248c1c5998349facd07048a4c..08e5805e47199fd34b7a377844f1eecf18ead66f 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 f95c302c3d42b3d18cfc03ca0b5a4cadcf959963..0693952f3a2bf894d81c1b015a8c11fd892d9f6b 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 9c0b17020bd89799991c3ea2a2c0dd5af43ab438..5c138d4ce6ced7a9dda540ceb245f2198d848766 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 6c77a60df6076ba906d75860f67cd4079e63cfe1..3352e71705dd37fbaeeda200134f9de036827606 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 babe217385f6f3424f29f32d387f6ec2cf90f90a..1e300b94ff43c4b7234149d1f2f6a5cef0c9d869 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 c369996bd292bea997c0c5e9b92fc5a983d029a5..2e8ac5be54cb38af51300a29c61a5b1b3acfa807 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 e87657d8be7cf2a7c945b74c1976c6af408fa5e7..e6ba6a62df21de2caabc67121b5eebd59075a677 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 88c9333c46eaf63f92b60d6c59825b047f6f35c3..3c832933e5572817480ec14c64be355ca5900567 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 11a168fbd9af84d7890d6824c1fd009888226e96..507875b8b8da5cb3598448e9aab387673d716c61 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 5bf834d448dfc8b6973db672126b3d06f193cf90..f483e9dde3531917cf9894254c76d47388299199 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 c165db2f8e994ce03e864d7d36c70619e1399626..5f7348066fded03f384cd361faa6541b0501de5c 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 d09be689673f9c3bcdecc333367c965d3ac0a385..de27d42c5db3069ab4ec7306f23ce5c9b75d1d1b 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 60e1ea9128d212dddc02ec5c12288cb01ac3fff1..5f9b2f52e553fd0ee11e6ba410f47aafa093dc54 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 c6ea7059862255a5f18fe58731244ebd3bb2f02a..bcd42b78550a617ae0ebe3c549ba81c8106f9ed9 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 5e7ca43e80f02bcc644fbffc99f486467127675b..4d88e8a4c019b91b3078fab65ae6184883df2284 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 7224f5eefb9e30f7c3ed7ab7b097304e10095598..8bcbda1e2f07604d7f7a572cb2b89eeb20e78505 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 2084f8e43d9d8691140a08bd246476a1b99f6403..64fe9240801b226d7397764b4a63ee58aef79e19 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 948634ad0c814dd72189250727aca443beb07560..db57d137230be89f4ed33bc7992116fb1a6ee7c7 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 8f67bf4875bfd410ba03ce51577fd540d4c610e9..8c50f85b79e0ce384853b84e8f3872b70de1e184 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 786329c72fc817e3ebdbaacbaaf612800dc9055e..7096df448d1ee5d737efd649245f140ab1dad6dd 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 5bd862c7e36401cdb64658decb9a737d48c9745b..ede9de318b6cda18c7d47936d43fb703dc173884 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 2894ad5f8fda097975832ce0b636a08b7530381d..31d84ff9c7d227478883939f36227b0221bf228e 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 badcd38dbb0890b1c98ca09d48cef58cc0fa68d7..627ee6795791db10200fbec45982692729c5317f 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 9a7e8d51fea30fd17c2182ae137c20290c6f559b..b365a18df860c820e434b6325573ca5d821b3566 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 0d73c1bd1c040b3ce49918f97e7ac4208337dd94..ac0a6171d83d41bdb3c1ee56bbbfa33fea85fd2e 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 8b51d8d35021f9058fa030ce93b1f2261e7568e2..ec95ed56afdf4cb1e70f269cab849c32db52d8ee 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 6d54a60787eee96e57395db883455358e88e74bb..c1ac193cee7b758913e389134924c96d74c995cb 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 65acb6d2fd92329f73e863d1b540681cc1a3a94d..25b4f65f291f5c1cf5f9b064a1d41d2870f66f78 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 e92c008118ebb515177fe5b8841ad625759e3367..8c63be227e576300f0e523487e5fcbbf0fffe1dd 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 7a8309e38ed3d1643dbf67d2e7770e698c8d32d8..615aa38c9ca0df2d55fddc9578786d11a6b27ccd 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 145e726c4590adcf0b8c1672682f95c0f132bce2..4ece851a0cb1d112aa8d994a5e84d29dd957fc1f 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 90f00925464443419e87617aedc71808b4fac217..148bc64b0ba2c98dbc3c5c8d75ef5c8ffe43f74a 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 d2d573dfb5fa6140f3eeaa4648597d696007e4ca..14225c0f144a110b2f8bd11156b498f6b8b32648 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 a65207d9c2746ee9888acbd53e635ae466bcef54..9981a14eb742991aaa16a007c04496d1373b05aa 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 e93d4826ea4ac0f6e100047da0b060e82d052904..d8e70b3515ca1960873ba39c5a8a3f080befb136 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 a51fbc3f14f2932f3eee4954972d69eec13c38d6..d9c398513914aa3fe422a81384740feb65195edc 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 a8f9b350aa24c6d0d325a8d4092002a25af26890..bfd78a1ea31b255498eb35407de0570cb1023e71 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 0fd7698b70b6a7b18a27786369020a9be4e09ea6..260aefeb3425edfe1cf5407f8b27396beb0328fa 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 71bf4f345008bccccc14a8a8f19ea4f8d6f710de..d5c1ae4d800c9f3934d9bc61ae216d5a40728c1d 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 c214a188f3c003bc409f21f664df281c4bbd3517..661fb1bd64603bc1d5bee64a496ce95f09b661c9 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 ed4e0f791ba5ea9bc79e1fbae44ead1207e9ad97..bf0a72051a39dcaed5c5f5cefebb89d2be27da8f 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 79c18101784ade34b359f73ea3e56055aac3a79a..2213ef2e29cf9a51f4efef54a05de8adf10946a0 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 81532aea051b2bbec7e29ad4ecee3976c91a193b..b13fa32e113ee9031a48ec35a551334ceddee6b5 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 e6f1fac88cb3fd220ddf85ef9ab0c5c7ec2339f8..713f9457f4a0387a8fd1f24d1e79e685a90e8eeb 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 9a7e4e0e22b9c55460ec5b0d1a0b4f9ea1534bdd..b97f1888a92aec2055337f5861f70815ea9a5489 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 8d76f208e06dcb196bc62e804506affc6f3183e0..f43cfd74e00419874fe3716709faf6c7d2bb6c17 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 9172d47fcf4c8e8b9a549c8931cefb2ee3296247..f8e3904fd35b25f880702b98e0ea412d4d95d90e 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 3d546c443dbbdbaf6f7615b8f7faf8d208b8b7de..958e4b3cbb69a93ede159423526fd4de84c14e3f 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 fe919de2fc425891864fca653b4172bbc54e1473..b0ea22ddd844e7f7a6ca97368a8b93c6ed7c4de9 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 064636f38d679a74ad1e86684f7c79cba380a651..3c4a2325b48f140ed82a8a16e7b7f0e70d04557d 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 3107c2368941b7e780ce81c655c76257394e548d..5f9999263bf4505ef7849b8192dd26d7d5dae631 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 16a74c5ca16da6ecb45fa5715bf67269fd3b620a..7629f6f787da31825160c7a1c795fb36166ece2c 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 60d916aad702bc9b17a599fe0b97f9ca4f8b1419..ffd49a943e329d4e25aca0974bc2bf08291d4e09 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 2f8347b392cea47e2c2daefa885858d3f183f916..de3a380d21a346865d8c242d817fcd57966d457f 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 174c9e24f9763a9790b4d4b945bb180bd79c8b7b..0401231c27588e06810397fb04c94fe4ebf42b5e 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 32789e31eba9fdfe5e091b456dda4017ef815a0e..1f9bda1b7b16148fe128d3d0074f0e113b4144b2 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 2363a580f19c648d130286a552c1a0b2c8f0c47e..975ada118f706b8e6e5c0df3e01eb046fe39069c 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 d8d6206d2f71c150c1575f2fc8e3c233c50908cb..492a95f22df6e71573d68e506d3e021d081bbdad 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 1c4f24f915890f17caaf19b1de5b4c3a74c80b22..e152ff4731cdeb96c7abced527e6ece9bb02a7bd 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 e05b38752acf6147bf2efce26edd82d0eae14867..c51e9acd266f1d7070ac36f2306141017c3493b8 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 e2cce0397c7fc49fd2e4bedcaa2c4b985183890b..0206ffc1b8d8d046b203717ac58b30e65e8a0ec5 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 404e94862cbed7d87d31928bad928c3f223778a9..d8f1e1250f32a50efc60dd0204523e652015a2ac 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 774af9fe69a277965b275f97df34fd91ba26f289..7357271f9c7d5062daf1b3761d6c3c5ccac97897 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 79bb78defea0d926706ed98778e637a44998eee1..bf11abfa47200d03b35360a77f641d8b1da9a755 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 4019bee4b32047bac03bad58db94fa8b0d91c547..f74316cfa191f89f529c09ad325f5ab423f4888f 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 599902e3a9ec5aaec4c3c56488f19e942feed289..1de8ae9b45a77ea367718d252be54e55cb05520a 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 3bd6c884518e8e2b644ef2b42186613c70bd659c..c0ae4ea347815df765e20012881d50b421a56578 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 75dd4412c0e98f29893a0cc00a33be0a0bbe3d9c..f6ef770b972a2bcd6cbb4c45dc7d2c91009aa61c 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 2fe454469f88460516a817714ec1c57e1b7c58e0..a42c397e0246dbeb6256b8d9e27498ceaf8e6f58 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 57e7f5fbea038873be3fcb29524b859db3a49590..cf365a12525014b7b516cd8561ad7386c0d2534e 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 16ac063fc6e175de2240f239a60a2406adbaf6ea..1fb8d5e28f3cb00bad8d62cc2767dd7fe09ed9e4 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 14c96277037b2ca70811f184f5c7c10657634330..6fc8233e3183d43bdb8b33bd3308ce38ec253821 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 4c04ae8ce60762ed753895cb41f8e544ee4507b7..5e6b42981e0647ebc8ffca4f4c2e641ca0c64eda 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 27e07dbcd79ea366bbadb813248779e38241554e..7be9bc15ebfc7be58f655c2f504b572bf280b989 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 e1bc43751b63b979ac39f5be2be88ae0ce860655..d2c292baac82a04da01f85c50388dea8d9433ad0 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 0d8469adb1fd86783a9e086e3257a1cccb9b8126..baa2602145b7f8d31345f7e4a2ea9cf95d90fe33 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 5cd3a35472717f2d7d671cae0751bfab143adfb2..b9a4e91b93e31a99b822988d32fea6b3168e1ce0 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 7da72e2276513def71bc58bb7e74b0e3c0b24e0f..423796b56f15b3a8c9c5acb6dd8e80fcdf14ac16 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 bc1fb339f3097ed74af2e0f55fa61970f43c655b..72b57c0ebe981a6d54b17ff3e5ad1a26dd6138d7 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 38411675d4a33d89c41b86bbbabcf195c6187bdc..39436cbe5bd43e24f2dd07ad379225a7ff46f721 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 56f3872154974b25861729faece1ad15a713285b..25cb9e411669d5580d4b9204b159c60c5ed57f4e 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 1db05dfac17375b656315c966238ff4f63a115b2..78320f954666ac043c999a53669b6552e7041a29 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 162880197853d23c28e0711201c9cde66c7ca1bb..30c117096d560b0925aa0ff94905e6e538010b5f 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 bf24f9234423ee7e233d4598ace533b2ad545299..dd2900e7dd3af22bd25cd910f5e2623a1c13a0d4 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 ea4c68f372552e00383a0e1b0af62762b88e5a5e..84ecbe143c8b541fb381eeb3c7ac42c170392b20 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 1afa6c5316b695fc70e3556f7cad0aea4fde7114..3910476de68b4862dc6dfe704a2d28cd3fc416ac 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 612e5ce584d362bc77ea2102071e183773e1d97e..7a3025deceded1a1de8e2b8089680190108f98c4 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 cacd9fdc4da909632d33775abf8d94d03e1629b2..df070d2d880f90104adb2eb1fc7f4dcb735466a3 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 fdfd604b5fc569c40a5fe576f64585e382a13d1c..33de0b1e9ca139d0d82d286c1d0dd3e96841f486 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 ba009416df1785e34fbda9043760b54356938cb1..19bb0e9aaac552ba8f6214d110db2a81284764f5 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 0887a88cc15f899a24a2b0110e35c8bfbfc23fb6..bfd55559b494aba2a5177dc899c58a61f6f41b96 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 82381a73dbd46778433124caf5e436229f4440f2..b9de36988f669d839a9272d8cbf8da1983b9736d 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 b3d9d6186ab8d0252b21dc6fcbdc4f4459a96a0d..60ea8949bcac4f329c3b1d43d72edc797171aacb 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 95882c24e425f09b992713de5a80ed6e3d618865..14d6b253950030a756924a4c23acfd010e2bcee7 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 53006c15f4af0203b5f9d02ac074b971dfb693dd..f7dbdfd25c26c5d483934f2d753d6684254f3a35 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 15df5e7076071c3c0e138b2757de3d46c545328a..528c05dd92a382d1d6f1d61f08139d0a597f3701 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 74729ad9dcd6000e2d6539153187c9defe8ad349..4dade1dc789d9274bb1c97fca9c80d01b692ab64 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 2374b4f232dbd0f9002fd41a5e20e2e7dbd7ba13..e9cba0dd9ebb8b523cbf85ab780a310237661c1f 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 bd908e67d7bca85808313f4e82edfd04d2bf6869..2aa8faa805077fc7b1dbb5e65807375f235bff6e 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 805584d9ccb8637108d5bd21c7a987f57b82e901..ceac1a8184a73110f4f94e58ed220ee22b588740 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 5e2e1c8ec8e691963d834517c78a09efbfa5fe54..a07e959890e184e539af226f27381bef127517bf
--- 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 9cc6bd19ee14bc0bd590f08df6a570f2379f9996..31b3ebe3c56aa54178bbea66448a6381500a08c6 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 976f25987d1f66aaddbdf1f43c3e1a22f4649f83..98cf450d92e4bebd4de8d4b5d2a82dda3d0e053d 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 d7cd79b0ce62c2d2edb1f4cc910658ec5e569b5c..4e95eaf61601c2fd53fb6464093237d460420e0d 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 1d0eca2b81fe2572b80bb0be2dc6d90afd46a165..e8ab5a37bb0250a684ea8f730da8b064f3c8d5b8 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 c785cc7fd09156aef3531dc485aa25e734baf1b2..093c57fd33fa388df49d441844cc3d87c40a8214 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 50d8b285af46ecd3ec719fdffc3bedbeedee2f1f..ece0869796ff15e780f4e99ee1f7953b5b8e8794 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 1284dbf21db0ecd241ff48416cda7296b5d4a8b1..2bfc6ebecfa7b506f4caf7581861b583ff381544 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 cc564a2ea380b7297e3b53eddfbefbb43cbba064..2f2e7589d1fbaa90c433251a0039fc4f96586ffd 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 28980c6447374e159ad2cf026c2da5142f90fa6a..6cadf1a62aeacef7f98c939272d6c11d6f861157 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 77ea44813e991bcae20b91144a9a4433844b7ebb..31b7f7b8a251b756ed9bad6c46330e92d793092b 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 664bd28c946044fd854ebe2ca581302cb7b7fa26..51651bbc557f7f8b4b33251098d1d4bc8c9edcdc 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 790ee2e252b41a00aac7dcec3b69e69dd7399b0f..58befccb444752b77b03db50011b7e49aaa7f80e 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 d781495027bca7802e2e4dbed8bed1c225590686..73e0019649a3167af00a64444a8b6de6b15b8f9d 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 bff6ce578a707ba639545afc2a2afe101effd875..1a11a02a2b84c1ab00b6e0bbdc944ca46ec52475 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 42277e28021e275118bd6d40b18679e313355e24..29b6906884acddf318034a57e26d75c23d53c8af 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 64d8604ece37d29d958dd405b206da8b3ffeec38..86bbbf81ec86e477763a10b19ba0853e042d75e2 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 aac70f3d72a3c15614d8afb66794a8f14614f811..fa672dd04764974d5035a4751bb3b932db8b18ea 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 5baadc29be15f034e287e27cf8c8e98fd57201cc..d5f59dfad60ff1ac6e6ad41bd02c345ea36d85f4 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 82c6392239de3026c7064b98e9c97d5198ec7dec..56178078fae67763634fe9e626c824ca1c9f75ee 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 9c210e997df3ad1051a9ce651b302d98f09f2018..3e2bf284f03428e239aa8aabb6443ba6e1b58320 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 2a0cf7ccde0873f04bb602d0a3c30e3452a9542a..f5b4c8a779292223f0e435363fd0b8a7db117ab7 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 f0c1d29bc50110c7c9c461853196b5aba2db964c..99424f71427123d5036d92f8e80d5bbfc841497c 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 02ef64a169517f14d15f32f076e65d7a97554be6..65cef3a6e18462f18e6ebf674761a1de44a89fad 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 94b400b5971003bb13418766b824134d311f1b6e..677511bf7b22f173d82962463fbe12c5db63b0d0 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 5cfe4875849f53a270d5a74ddc1ec80d0b10a987..7c438eff9ba0a803921cc81ced12e68b37ff81d8 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 3a7e4b391748452dc588781e8613f0d2b65eccd0..3f43402aefd0bdf0c7bcc65252a5e8c239229089 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 c5e2a22516dc710df0fbd1203de7e03137c0269a..96ae135d287a6bee621ebf7e0f195540082ae89d 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 2bd304c76b0fba9ef77de87ec77a877a056756d9..02f638174b2a0f00ffe3abd7c9fbc74b82e3cc3e 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 f7204431d25505afb8100658a64d11b963052a79..de71fd71da276e4d9cb3664e6dd4f7addcb5e344 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 9b03c9ad2c6a1e15d0dbe48d2c72ea4da644463d..979c700457a4069b178b1bc20b60cceaed1f71bf 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 f7543cf910376c0140d3204bc168a72d1cc0054b..0e16e2d315e625ab9e203a1287d73371d7ae82e6 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 87d8be704d37ff6dd92a479d0e60fde76333c616..dd592db2a4873b4f33842e9acb0a57a4844f7b1e 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 b765d73f9badcb78d1b70bb93413d009befcb408..268ca04a22aa02e39f33278b53f0792e7aa40d8d 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"