Commit fd7a40f5 authored by charles leggett's avatar charles leggett
Browse files

Preparation for Gaudi v30r2

major changes:

 - removal of DECLARE_FACTORY_ENTRIES
 - DECLARE_CONVERTER_FACTORY -> DECLARE_CONVERTER
 - DECLARE_TOOL_FACTORY -> DECLARE_COMPONENT
 - DECLARE_SERVICE_FACTORY -> DECLARE_COMPONENT
 - DECLARE_ALGORITHM_FACTORY -> DECLARE_COMPONENT
 - constructor of Converters is public, not protected
 - remove #include "GaudiKernel/CnvFactory.h"
 - remove #include "GaudiKernel/ToolFactory.h"
 - remove #include "GaudiKernel/AlgFactory.h"
 - remove #include "GaudiKernel/AudFactory.h"
 - remove #include "DeclareFactoryEntries.h"
parent 4e4362db
......@@ -18,7 +18,6 @@
//#include "AthenaPoolTestData/FauxTriggerMap.h"
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/AlgFactory.h"
//#include "EventInfo/EventInfo.h"
#include "EventInfo/EventID.h"
......
......@@ -14,7 +14,6 @@
//#include "GaudiKernel/Algorithm.h"
#include "AthenaBaseComps/AthAlgorithm.h"
#include "GaudiKernel/AlgFactory.h"
#include <map>
......
......@@ -28,7 +28,6 @@
// Gaudi includes
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/AlgFactory.h"
#include "GaudiKernel/SmartDataPtr.h"
// test includes
......
......@@ -28,7 +28,6 @@
// Gaudi includes
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/AlgFactory.h"
#include "GaudiKernel/SmartDataPtr.h"
// test includes
......
......@@ -23,7 +23,6 @@
// Gaudi includes
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/AlgFactory.h"
#include "GaudiKernel/SmartDataPtr.h"
// include Tracking EDM
......
......@@ -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:
......
......@@ -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:
......
......@@ -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:
......
......@@ -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:
......
......@@ -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.
......
#include "CaloDetMgrDetDescrCnv/CaloMgrDetDescrCnv.h"
#include "CaloDetMgrDetDescrCnv/CaloSuperCellMgrDetDescrCnv.h"
DECLARE_CONVERTER_FACTORY( CaloMgrDetDescrCnv )
DECLARE_CONVERTER_FACTORY( CaloSuperCellMgrDetDescrCnv )
DECLARE_CONVERTER( CaloMgrDetDescrCnv )
DECLARE_CONVERTER( CaloSuperCellMgrDetDescrCnv )
......@@ -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"
......
......@@ -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.
......
......@@ -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:
......
......@@ -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 )
......@@ -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"
......
......@@ -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 ();
};
......
#include "CaloTTMgrDetDescrCnv.h"
DECLARE_CONVERTER_FACTORY( CaloTTMgrDetDescrCnv )
DECLARE_CONVERTER( CaloTTMgrDetDescrCnv )
......@@ -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"
......
......@@ -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:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment