'CMakeLists.txt' (TBEventAthenaPool-00-01-02)

	* Adjust PoolToDataObject() to pass Token as pointer
	* tag TBEventAthenaPool-00-01-02

TestBeam/TBEventAthenaPool/CMakeLists.txt

+################################################################################
+# Package: TBEventAthenaPool
+################################################################################
+
+# Declare the package name:
+atlas_subdir( TBEventAthenaPool )
+
+# Declare the package's dependencies:
+atlas_depends_on_subdirs( PUBLIC
+                          Database/AthenaPOOL/AthenaPoolUtilities
+                          PRIVATE
+                          Control/SGTools
+                          Database/AthenaPOOL/AthenaPoolCnvSvc
+                          GaudiKernel
+                          TestBeam/TBEvent
+                          TestBeam/TBTPCnv )
+
+# Component(s) in the package:
+atlas_add_poolcnv_library( TBEventAthenaPoolPoolCnv
+                           src/*.cxx
+                           FILES TBEvent/TBADCRawCont.h TBEvent/TBBPCCont.h TBEvent/TBBPCRawCont.h TBEvent/TBEventInfo.h TBEvent/TBHitCont.h TBEvent/TBHitPlaneCont.h TBEvent/TBIdentifiedParticle.h TBEvent/TBLArCalibDigitContainer.h TBEvent/TBLArDigitContainer.h TBEvent/TBMWPCCont.h TBEvent/TBMWPCRawCont.h TBEvent/TBPhase.h TBEvent/TBScintillatorCont.h TBEvent/TBScintillatorRawCont.h TBEvent/TBTDC.h TBEvent/TBTDCRawCont.h TBEvent/TBTailCatcher.h TBEvent/TBTailCatcherRaw.h TBEvent/TBTrack.h TBEvent/TBTriggerPatternUnit.h TBEvent/TBTrackInfo.h
+                           LINK_LIBRARIES AthenaPoolUtilities SGTools AthenaPoolCnvSvcLib GaudiKernel TBEvent TBTPCnv )
+

TestBeam/TBEventAthenaPool/src/TBBPCRawContCnv.cxx

@@ -35,7 +35,7 @@ StatusCode TBBPCRawContCnv::initialize()
 }
 
 
-StatusCode TBBPCRawContCnv::PoolToDataObject(DataObject*& pObj,const std::string &token)
+StatusCode TBBPCRawContCnv::PoolToDataObject(DataObject*& pObj, const Token* token)
 {
   // First call base class converter to get DataObject from
   // pool. Then modify as appropriate

TestBeam/TBEventAthenaPool/src/TBBPCRawContCnv.h

@@ -21,7 +21,7 @@ class TBBPCRawContCnv : public TBBPCRawContCnvBase
   virtual StatusCode initialize();
 
   /// Extend base-class conversion method to modify when reading in
-  virtual StatusCode     PoolToDataObject(DataObject*& pObj,const std::string &token);
+  virtual StatusCode     PoolToDataObject(DataObject*& pObj, const Token* token);
 
   /// Extend base-class conversion method for writing
   virtual StatusCode     DataObjectToPool(DataObject*  pObj,const std::string &tname);

TestBeam/TBEventAthenaPool/src/TBHitContCnv.cxx

@@ -35,7 +35,7 @@ StatusCode TBHitContCnv::initialize()
 }
 
 
-StatusCode TBHitContCnv::PoolToDataObject(DataObject*& pObj,const std::string &token)
+StatusCode TBHitContCnv::PoolToDataObject(DataObject*& pObj, const Token* token)
 {
   // First call base class converter to get DataObject from
   // pool. Then modify as appropriate

TestBeam/TBEventAthenaPool/src/TBHitContCnv.h

@@ -21,7 +21,7 @@ class TBHitContCnv : public TBHitContCnvBase
   virtual StatusCode initialize();
 
   /// Extend base-class conversion method to modify when reading in
-  virtual StatusCode     PoolToDataObject(DataObject*& pObj,const std::string &token);
+  virtual StatusCode     PoolToDataObject(DataObject*& pObj, const Token* token);
 
   /// Extend base-class conversion method for writing
   virtual StatusCode     DataObjectToPool(DataObject*  pObj,const std::string &tname);

TestBeam/TBEventAthenaPool/src/TBHitPlaneContCnv.cxx

@@ -35,7 +35,7 @@ StatusCode TBHitPlaneContCnv::initialize()
 }
 
 
-StatusCode TBHitPlaneContCnv::PoolToDataObject(DataObject*& pObj,const std::string &token)
+StatusCode TBHitPlaneContCnv::PoolToDataObject(DataObject*& pObj, const Token* token)
 {
   // First call base class converter to get DataObject from
   // pool. Then modify as appropriate

TestBeam/TBEventAthenaPool/src/TBHitPlaneContCnv.h

@@ -21,7 +21,7 @@ class TBHitPlaneContCnv : public TBHitPlaneContCnvBase
   virtual StatusCode initialize();
 
   /// Extend base-class conversion method to modify when reading in
-  virtual StatusCode     PoolToDataObject(DataObject*& pObj,const std::string &token);
+  virtual StatusCode     PoolToDataObject(DataObject*& pObj, const Token* token);
 
   /// Extend base-class conversion method for writing
   virtual StatusCode     DataObjectToPool(DataObject*  pObj,const std::string &tname);

TestBeam/TBEventAthenaPool/src/TBIdentifiedParticleCnv.cxx

@@ -35,7 +35,7 @@ StatusCode TBIdentifiedParticleCnv::initialize()
 }
 
 
-StatusCode TBIdentifiedParticleCnv::PoolToDataObject(DataObject*& pObj,const std::string &token)
+StatusCode TBIdentifiedParticleCnv::PoolToDataObject(DataObject*& pObj, const Token* token)
 {
   // First call base class converter to get DataObject from
   // pool. Then modify as appropriate

TestBeam/TBEventAthenaPool/src/TBIdentifiedParticleCnv.h

@@ -21,7 +21,7 @@ class TBIdentifiedParticleCnv : public TBIdentifiedParticleCnvBase
   virtual StatusCode initialize();
 
   /// Extend base-class conversion method to modify when reading in
-  virtual StatusCode     PoolToDataObject(DataObject*& pObj,const std::string &token);
+  virtual StatusCode     PoolToDataObject(DataObject*& pObj, const Token* token);
 
   /// Extend base-class conversion method for writing
   virtual StatusCode     DataObjectToPool(DataObject*  pObj,const std::string &tname);

TestBeam/TBEventAthenaPool/src/TBLArCalibDigitContainerCnv.cxx

@@ -35,7 +35,7 @@ StatusCode TBLArCalibDigitContainerCnv::initialize()
 }
 
 
-StatusCode TBLArCalibDigitContainerCnv::PoolToDataObject(DataObject*& pObj,const std::string &token)
+StatusCode TBLArCalibDigitContainerCnv::PoolToDataObject(DataObject*& pObj, const Token* token)
 {
   // First call base class converter to get DataObject from
   // pool. Then modify as appropriate

TestBeam/TBEventAthenaPool/src/TBLArCalibDigitContainerCnv.h

@@ -21,7 +21,7 @@ class TBLArCalibDigitContainerCnv : public TBLArCalibDigitContainerCnvBase
   virtual StatusCode initialize();
 
   /// Extend base-class conversion method to modify when reading in
-  virtual StatusCode     PoolToDataObject(DataObject*& pObj,const std::string &token);
+  virtual StatusCode     PoolToDataObject(DataObject*& pObj, const Token* token);
 
   /// Extend base-class conversion method for writing
   virtual StatusCode     DataObjectToPool(DataObject*  pObj,const std::string &tname);

TestBeam/TBEventAthenaPool/src/TBMWPCRawContCnv.cxx

@@ -35,7 +35,7 @@ StatusCode TBMWPCRawContCnv::initialize()
 }
 
 
-StatusCode TBMWPCRawContCnv::PoolToDataObject(DataObject*& pObj,const std::string &token)
+StatusCode TBMWPCRawContCnv::PoolToDataObject(DataObject*& pObj, const Token* token)
 {
   // First call base class converter to get DataObject from
   // pool. Then modify as appropriate

TestBeam/TBEventAthenaPool/src/TBMWPCRawContCnv.h

@@ -21,7 +21,7 @@ class TBMWPCRawContCnv : public TBMWPCRawContCnvBase
   virtual StatusCode initialize();
 
   /// Extend base-class conversion method to modify when reading in
-  virtual StatusCode     PoolToDataObject(DataObject*& pObj,const std::string &token);
+  virtual StatusCode     PoolToDataObject(DataObject*& pObj, const Token* token);
 
   /// Extend base-class conversion method for writing
   virtual StatusCode     DataObjectToPool(DataObject*  pObj,const std::string &tname);

TestBeam/TBEventAthenaPool/src/TBScintillatorRawContCnv.cxx

@@ -35,7 +35,7 @@ StatusCode TBScintillatorRawContCnv::initialize()
 }
 
 
-StatusCode TBScintillatorRawContCnv::PoolToDataObject(DataObject*& pObj,const std::string &token)
+StatusCode TBScintillatorRawContCnv::PoolToDataObject(DataObject*& pObj, const Token* token)
 {
   // First call base class converter to get DataObject from
   // pool. Then modify as appropriate

TestBeam/TBEventAthenaPool/src/TBScintillatorRawContCnv.h

@@ -21,7 +21,7 @@ class TBScintillatorRawContCnv : public TBScintillatorRawContCnvBase
   virtual StatusCode initialize();
 
   /// Extend base-class conversion method to modify when reading in
-  virtual StatusCode     PoolToDataObject(DataObject*& pObj,const std::string &token);
+  virtual StatusCode     PoolToDataObject(DataObject*& pObj, const Token* token);
 
   /// Extend base-class conversion method for writing
   virtual StatusCode     DataObjectToPool(DataObject*  pObj,const std::string &tname);

TestBeam/TBEventAthenaPool/src/TBTailCatcherRawCnv.cxx

@@ -35,7 +35,7 @@ StatusCode TBTailCatcherRawCnv::initialize()
 }
 
 
-StatusCode TBTailCatcherRawCnv::PoolToDataObject(DataObject*& pObj,const std::string &token)
+StatusCode TBTailCatcherRawCnv::PoolToDataObject(DataObject*& pObj, const Token* token)
 {
   // First call base class converter to get DataObject from
   // pool. Then modify as appropriate

TestBeam/TBEventAthenaPool/src/TBTailCatcherRawCnv.h

@@ -21,7 +21,7 @@ class TBTailCatcherRawCnv : public TBTailCatcherRawCnvBase
   virtual StatusCode initialize();
 
   /// Extend base-class conversion method to modify when reading in
-  virtual StatusCode     PoolToDataObject(DataObject*& pObj,const std::string &token);
+  virtual StatusCode     PoolToDataObject(DataObject*& pObj, const Token* token);
 
   /// Extend base-class conversion method for writing
   virtual StatusCode     DataObjectToPool(DataObject*  pObj,const std::string &tname);