diff --git a/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/PixelClusterContainerCnv.cxx b/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/PixelClusterContainerCnv.cxx
index 850e899e66a30aca361794fe19a55728d2b3a7e5..2f36bd5feb3c31e24bad776f4c3e65c74362fd10 100644
--- a/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/PixelClusterContainerCnv.cxx
+++ b/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/PixelClusterContainerCnv.cxx
@@ -84,7 +84,6 @@ InDet::PixelClusterContainer* PixelClusterContainerCnv::createTransient() {
p_collection = m_converter_p2.createTransient( p_coll.get(), msg() );
} else if( compareClassGuid(p1_guid) ) {
ATH_MSG_DEBUG("createTransient(): T/P version 1 detected");
- usingTPCnvForReading( m_TPConverter );
std::unique_ptr< InDet::PixelClusterContainer_tlp1 > p_coll( poolReadObject< InDet::PixelClusterContainer_tlp1 >() );
p_collection = m_TPConverter.createTransient( p_coll.get(), msg() );
}
diff --git a/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/PixelClusterContainerCnv.h b/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/PixelClusterContainerCnv.h
index d03257b582c65ea0ce25290258660eac0bee8fee..b86c6ddfdc94796efad1b9723bf2a4721c5a5299 100644
--- a/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/PixelClusterContainerCnv.h
+++ b/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/PixelClusterContainerCnv.h
@@ -32,9 +32,7 @@ typedef T_AthenaPoolCustomCnv<InDet::PixelClusterContainer, PixelClusterContain
** Create derived converter to customize the saving of identifiable
** container
**/
-class PixelClusterContainerCnv :
- public PixelClusterContainerCnvBase,
- public AthenaPoolCnvTPExtension
+class PixelClusterContainerCnv : public PixelClusterContainerCnvBase
{
friend class CnvFactory<PixelClusterContainerCnv >;
diff --git a/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/SCT_ClusterContainerCnv.cxx b/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/SCT_ClusterContainerCnv.cxx
index 08c6b67b8826fde35d46d0eda2d5fd1d0bd1350c..9176f31d1632cb9a80c49189e3d32a99de8c37d2 100644
--- a/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/SCT_ClusterContainerCnv.cxx
+++ b/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/SCT_ClusterContainerCnv.cxx
@@ -85,7 +85,6 @@ InDet::SCT_ClusterContainer* SCT_ClusterContainerCnv::createTransient() {
} else if( compareClassGuid(p1_guid) ) {
//ATH_MSG_DEBUG("createTransient(): T/P version 1 detected");
- usingTPCnvForReading( m_TPConverter );
std::unique_ptr< InDet::SCT_ClusterContainer_tlp1 > p_coll( poolReadObject< InDet::SCT_ClusterContainer_tlp1 >() );
p_collection = m_TPConverter.createTransient( p_coll.get(), msg() );
diff --git a/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/SCT_ClusterContainerCnv.h b/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/SCT_ClusterContainerCnv.h
index e7658909fb97797f904f78a8dc518f628158c106..027a1e159acc2fb668316540ab8afd943651cbec 100644
--- a/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/SCT_ClusterContainerCnv.h
+++ b/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/SCT_ClusterContainerCnv.h
@@ -32,9 +32,7 @@ typedef T_AthenaPoolCustomCnv<InDet::SCT_ClusterContainer, SCT_ClusterContainer
** Create derived converter to customize the saving of identifiable
** container
**/
-class SCT_ClusterContainerCnv :
- public SCT_ClusterContainerCnvBase,
- public AthenaPoolCnvTPExtension
+class SCT_ClusterContainerCnv : public SCT_ClusterContainerCnvBase
{
friend class CnvFactory<SCT_ClusterContainerCnv >;
diff --git a/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/TRT_DriftCircleContainerCnv.cxx b/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/TRT_DriftCircleContainerCnv.cxx
index dd12d213ae14c1cadcc1d5a3371694be0a3acbd0..247294325de03cfe2f53d1cf72a63a8133392dbd 100644
--- a/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/TRT_DriftCircleContainerCnv.cxx
+++ b/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/TRT_DriftCircleContainerCnv.cxx
@@ -81,14 +81,12 @@ InDet::TRT_DriftCircleContainer* TRT_DriftCircleContainerCnv::createTransient()
}
else if( compareClassGuid(p1_guid) ) {
ATH_MSG_DEBUG("createTransient(): T/P version 1 detected");
- usingTPCnvForReading( m_TPConverter );
std::unique_ptr< InDet::TRT_DriftCircleContainer_tlp1 > p_coll( poolReadObject< InDet::TRT_DriftCircleContainer_tlp1 >() );
p_collection = m_TPConverter.createTransient( p_coll.get(), msg() );
}
//----------------------------------------------------------------
else if( compareClassGuid(p0_guid) ) {
ATH_MSG_DEBUG("createTransient(): Old input file");
-
std::unique_ptr< TRT_DriftCircleContainer_p0 > col_vect( poolReadObject< TRT_DriftCircleContainer_p0 >() );
p_collection = m_converter_p0.createTransient( col_vect.get(), msg() );
}
diff --git a/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/TRT_DriftCircleContainerCnv.h b/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/TRT_DriftCircleContainerCnv.h
index ef45eb72a0aa5994fbaaad5fe2b10c8f38955366..3ae53a511fee2f77b5270276217f4080e5456d0e 100644
--- a/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/TRT_DriftCircleContainerCnv.h
+++ b/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/TRT_DriftCircleContainerCnv.h
@@ -20,9 +20,7 @@
typedef InDet::TRT_DriftCircleContainer_p2 TRT_DriftCircleContainer_PERS;
typedef T_AthenaPoolCustomCnv<InDet::TRT_DriftCircleContainer, TRT_DriftCircleContainer_PERS > TRT_DriftCircleContainerCnvBase;
-class TRT_DriftCircleContainerCnv :
- public TRT_DriftCircleContainerCnvBase,
- public AthenaPoolCnvTPExtension
+class TRT_DriftCircleContainerCnv : public TRT_DriftCircleContainerCnvBase
{
friend class CnvFactory<TRT_DriftCircleContainerCnv >;
diff --git a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/CscStripPrepDataContainerCnv.cxx b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/CscStripPrepDataContainerCnv.cxx
index 7ca2ba2c812b374689b71cf3d18d986bdd4fa0ba..0ec666cfcf9b7770668fd2728e2b74802df3fb3c 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/CscStripPrepDataContainerCnv.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/CscStripPrepDataContainerCnv.cxx
@@ -84,7 +84,6 @@ Muon::CscStripPrepDataContainer* CscStripPrepDataContainerCnv::createTransient()
Muon::CscStripPrepDataContainer* p_collection(0);
if( compareClassGuid(p1_guid) ) {
log<<MSG::DEBUG<<"createTransient(): T/P version 1 detected"<<endmsg;
- usingTPCnvForReading( m_TPConverter );
std::unique_ptr< CscStripPrepDataContainer_PERS > p_coll( poolReadObject< CscStripPrepDataContainer_PERS >() );
p_collection = m_TPConverter.createTransient( p_coll.get(), log );
}
diff --git a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/CscStripPrepDataContainerCnv.h b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/CscStripPrepDataContainerCnv.h
index 66c93ff2eae023581688e53f639ff4ba4094eef0..06e65088e09e6e45595f650d8fe28bd7b1019098 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/CscStripPrepDataContainerCnv.h
+++ b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/CscStripPrepDataContainerCnv.h
@@ -5,7 +5,6 @@
#ifndef MUONEVENTATHENAPOOL_CSCSTRIPPREPDATACONTAINERCNV_H
#define MUONEVENTATHENAPOOL_CSCSTRIPPREPDATACONTAINERCNV_H
-//#include "AthenaPoolCnvSvc/T_AthenaPoolCustCnv.h"
#include "AthenaPoolCnvSvc/T_AthenaPoolCustomCnv.h"
#include "MuonPrepRawData/CscStripPrepDataCollection.h"
#include "MuonPrepRawData/CscStripPrepDataContainer.h"
@@ -26,9 +25,7 @@ typedef T_AthenaPoolCustomCnv<Muon::CscStripPrepDataContainer, CscStripPrepData
** Create derived converter to customize the saving of identifiable
** container
**/
-class CscStripPrepDataContainerCnv :
- public CscStripPrepDataContainerCnvBase,
- public AthenaPoolCnvTPExtension
+class CscStripPrepDataContainerCnv : public CscStripPrepDataContainerCnvBase
{
friend class CnvFactory<CscStripPrepDataContainerCnv>;
diff --git a/Reconstruction/HeavyIonRec/HIRecAthenaPool/src/HIPixelTrackletsCollectionCnv.cxx b/Reconstruction/HeavyIonRec/HIRecAthenaPool/src/HIPixelTrackletsCollectionCnv.cxx
index b92956a3e56c54158c5c8277b2da41b70a971c73..6c8b8a1439a1173de7326f6194f7e3a1156bc0b1 100644
--- a/Reconstruction/HeavyIonRec/HIRecAthenaPool/src/HIPixelTrackletsCollectionCnv.cxx
+++ b/Reconstruction/HeavyIonRec/HIRecAthenaPool/src/HIPixelTrackletsCollectionCnv.cxx
@@ -54,7 +54,6 @@ HIPixelTrackletsCollectionCnv::createTransient() {
HIPixelTrackletsCollection *p_collection = 0;
if( compareClassGuid( p1_guid ) ) {
- usingTPCnvForReading( m_TPConverter );
std::auto_ptr< HIPixelTrackletsCollection_PERS > p_coll( poolReadObject< HIPixelTrackletsCollection_PERS >() );
p_collection = m_TPConverter.createTransient( p_coll.get(), m_log );
}
diff --git a/Reconstruction/HeavyIonRec/HIRecAthenaPool/src/HIPixelTrackletsCollectionCnv.h b/Reconstruction/HeavyIonRec/HIRecAthenaPool/src/HIPixelTrackletsCollectionCnv.h
index d78e6ea2a71e2bc1a84872934e4645aacbc3575f..b294e8e571d4e89c2f83cd5d404e08f8e9116bcf 100644
--- a/Reconstruction/HeavyIonRec/HIRecAthenaPool/src/HIPixelTrackletsCollectionCnv.h
+++ b/Reconstruction/HeavyIonRec/HIRecAthenaPool/src/HIPixelTrackletsCollectionCnv.h
@@ -16,7 +16,6 @@
#undef protected
#include "AthenaPoolCnvSvc/T_AthenaPoolCustomCnv.h"
-#include "AthenaPoolCnvSvc/AthenaPoolCnvTPExtension.h"
#include "HIGlobal/HIPixelTrackletsCollection.h"
#include "HIRecTPCnv/HIPixelTrackletsCollectionCnv_tlp1.h"
@@ -24,8 +23,7 @@
typedef HIPixelTrackletsCollection_tlp1 HIPixelTrackletsCollection_PERS;
typedef T_AthenaPoolCustomCnv<HIPixelTrackletsCollection, HIPixelTrackletsCollection_PERS> HIPixelTrackletsCollectionCnvBase;
-class HIPixelTrackletsCollectionCnv : public HIPixelTrackletsCollectionCnvBase,
- public AthenaPoolCnvTPExtension
+class HIPixelTrackletsCollectionCnv : public HIPixelTrackletsCollectionCnvBase
{
friend class CnvFactory<HIPixelTrackletsCollectionCnv>;
diff --git a/Reconstruction/TrackParticleAthenaPool/src/TrackParticleContainerCnv.h b/Reconstruction/TrackParticleAthenaPool/src/TrackParticleContainerCnv.h
index bf2ef64447aafea382a6dd2beb7a26451a079c57..83253ba468c7015a275683c4f3b66d51fa7ebe5d 100644
--- a/Reconstruction/TrackParticleAthenaPool/src/TrackParticleContainerCnv.h
+++ b/Reconstruction/TrackParticleAthenaPool/src/TrackParticleContainerCnv.h
@@ -18,7 +18,6 @@
#undef protected
#include "AthenaPoolCnvSvc/T_AthenaPoolCustomCnv.h"
-#include "AthenaPoolCnvSvc/AthenaPoolCnvTPExtension.h"
#include "Particle/TrackParticleContainer.h"
@@ -37,9 +36,7 @@ typedef T_AthenaPoolCustomCnv<Rec::TrackParticleContainer, TrackParticleContaine
//-----------------------------------------------------------------------------
// Converter for TrackCollection object
//-----------------------------------------------------------------------------
-class TrackParticleContainerCnv
- : public TrackParticleContainerCnvBase,
- public AthenaPoolCnvTPExtension
+class TrackParticleContainerCnv : public TrackParticleContainerCnvBase
{
friend class CnvFactory<TrackParticleContainerCnv>;
diff --git a/Tracking/TrkDetDescr/TrkDetDescrAthenaPool/src/LayerMaterialMapCnv.h b/Tracking/TrkDetDescr/TrkDetDescrAthenaPool/src/LayerMaterialMapCnv.h
index b0e9c04de5cc5ac6467205a4f72055435aeb7fa0..abf7b8896255930185444e08947fc30436eefaa1 100644
--- a/Tracking/TrkDetDescr/TrkDetDescrAthenaPool/src/LayerMaterialMapCnv.h
+++ b/Tracking/TrkDetDescr/TrkDetDescrAthenaPool/src/LayerMaterialMapCnv.h
@@ -15,7 +15,6 @@
#undef protected
#include "AthenaPoolCnvSvc/T_AthenaPoolCustomCnv.h"
-#include "AthenaPoolCnvSvc/AthenaPoolCnvTPExtension.h"
#include "TrkGeometry/LayerMaterialMap.h"
#include "TrkDetDescrTPCnv/LayerMaterialMapCnv_tlp1.h"
@@ -30,9 +29,7 @@ typedef T_AthenaPoolCustomCnv<Trk::LayerMaterialMap, LayerMaterialMap_PERS> Laye
//-----------------------------------------------------------------------------
// Converter for TrackCollection object
//-----------------------------------------------------------------------------
-class LayerMaterialMapCnv
- : public LayerMaterialMapCnvBase,
- public AthenaPoolCnvTPExtension
+class LayerMaterialMapCnv : public LayerMaterialMapCnvBase
{
friend class CnvFactory<LayerMaterialMapCnv>;