diff --git a/Reconstruction/HeavyIonRec/HIRecAthenaPool/CMakeLists.txt b/Reconstruction/HeavyIonRec/HIRecAthenaPool/CMakeLists.txt
deleted file mode 100644
index e6a6b690dd0d442431dbba6f9cb028056af05eb2..0000000000000000000000000000000000000000
--- a/Reconstruction/HeavyIonRec/HIRecAthenaPool/CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-################################################################################
-# Package: HIRecAthenaPool
-################################################################################
-
-# Declare the package name:
-atlas_subdir( HIRecAthenaPool )
-
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Database/AtlasSealCLHEP )
-
diff --git a/Reconstruction/HeavyIonRec/HIRecAthenaPool/src/EtaPhiBinsCnv.cxx b/Reconstruction/HeavyIonRec/HIRecAthenaPool/src/EtaPhiBinsCnv.cxx
deleted file mode 100755
index 3160c01426b158873784c5593a8fdd77e7759ce6..0000000000000000000000000000000000000000
--- a/Reconstruction/HeavyIonRec/HIRecAthenaPool/src/EtaPhiBinsCnv.cxx
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-*/
-
-/********************************************************************
-
-NAME: EtaPhiBinsCnv.h
-PACKAGE: offline/Reconstruction/RecAthenaPool
-
-AUTHORS: S. Resconi
-CREATED: Jul 2007
-
-PURPOSE: Implementation file for class EtaPhiBinsCnv
-********************************************************************/
-
-// STL includes
-
-// Framework includes
-#include "GaudiKernel/MsgStream.h"
-
-// RecTPCnv includes
-#include "HIRecTPCnv/EtaPhiBinsCnv_p1.h"
-
-// RecAthenaPool includes
-#include "EtaPhiBinsCnv.h"
-
-///////////////////////////////////////////////////////////////////
-/// Public methods:
-///////////////////////////////////////////////////////////////////
-
-///////////////////////////////////////////////////////////////////
-/// Const methods:
-///////////////////////////////////////////////////////////////////
-
-///////////////////////////////////////////////////////////////////
-// Protected methods:
-///////////////////////////////////////////////////////////////////
-
-
-EtaPhiBins_PERS*
-EtaPhiBinsCnv::createPersistent( EtaPhiBins* transCont )
-{
- MsgStream msg( msgSvc(), "EtaPhiBinsCnv" );
-
- EtaPhiBinsCnv_p1 cnv;
- EtaPhiBins_PERS *persObj = cnv.createPersistent( transCont, msg );
-
- msg << MSG::DEBUG << "::createPersistent [Success]" << endmsg;
- return persObj;
-}
-
-EtaPhiBins* EtaPhiBinsCnv::createTransient()
-{
- MsgStream msg( msgSvc(), "EtaPhiBinsCnv" );
-
- EtaPhiBins *transObj = 0;
-
- static pool::Guid tr_guid("080267DD-E545-4469-ABED-BC7EB62D4C64");
- //static pool::Guid p1_guid("C0D9AEE8-A2B0-4EED-BD75-53D67DF9736F");
- static pool::Guid p1_guid("C653008A-0C79-4102-A318-F42703FD7EE4");
-
- if ( compareClassGuid(tr_guid) ) {
-
- // regular object from before the T/P separation
- return poolReadObject<EtaPhiBins>();
-
- } else if ( compareClassGuid(p1_guid) ) {
-
- // using unique_ptr ensures deletion of the persistent object
- std::unique_ptr<EtaPhiBins_p1> persObj( poolReadObject<EtaPhiBins_p1>() );
- EtaPhiBinsCnv_p1 cnv;
- transObj = cnv.createTransient( persObj.get(), msg );
- } else {
- throw std::runtime_error("Unsupported persistent version of EtaPhiBins");
- }
-
- return transObj;
-}
diff --git a/Reconstruction/HeavyIonRec/HIRecAthenaPool/src/EtaPhiBinsCnv.h b/Reconstruction/HeavyIonRec/HIRecAthenaPool/src/EtaPhiBinsCnv.h
deleted file mode 100755
index 851631b53e1623e21dcc7c137306d0238de5136c..0000000000000000000000000000000000000000
--- a/Reconstruction/HeavyIonRec/HIRecAthenaPool/src/EtaPhiBinsCnv.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef RECATHENAPOOL_ETAPHIBINSCNV_H
-#define RECATHENAPOOL_ETAPHIBINSCNV_H
-/********************************************************************
-
-NAME: EtaPhiBinsCnv.h
-PACKAGE: offline/Reconstruction/RecAthenaPool
-
-AUTHORS: S. Resconi
-CREATED: Jul 2007
-
-PURPOSE: Header file for class EtaPhiBinsCnv
-********************************************************************/
-
-
-// STL includes
-
-// AthenaPoolCnvSvc includes
-#include "AthenaPoolCnvSvc/T_AthenaPoolCustomCnv.h"
-
-// RecTPCnv includes
-#include "HIRecTPCnv/EtaPhiBins_p1.h"
-
-// Forward declaration
-
-#include "HIGlobal/EtaPhiBins.h"
-
-// the latest persistent representation type of DataCollection:
-typedef EtaPhiBins_p1 EtaPhiBins_PERS;
-
-class EtaPhiBinsCnv: public T_AthenaPoolCustomCnv<
- EtaPhiBins,
- EtaPhiBins_PERS
- >
-
-{
-
- // make the factory for this converter our friend
- friend class CnvFactory<EtaPhiBinsCnv>;
-
- ///////////////////////////////////////////////////////////////////
- // Protected methods:
- ///////////////////////////////////////////////////////////////////
- protected:
-
- /** Create the converter from the service locator
- */
- EtaPhiBinsCnv(ISvcLocator* svcloc);
-
- /** Build the persistent representation from the transient one.
- */
- virtual EtaPhiBins_PERS*
- createPersistent( EtaPhiBins* transCont );
-
- /** Build the transient representation from a persistent one
- */
- virtual EtaPhiBins* createTransient();
-
-};
-
-///////////////////////////////////////////////////////////////////
-/// Inline methods:
-///////////////////////////////////////////////////////////////////
-
-inline EtaPhiBinsCnv::EtaPhiBinsCnv( ISvcLocator* svcLocator ) :
- T_AthenaPoolCustomCnv<EtaPhiBins, EtaPhiBins_PERS>(svcLocator)
-{}
-
-#endif //> RECATHENAPOOL_ETAPHIBINSCNV_H
diff --git a/Reconstruction/HeavyIonRec/HIRecAthenaPool/src/HIPixelTrackletsCollectionCnv.cxx b/Reconstruction/HeavyIonRec/HIRecAthenaPool/src/HIPixelTrackletsCollectionCnv.cxx
deleted file mode 100644
index 29a002058f09c38789b189774a579528d988e944..0000000000000000000000000000000000000000
--- a/Reconstruction/HeavyIonRec/HIRecAthenaPool/src/HIPixelTrackletsCollectionCnv.cxx
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-*/
-
-/**
- * @file HIPixelTrackletsCollectionCnv.cxx
- * @brief Generated implementation file which includes header files needed by HIPixelTrackletsCollectionCnv
- * @author RD Schaffer <R.D.Schaffer@cern.ch>
- */
-
-
-#include "HIPixelTrackletsCollectionCnv.h"
-
-//constructor
-HIPixelTrackletsCollectionCnv::HIPixelTrackletsCollectionCnv(ISvcLocator *svcloc ):
- HIPixelTrackletsCollectionCnvBase(svcloc),
- m_msgSvc( msgSvc() ),
- m_log(m_msgSvc,"HIPixelTrackletsCollectionCnv")
-{}
-
-//destructor
-HIPixelTrackletsCollectionCnv::~HIPixelTrackletsCollectionCnv()
-{}
-
-StatusCode HIPixelTrackletsCollectionCnv::initialize()
-{
- StatusCode sc = HIPixelTrackletsCollectionCnvBase::initialize();
- if( sc.isFailure() ) {
- m_log << MSG::FATAL << "Could not initialize HIPixelTrackletsCollectionCnvBase" << endmsg;
- return sc;
- }
-
- m_log.setLevel( m_msgSvc->outputLevel() );
- m_log << MSG::INFO << "HIPixelTrackletsCollectionCnv::initialize()." << endmsg;
-
- //
- return StatusCode::SUCCESS;
-}
-
-HIPixelTrackletsCollection_PERS *
-HIPixelTrackletsCollectionCnv::createPersistent( HIPixelTrackletsCollection* transCont) {
- m_log.setLevel( m_msgSvc->outputLevel() );
- updateLog();
- HIPixelTrackletsCollection_PERS *pTrkletsCont = m_TPConverter.createPersistent( transCont, m_log );
-
- return pTrkletsCont;
-}
-
-
-HIPixelTrackletsCollection*
-HIPixelTrackletsCollectionCnv::createTransient() {
- static pool::Guid p1_guid( "8FE8FB83-AA9B-4E4A-8365-FBDDBC5B5400" );
- //static pool::Guid p0_guid( " " );
-
- HIPixelTrackletsCollection *p_collection = 0;
- if( compareClassGuid( p1_guid ) ) {
- std::unique_ptr< HIPixelTrackletsCollection_PERS > p_coll( poolReadObject< HIPixelTrackletsCollection_PERS >() );
- p_collection = m_TPConverter.createTransient( p_coll.get(), m_log );
- }
- else throw std::runtime_error( "Unsupported persistent version of HIPixelTrackletsCollection." );
-
- return p_collection;
-}
-
-void HIPixelTrackletsCollectionCnv::updateLog() {
- DataObject *dObj = getDataObject();
- if( dObj==0 ) return;
- const std::string key = (dObj->name());
-
- m_log.m_source = "HIPixelTrackletsCollectionCnv: " + key;
-
-}
diff --git a/Reconstruction/HeavyIonRec/HIRecAthenaPool/src/HIPixelTrackletsCollectionCnv.h b/Reconstruction/HeavyIonRec/HIRecAthenaPool/src/HIPixelTrackletsCollectionCnv.h
deleted file mode 100644
index b294e8e571d4e89c2f83cd5d404e08f8e9116bcf..0000000000000000000000000000000000000000
--- a/Reconstruction/HeavyIonRec/HIRecAthenaPool/src/HIPixelTrackletsCollectionCnv.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-/**
- * @file HIPixelTrackletsCollectionCnv.h
- * @brief Generated header file which defines a typedef for templated converter class
- * @author RD Schaffer <R.D. Schaffer@cern.ch>
- */
-
-#ifndef HIPixelTrackletsCollectionCnv_H
-#define HIPixelTrackletsCollectionCnv_H
-
-#define protected public
-#include "GaudiKernel/MsgStream.h"
-#undef protected
-
-#include "AthenaPoolCnvSvc/T_AthenaPoolCustomCnv.h"
-
-#include "HIGlobal/HIPixelTrackletsCollection.h"
-#include "HIRecTPCnv/HIPixelTrackletsCollectionCnv_tlp1.h"
-
-typedef HIPixelTrackletsCollection_tlp1 HIPixelTrackletsCollection_PERS;
-typedef T_AthenaPoolCustomCnv<HIPixelTrackletsCollection, HIPixelTrackletsCollection_PERS> HIPixelTrackletsCollectionCnvBase;
-
-class HIPixelTrackletsCollectionCnv : public HIPixelTrackletsCollectionCnvBase
-{
- friend class CnvFactory<HIPixelTrackletsCollectionCnv>;
-
- protected:
- HIPixelTrackletsCollectionCnv(ISvcLocator *svcloc );
- ~HIPixelTrackletsCollectionCnv();
- virtual StatusCode initialize();
- virtual HIPixelTrackletsCollection_PERS *createPersistent(HIPixelTrackletsCollection* transCont);
- virtual HIPixelTrackletsCollection *createTransient();
- virtual AthenaPoolTopLevelTPCnvBase* getTopLevelTPCnv() { return &m_TPConverter; }
-
- private:
- void updateLog();
-
- IMessageSvc *m_msgSvc;
- MsgStream m_log;
- HIPixelTrackletsCollectionCnv_tlp1 m_TPConverter;
-
-};
-
-#endif
-
diff --git a/Reconstruction/HeavyIonRec/HIRecAthenaPool/src/HITRTInfoCnv.cxx b/Reconstruction/HeavyIonRec/HIRecAthenaPool/src/HITRTInfoCnv.cxx
deleted file mode 100644
index ee78e7303bec44b4103ad2d83d359b03e8431750..0000000000000000000000000000000000000000
--- a/Reconstruction/HeavyIonRec/HIRecAthenaPool/src/HITRTInfoCnv.cxx
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-*/
-
-
-// Framework includes
-#include "GaudiKernel/MsgStream.h"
-
-// RecTPCnv includes
-#include "HIRecTPCnv/HITRTInfoCnv_p1.h"
-
-// RecAthenaPool includes
-#include "HITRTInfoCnv.h"
-
-HITRTInfo_PERS*
-HITRTInfoCnv::createPersistent( HITRTInfo* transCont )
-{
- // MsgStream msg( msgSvc(), "HITRTInfoCnv" );
- if ( ! bool(m_msg) )
- m_msg=new MsgStream( msgSvc(), "HITRTInfoCnv" );
-
- HITRTInfoCnv_p1 cnv;
- HITRTInfo_PERS *persObj = cnv.createPersistent( transCont, *m_msg );
-
- // msg << MSG::DEBUG << "::createPersistent [Success]" << endmsg;
- return persObj;
-}
-
-HITRTInfo* HITRTInfoCnv::createTransient()
-{
- // MsgStream msg( msgSvc(), "HITRTInfoCnv" );
- if ( ! bool(m_msg) )
- m_msg=new MsgStream( msgSvc(), "HITRTInfoCnv" );
-
- HITRTInfo *transObj = 0;
-
- static pool::Guid p1_guid("8F3FEA42-D7E6-4FD7-84C1-91D5B551B537");
-
- if ( compareClassGuid(p1_guid) )
- {
- std::unique_ptr<HITRTInfo_p1> persObj( poolReadObject<HITRTInfo_p1>() );
- HITRTInfoCnv_p1 cnv;
- transObj = cnv.createTransient( persObj.get(), *m_msg );
- } else {
- throw std::runtime_error("Unsupported persistent version of HITRTInfo");
- }
-
- return transObj;
-}
diff --git a/Reconstruction/HeavyIonRec/HIRecAthenaPool/src/HITRTInfoCnv.h b/Reconstruction/HeavyIonRec/HIRecAthenaPool/src/HITRTInfoCnv.h
deleted file mode 100644
index 0faa76320039409de5b2efe2a55923271275e605..0000000000000000000000000000000000000000
--- a/Reconstruction/HeavyIonRec/HIRecAthenaPool/src/HITRTInfoCnv.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef HIRECATHENAPOOL_HITRTINFO_H
-#define HIRECATHENAPOOL_HITRTINFO_H
-
-// AthenaPoolCnvSvc includes
-#include "AthenaPoolCnvSvc/T_AthenaPoolCustomCnv.h"
-
-#include "HIGlobal/HITRTInfo.h"
-#include "HIRecTPCnv/HITRTInfo_p1.h"
-
-class MsgStream;
-
-typedef HITRTInfo_p1 HITRTInfo_PERS;
-
-class HITRTInfoCnv: public T_AthenaPoolCustomCnv< HITRTInfo, HITRTInfo_PERS >
-{
-
- // make the factory for this converter our friend
- friend class CnvFactory<HITRTInfoCnv>;
-
- ///////////////////////////////////////////////////////////////////
- // Protected methods:
- ///////////////////////////////////////////////////////////////////
- protected:
-
- /** Create the converter from the service locator
- */
- HITRTInfoCnv(ISvcLocator* svcloc);
-
- /** Build the persistent representation from the transient one.
- */
- virtual HITRTInfo_PERS* createPersistent( HITRTInfo* transCont );
-
- /** Build the transient representation from a persistent one
- */
- virtual HITRTInfo* createTransient();
-
- private:
-
- MsgStream *m_msg;
-
-};
-
-///////////////////////////////////////////////////////////////////
-/// Inline methods:
-///////////////////////////////////////////////////////////////////
-
-inline HITRTInfoCnv::HITRTInfoCnv( ISvcLocator* svcLocator ) :
- T_AthenaPoolCustomCnv<HITRTInfo, HITRTInfo_PERS>(svcLocator),
- m_msg(0)
-{}
-
-#endif
diff --git a/Reconstruction/HeavyIonRec/HIRecTPCnv/CMakeLists.txt b/Reconstruction/HeavyIonRec/HIRecTPCnv/CMakeLists.txt
deleted file mode 100644
index 9b8979734e7c14dbf11b062187531d35ac83cfc9..0000000000000000000000000000000000000000
--- a/Reconstruction/HeavyIonRec/HIRecTPCnv/CMakeLists.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-################################################################################
-# Package: HIRecTPCnv
-################################################################################
-
-# Declare the package name:
-atlas_subdir( HIRecTPCnv )
-
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Database/AthenaPOOL/AthenaPoolCnvSvc
- Database/AthenaPOOL/AthenaPoolUtilities
- InnerDetector/InDetEventCnv/InDetEventTPCnv
- InnerDetector/InDetRecEvent/InDetPrepRawData
- Reconstruction/HeavyIonRec/HIGlobal
- Tracking/TrkEventCnv/TrkEventTPCnv )
-
-# External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-
-# Install files from the package:
-atlas_install_headers( HIRecTPCnv )
-
diff --git a/Reconstruction/HeavyIonRec/HIRecTPCnv/HIRecTPCnv/EtaPhiBinsCnv_p1.h b/Reconstruction/HeavyIonRec/HIRecTPCnv/HIRecTPCnv/EtaPhiBinsCnv_p1.h
deleted file mode 100755
index bb1f2ac4509ebd16ed79cbd4c8822f394a585597..0000000000000000000000000000000000000000
--- a/Reconstruction/HeavyIonRec/HIRecTPCnv/HIRecTPCnv/EtaPhiBinsCnv_p1.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef RECTPCNV_ETAPHIBINSCNV_P1_H
-#define RECTPCNV_ETAPHIBINSCNV_P1_H
-
-/********************************************************************
-
-NAME: MissingEtCnv_p1.h
-PACKAGE: offline/Reconstruction/RecTPCnv
-
-AUTHORS: S. Resconi
-CREATED: Jul 2007
-
-PURPOSE: Transient/Persisten converter for EtaPhiBins class
-********************************************************************/
-
-#include "AthenaPoolCnvSvc/T_AthenaPoolTPConverter.h"
-#include "HIRecTPCnv/EtaPhiBins_p1.h"
-#include "HIGlobal/EtaPhiBins.h"
-
-#include "TBuffer.h"
-
-class MsgStream;
-
-class EtaPhiBinsCnv_p1 : public T_AthenaPoolTPCnvBase<EtaPhiBins, EtaPhiBins_p1>
-{
- public:
- EtaPhiBinsCnv_p1() {};
- virtual void persToTrans( const EtaPhiBins_p1 *persObj,
- EtaPhiBins *transObj,
- MsgStream &msg );
-
- virtual void transToPers( const EtaPhiBins *transObj,
- EtaPhiBins_p1 *persObj,
- MsgStream &msg );
-};
-
-template <>
-class T_TPCnv<EtaPhiBins, EtaPhiBins_p1 >
- : public EtaPhiBinsCnv_p1
-{
-public:
-};
-
-
-
-#endif // RECTPCNV_ETAPHIBINSCNV_P1_H
diff --git a/Reconstruction/HeavyIonRec/HIRecTPCnv/HIRecTPCnv/EtaPhiBins_p1.h b/Reconstruction/HeavyIonRec/HIRecTPCnv/HIRecTPCnv/EtaPhiBins_p1.h
deleted file mode 100755
index 15c97f6d68638852b126c12ae39e2c8a3f0f309f..0000000000000000000000000000000000000000
--- a/Reconstruction/HeavyIonRec/HIRecTPCnv/HIRecTPCnv/EtaPhiBins_p1.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-
-#ifndef RECTPCNV_ETAPHIBINS_P1_H
-#define RECTPCNV_ETAPHIBINS_P1_H
-
-/********************************************************************
-
-NAME: EtaPhiBins_p1
-PACKAGE: offline/Reconstruction/RecTPCnv
-
-AUTHORS: S. Resconi
-CREATED: Jul 2007
-
-PURPOSE: Persistent rapresentation of EtaPhiBins class
-********************************************************************/
-
-// forward declarations
-class EtaPhiBinsCnv_p1;
-
-#include <vector>
-
-class EtaPhiBins_p1
-{
- friend class EtaPhiBinsCnv_p1;
-
- public:
-
- /** default constructor */
- EtaPhiBins_p1() {};
-
- /** destructor */
- ~EtaPhiBins_p1();
-
- protected:
-
- /// basic components of EtaPhiBins_p1
- float m_EtaMin;
- float m_EtaMax;
- int m_NEtaBins;
- int m_NPhiBins;
- std::vector<unsigned char> m_h2vec;
-
-};
-
-
-#endif
diff --git a/Reconstruction/HeavyIonRec/HIRecTPCnv/HIRecTPCnv/HIPixelTrackletsCnv_p1.h b/Reconstruction/HeavyIonRec/HIRecTPCnv/HIRecTPCnv/HIPixelTrackletsCnv_p1.h
deleted file mode 100644
index d2c8589c6a04fb45e2ac270c300bc710ce1789fc..0000000000000000000000000000000000000000
--- a/Reconstruction/HeavyIonRec/HIRecTPCnv/HIRecTPCnv/HIPixelTrackletsCnv_p1.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef HIPIXELTRACKLETSCNV_P1_H
-#define HIPIXELTRACKLETSCNV_P1_H
-
-#include "AthenaPoolCnvSvc/T_AthenaPoolTPConverter.h"
-#include "HIGlobal/HIPixelTracklets.h"
-#include "HIRecTPCnv/HIPixelTracklets_p1.h"
-#include "InDetEventTPCnv/InDetPrepRawData/PixelClusterCnv_p1.h"
-#include "InDetPrepRawData/PixelCluster.h"
-#include "TrkEventTPCnv/TrkEventPrimitives/HepPoint3DCnv_p1.h"
-
-class MsgStream;
-
-class HIPixelTrackletsCnv_p1 : public T_AthenaPoolTPCnvBase<HIPixelTracklets,HIPixelTracklets_p1> {
- typedef InDet::PixelCluster PixelCluster;
- public:
- HIPixelTrackletsCnv_p1():m_hepPoint3DCnv(0) {};
-
- void persToTrans(const HIPixelTracklets_p1 *persObj, HIPixelTracklets *transObj, MsgStream &log);
- void transToPers(const HIPixelTracklets *transObj, HIPixelTracklets_p1 *persObj, MsgStream &log);
- virtual void initPrivateConverters( AthenaPoolTopLevelTPCnvBase *topCnv) {
- m_clusterVectorCnv.setTopConverter(topCnv,0);
- }
-
- private:
- HepPoint3DCnv_p1* m_hepPoint3DCnv;
- PixelClusterCnv_p1* m_pixelClusterCnv;
- typedef T_AthenaPoolTPPolyVectorCnv< std::vector<PixelCluster*>, std::vector<TPObjRef>, ITPConverterFor<PixelCluster> > clusterForTrkletsVectorCnv_p1;
- //typedef T_AthenaPoolTPPtrVectorCnv< std::vector<PixelCluster*>, std::vector<TPObjRef>, PixelClusterCnv_p1> clusterForTrkletsVectorCnv_p1;
- clusterForTrkletsVectorCnv_p1 m_clusterVectorCnv;
-
-};
-
-#endif
diff --git a/Reconstruction/HeavyIonRec/HIRecTPCnv/HIRecTPCnv/HIPixelTrackletsCnv_p1.h.save b/Reconstruction/HeavyIonRec/HIRecTPCnv/HIRecTPCnv/HIPixelTrackletsCnv_p1.h.save
deleted file mode 100644
index fc24501fd69cbf4a218dbeae235ccc3fbf89ac4a..0000000000000000000000000000000000000000
--- a/Reconstruction/HeavyIonRec/HIRecTPCnv/HIRecTPCnv/HIPixelTrackletsCnv_p1.h.save
+++ /dev/null
@@ -1,28 +0,0 @@
-#ifndef HIPIXELTRACKLETSCNV_P1_H
-#define HIPIXELTRACKLETSCNV_P1_H
-
-#include "AthenaPoolCnvSvc/T_AthenaPoolTPConverter.h"
-#include "HIGlobal/HIPixelTracklets.h"
-#include "HIRecTPCnv/HIPixelTracklets_p1.h"
-#include "InDetEventTPCnv/InDetPrepRawData/PixelClusterCnv_p1.h"
-#include "InDetPrepRawData/PixelCluster.h"
-#include "TrkEventTPCnv/TrkEventPrimitives/HepPoint3DCnv_p1.h"
-
-class MsgStream;
-
-class HIPixelTrackletsCnv_p1 : public T_AthenaPoolTPCnvBase<HIPixelTracklets,HIPixelTracklets_p1> {
- typedef InDet::PixelCluster PixelCluster;
- public:
- HIPixelTrackletsCnv_p1() {};
-
- void persToTrans(const HIPixelTracklets_p1 *persObj, HIPixelTracklets *transObj, MsgStream &log);
- void transToPers(const HIPixelTracklets *transObj, HIPixelTracklets_p1 *persObj, MsgStream &log);
-
- private:
- HepPoint3DCnv_p1* m_hepPoint3DCnv;
-/* typedef T_AthenaPoolTPPolyVectorCnv< std::vector<PixelCluster*>, std::vector<TPObjRef>, ITPConverterFor<PixelCluster> > clusterForTrkletsVectorCnv_p1; */
-/* clusterForTrkletsVectorCnv_p1 *m_clusterVectorCnv; */
-
-};
-
-#endif
diff --git a/Reconstruction/HeavyIonRec/HIRecTPCnv/HIRecTPCnv/HIPixelTrackletsCollectionCnv_p1.h b/Reconstruction/HeavyIonRec/HIRecTPCnv/HIRecTPCnv/HIPixelTrackletsCollectionCnv_p1.h
deleted file mode 100644
index b2b7dde49865a9b8c6428390445722517876b63c..0000000000000000000000000000000000000000
--- a/Reconstruction/HeavyIonRec/HIRecTPCnv/HIRecTPCnv/HIPixelTrackletsCollectionCnv_p1.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef HIPIXELTRACKLETSCOLLECTIONCNV_P1_H
-#define HIPIXELTRACKLETSCOLLECTIONCNV_P1_H
-
-#include "AthenaPoolCnvSvc/T_AthenaPoolTPConverter.h"
-#include "HIRecTPCnv/HIPixelTrackletsCollection_p1.h"
-
-#include "HIRecTPCnv/HIPixelTrackletsCnv_p1.h"
-#include "HIGlobal/HIPixelTrackletsCollection.h"
-
-class MsgStream;
-
-class HIPixelTrackletsCollectionCnv_p1: public T_AthenaPoolTPPolyVectorCnv<HIPixelTrackletsCollection,HIPixelTrackletsCollection_p1,ITPConverterFor<HIPixelTracklets> > {
- public:
- HIPixelTrackletsCollectionCnv_p1() {};
- //virtual void persToTrans(const HIPixelTrackletsCollection_p1 *persObj, HIPixelTrackletsCollection *transObj, MsgStream& log);
- //virtual void transToPers(const HIPixelTrackletsCollection *transObj, HIPixelTrackletsCollection_p1 *persObj, MsgStream& log);
-};
-
-
-/* template<> */
-/* class T_TPCnv<HIPixelTrackletsCollection, HIPixelTrackletsCollection_p1> */
-/* : public HIPixelTrackletsCollectionCnv_p1 { */
-/* public: */
-/* }; */
-
-#endif
diff --git a/Reconstruction/HeavyIonRec/HIRecTPCnv/HIRecTPCnv/HIPixelTrackletsCollectionCnv_tlp1.h b/Reconstruction/HeavyIonRec/HIRecTPCnv/HIRecTPCnv/HIPixelTrackletsCollectionCnv_tlp1.h
deleted file mode 100644
index 1f85351489fe117f112f5eccb7a143b278487fc1..0000000000000000000000000000000000000000
--- a/Reconstruction/HeavyIonRec/HIRecTPCnv/HIRecTPCnv/HIPixelTrackletsCollectionCnv_tlp1.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef HIPIXELTRACKLETSCOLLECTIONCNVTLP1_H
-#define HIPIXELTRACKLETSCOLLECTIONCNVTLP1_H
-
-#include "AthenaPoolCnvSvc/AthenaPoolTopLevelTPConverter.h"
-#include "HIRecTPCnv/HIPixelTrackletsCollection_tlp1.h"
-#include "HIRecTPCnv/HIPixelTrackletsCollectionCnv_p1.h"
-#include "HIRecTPCnv/HIPixelTrackletsCnv_p1.h"
-#include "TrkEventTPCnv/TrkEventPrimitives/HepPoint3DCnv_p1.h"
-#include "InDetEventTPCnv/InDetPrepRawData/PixelClusterCnv_p1.h"
-
-class HIPixelTrackletsCollectionCnv_tlp1 : public AthenaPoolTopLevelTPConverter<HIPixelTrackletsCollectionCnv_p1, HIPixelTrackletsCollection_tlp1> {
- public:
- HIPixelTrackletsCollectionCnv_tlp1();
- virtual ~HIPixelTrackletsCollectionCnv_tlp1() {}
-
- //default methods
- virtual void setPStorage(HIPixelTrackletsCollection_tlp1* storage);
-
- virtual TPCnvTokenList_p1* getTokenListVar() { return &(getTLPersObject()->m_tokenList); };
-
- protected:
- HIPixelTrackletsCnv_p1 m_hiPixelTrackletsCnv;
- HepPoint3DCnv_p1 m_hepPoint3DCnv;
- PixelClusterCnv_p1 m_pixelClusterCnv;
-
-};
-
-template <>
-class T_TPCnv<HIPixelTrackletsCollection, HIPixelTrackletsCollection_tlp1>
- : public HIPixelTrackletsCollectionCnv_tlp1
-{
- public:
- T_TPCnv();
- void persToTrans(const HIPixelTrackletsCollection_tlp1* pers,
- HIPixelTrackletsCollection* trans,
- MsgStream& msg);
-};
-
-#endif
diff --git a/Reconstruction/HeavyIonRec/HIRecTPCnv/HIRecTPCnv/HIPixelTrackletsCollection_p1.h b/Reconstruction/HeavyIonRec/HIRecTPCnv/HIRecTPCnv/HIPixelTrackletsCollection_p1.h
deleted file mode 100644
index 25574f2e2c4c47ce6a757ca17873a315c71d8a82..0000000000000000000000000000000000000000
--- a/Reconstruction/HeavyIonRec/HIRecTPCnv/HIRecTPCnv/HIPixelTrackletsCollection_p1.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef HIPIXELTRACKLETSCOLLECTION_P1_H
-#define HIPIXELTRACKLETSCOLLECTION_P1_H
-
-//#include "HIRecTPCnv/HIPixelTracklets_p1.h"
-#include "AthenaPoolUtilities/TPObjRef.h"
-#include <vector>
-
-class HIPixelTrackletsCollection_p1
-: public std::vector<TPObjRef> {
-
- public:
- //default constructor
- HIPixelTrackletsCollection_p1() {};
-
-};
-
-
-
-#endif
diff --git a/Reconstruction/HeavyIonRec/HIRecTPCnv/HIRecTPCnv/HIPixelTrackletsCollection_tlp1.h b/Reconstruction/HeavyIonRec/HIRecTPCnv/HIRecTPCnv/HIPixelTrackletsCollection_tlp1.h
deleted file mode 100644
index 0cea08db6fa1fbef7299a046eb936f7c48f91bc2..0000000000000000000000000000000000000000
--- a/Reconstruction/HeavyIonRec/HIRecTPCnv/HIRecTPCnv/HIPixelTrackletsCollection_tlp1.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef HIPIXELTRACKLETSCOLLECTION_TLP1_H
-#define HIPIXELTRACKLETSCOLLECTION_TLP1_H
-
-#include "HIRecTPCnv/HIPixelTrackletsCollection_p1.h"
-#include "HIRecTPCnv/HIPixelTracklets_p1.h"
-
-class HIPixelTrackletsCollection_tlp1 {
- public:
- HIPixelTrackletsCollection_tlp1(){}
-
- std::vector<HIPixelTrackletsCollection_p1> m_trackletsCollections;
- std::vector<HIPixelTracklets_p1> m_tracklets;
-};
-
-#endif
diff --git a/Reconstruction/HeavyIonRec/HIRecTPCnv/HIRecTPCnv/HIPixelTracklets_p1.h b/Reconstruction/HeavyIonRec/HIRecTPCnv/HIRecTPCnv/HIPixelTracklets_p1.h
deleted file mode 100644
index 094f5c4ffbf6f414dc83565523041454bee8c64d..0000000000000000000000000000000000000000
--- a/Reconstruction/HeavyIonRec/HIRecTPCnv/HIRecTPCnv/HIPixelTracklets_p1.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef HIPIXELTRACKLETS_P1_H
-#define HIPIXELTRACKLETS_P1_H
-
-#include "AthenaPoolUtilities/TPObjRef.h"
-class HIPixelTracklets_p1 {
- friend class HIPixelTrackletsCnv_p1;
- public:
- HIPixelTracklets_p1() {
- m_eta=0;
- m_phi=0;
- m_pt=0;
- m_etaS=0;
- m_phiS=0;
- };
- //vertex position
- TPObjRef m_vrt;
-
- //cluster
- //TPObjRef m_cluster;
- //cluster vector
- std::vector<TPObjRef> m_clusters;
- double m_eta;
- double m_phi;
- double m_pt;
- double m_etaS;
- double m_phiS;
-};
-
-#endif
diff --git a/Reconstruction/HeavyIonRec/HIRecTPCnv/HIRecTPCnv/HIRecTPCnvDict.h b/Reconstruction/HeavyIonRec/HIRecTPCnv/HIRecTPCnv/HIRecTPCnvDict.h
deleted file mode 100755
index ec5ad730707e882282f68d7c3d1d51f153dc2bc6..0000000000000000000000000000000000000000
--- a/Reconstruction/HeavyIonRec/HIRecTPCnv/HIRecTPCnv/HIRecTPCnvDict.h
+++ /dev/null
@@ -1,41 +0,0 @@
-///////////////////////// -*- C++ -*- /////////////////////////////
-
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-/// File: HIRecTPCnv/HIRecTPCnvDict.h
-/// Dictionary file for persistent representation(s) of AOD containers
-/// Author: Sebastien Binet <binet@cern.ch>
-/// Date: December 2006
-
-#ifndef HIRECTPCNV_HIRECTPCNVCNVDICT_H
-#define HIRECTPCNV_HIRECTPCNVCNVDICT_H
-
-#include "HIRecTPCnv/EtaPhiBins_p1.h"
-#include "HIRecTPCnv/EtaPhiBinsCnv_p1.h"
-#include "HIRecTPCnv/HIPixelTrackletsCollection_p1.h"
-#include "HIRecTPCnv/HIPixelTracklets_p1.h"
-#include "HIRecTPCnv/HIPixelTrackletsCollection_tlp1.h"
-#include "HIRecTPCnv/HIPixelTrackletsCollectionCnv_tlp1.h"
-#include "HIGlobal/HIPixelTrackletsCollection.h"
-
-#include "InDetEventTPCnv/InDetPrepRawData/PixelCluster_p1.h"
-
-#include "HIGlobal/HITRTInfo.h"
-#include "HIRecTPCnv/HITRTInfo_p1.h"
-#include "HIRecTPCnv/HITRTInfoCnv_p1.h"
-
-//struct dummy {
-T_TPCnv<EtaPhiBins,EtaPhiBins_p1> m_etaPhiBinsCnv;
-
-std::vector< HIPixelTracklets_p1 > m_v1;
-std::vector< HIPixelTrackletsCollection_p1 > m_v2;
-
-T_TPCnv<HIPixelTrackletsCollection,HIPixelTrackletsCollection_tlp1> m_HIPixelTrackletsCollectionCnv;
-
-T_TPCnv<HITRTInfo, HITRTInfo_p1> m_hitrtinfocnv;
-
-//};
-
-#endif //RECTPCNV_RECTPCNVCNVDICT_H
diff --git a/Reconstruction/HeavyIonRec/HIRecTPCnv/HIRecTPCnv/HITRTInfoCnv_p1.h b/Reconstruction/HeavyIonRec/HIRecTPCnv/HIRecTPCnv/HITRTInfoCnv_p1.h
deleted file mode 100644
index 9e92321de996bb453e531a7b9992922809edd9e3..0000000000000000000000000000000000000000
--- a/Reconstruction/HeavyIonRec/HIRecTPCnv/HIRecTPCnv/HITRTInfoCnv_p1.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef HIRECTPCNV_HITRTINFOCNV_P1_H
-#define HIRECTPCNV_HITRTINFOCNV_P1_H
-
-#include "AthenaPoolCnvSvc/T_AthenaPoolTPConverter.h"
-#include "HIRecTPCnv/HITRTInfo_p1.h"
-#include "HIGlobal/HITRTInfo.h"
-
-class MsgStream;
-
-class HITRTInfoCnv_p1 : public T_AthenaPoolTPCnvBase<HITRTInfo, HITRTInfo_p1>
-{
- public:
- HITRTInfoCnv_p1() {};
- virtual void persToTrans( const HITRTInfo_p1 *persObj,
- HITRTInfo *transObj,
- MsgStream &msg );
-
- virtual void transToPers( const HITRTInfo *transObj,
- HITRTInfo_p1 *persObj,
- MsgStream &msg );
-};
-
-template <>
-class T_TPCnv<HITRTInfo, HITRTInfo_p1 >
- : public HITRTInfoCnv_p1
-{ };
-
-#endif
diff --git a/Reconstruction/HeavyIonRec/HIRecTPCnv/HIRecTPCnv/HITRTInfo_p1.h b/Reconstruction/HeavyIonRec/HIRecTPCnv/HIRecTPCnv/HITRTInfo_p1.h
deleted file mode 100644
index 0bfc15fc52393eede99ad4e469fe0b6911dd3b45..0000000000000000000000000000000000000000
--- a/Reconstruction/HeavyIonRec/HIRecTPCnv/HIRecTPCnv/HITRTInfo_p1.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef HIRECTPCNV_HITRTINFO_P1_H
-#define HIRECTPCNV_HITRTINFO_P1_H
-
-#include <vector>
-
-// forward declarations
-class HITRTInfoCnv_p1;
-
-class HITRTInfo_p1
-{
- friend class HITRTInfoCnv_p1;
-
- public:
-
- /** default constructor */
- HITRTInfo_p1() {};
-
- /** destructor */
- ~HITRTInfo_p1() {};
-
- // protected:
-
- std::vector<int> infos;
-};
-#endif
diff --git a/Reconstruction/HeavyIonRec/HIRecTPCnv/HIRecTPCnv/selection.xml b/Reconstruction/HeavyIonRec/HIRecTPCnv/HIRecTPCnv/selection.xml
deleted file mode 100755
index f9d8e4ceb8e68fad3214b03309d5cf5341ec8a16..0000000000000000000000000000000000000000
--- a/Reconstruction/HeavyIonRec/HIRecTPCnv/HIRecTPCnv/selection.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-<lcgdict>
-
- <class name="EtaPhiBins_p1"
- id="C653008A-0C79-4102-A318-F42703FD7EE4"/>
-
- <class name="T_TPCnv<EtaPhiBins,EtaPhiBins_p1>"/>
- <class name="EtaPhiBinsCnv_p1" />
- <class name="T_AthenaPoolTPCnvBase<EtaPhiBins, EtaPhiBins_p1>"/>
- <class name="T_AthenaPoolTPPolyCnvBase<EtaPhiBins, EtaPhiBins, EtaPhiBins_p1>"/>
- <class name="T_AthenaPoolTPAbstractPolyCnvBase<EtaPhiBins, EtaPhiBins, EtaPhiBins_p1>"/>
- <class name="ITPConverterFor<EtaPhiBins>"/>
-
- <class name="HIPixelTrackletsCollection_tlp1" id="8FE8FB83-AA9B-4E4A-8365-FBDDBC5B5400" />
- <class name="std::vector<HIPixelTrackletsCollection_p1>" />
- <class name="HIPixelTrackletsCollectionCnv_tlp1" />
- <class name="HIPixelTracklets_p1" />
- <class name="std::vector<HIPixelTracklets_p1>" />
-
- <!-- <class name="InDet:PixelCluster_p1" /> -->
-
- <class name="T_TPCnv<HIPixelTrackletsCollection, HIPixelTrackletsCollection_tlp1>" />
- <class name="HITRTInfo_p1" id="8F3FEA42-D7E6-4FD7-84C1-91D5B551B537" />
-
-</lcgdict>
diff --git a/Reconstruction/HeavyIonRec/HIRecTPCnv/src/EtaPhiBinsCnv_p1.cxx b/Reconstruction/HeavyIonRec/HIRecTPCnv/src/EtaPhiBinsCnv_p1.cxx
deleted file mode 100755
index 7ecb67c31a1d37838989a884f7ef1ec1073e2f04..0000000000000000000000000000000000000000
--- a/Reconstruction/HeavyIonRec/HIRecTPCnv/src/EtaPhiBinsCnv_p1.cxx
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-/********************************************************************
-
-NAME: EtaPhiBinsCnv_p1.cxx
-PACKAGE: offline/Reconstruction/RecTPCnv
-
-AUTHORS: S. Resconi
-CREATED: Jul 2007
-
-PURPOSE: Transient/Persisten converter for EtaPhiBins class
-********************************************************************/
-
-// AthenaPoolCnvSvc includes
-#include "AthenaPoolCnvSvc/T_AthenaPoolTPConverter.h"
-
-// EtaPhiBinsEvent includes
-#define private public
-#define protected public
-#include "HIGlobal/EtaPhiBins.h"
-#undef private
-#undef protected
-
-// RecTPCnv includes
-#include "HIRecTPCnv/EtaPhiBinsCnv_p1.h"
-
-#include <TBufferFile.h>
-#include <TROOT.h>
-
-///////////////////////////////////////////////////////////////////
-// methods:
-///////////////////////////////////////////////////////////////////
-
-void EtaPhiBinsCnv_p1::persToTrans( const EtaPhiBins_p1* pers,
- EtaPhiBins* trans,
- MsgStream& msg )
-{
- msg << MSG::DEBUG << "Loading EtaPhiBins from persistent state..."
- << endmsg;
-
- trans->m_EtaMin = pers->m_EtaMin;
- trans->m_EtaMax = pers->m_EtaMax;
- trans->m_NEtaBins = pers->m_NEtaBins;
- trans->m_NPhiBins = pers->m_NPhiBins;
- TBufferFile b(TBuffer::kRead);
- b.SetBuffer((void*)&(pers->m_h2vec[0]),pers->m_h2vec.size(),kFALSE);
- TH2F* h2 = (TH2F*) b.ReadObject(gROOT->GetClass("TH2F"));
- trans->m_H2 = *h2;
- //trans->m_H2.Print();
- msg << MSG::DEBUG << "H2 reading didn't crash!" << endmsg;
- return;
-}
-
-void EtaPhiBinsCnv_p1::transToPers( const EtaPhiBins* trans,
- EtaPhiBins_p1* pers,
- MsgStream& msg )
-{
- msg << MSG::DEBUG << "Creating persistent state of EtaPhiBins..."
- << endmsg;
-
- pers->m_EtaMin = trans->m_EtaMin;
- pers->m_EtaMax = trans->m_EtaMax;
- pers->m_NEtaBins = trans->m_NEtaBins;
- pers->m_NPhiBins = trans->m_NPhiBins;
-
-
- msg << MSG::DEBUG << "Printing H2" << endmsg;
- //trans->m_H2.Print();
-
- msg << MSG::DEBUG << "Make TBuffer" << endmsg;
- TBufferFile b(TBuffer::kWrite);
- msg << MSG::DEBUG << "Writing H2 into TBuffer" << endmsg;
- b.WriteObject(&trans->m_H2);
- char* buf = b.Buffer();
- int len = b.Length();
- msg << MSG::DEBUG << "Clearing vector" << endmsg;
- pers->m_h2vec.clear();
- msg << MSG::DEBUG << "Reserving m_h2vec to length " << len << endmsg;
- pers->m_h2vec.reserve(len);
- msg << MSG::DEBUG << "m_h2vec size = " << pers->m_h2vec.size() << endmsg;
-
- msg << MSG::DEBUG << "Pushing back " << b.Length() << " bytes to m_h2vec" << endmsg;
-
- for (int i = 0;i<len;i++)
- {
- unsigned char ib = buf[i];
-
- msg << MSG::DEBUG << "push back i = " << i << "cont = " << ib << endmsg;
-
- pers->m_h2vec.push_back(ib);
- }
-
- msg << MSG::DEBUG << "H2 writing didn't crash!" << endmsg;
-
- return;
-}
diff --git a/Reconstruction/HeavyIonRec/HIRecTPCnv/src/EtaPhiBins_p1.cxx b/Reconstruction/HeavyIonRec/HIRecTPCnv/src/EtaPhiBins_p1.cxx
deleted file mode 100755
index 75dec2739f27aa50584e24b4743e099fec4639b4..0000000000000000000000000000000000000000
--- a/Reconstruction/HeavyIonRec/HIRecTPCnv/src/EtaPhiBins_p1.cxx
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-/********************************************************************
-
-NAME: EtaPhiBins_p1
-PACKAGE: offline/Reconstruction/RecTPCnv
-
-AUTHORS: S. Resconi
-CREATED: Jul 2007
-
-PURPOSE: Persistent rapresentation of EtaPhiBins class
-********************************************************************/
-
-// RecTPCnv includes
-#include "HIRecTPCnv/EtaPhiBins_p1.h"
-
-///////////////////////////////////////////////////////////////////
-/// Public methods:
-///////////////////////////////////////////////////////////////////
-
-EtaPhiBins_p1::~EtaPhiBins_p1()
-{}
diff --git a/Reconstruction/HeavyIonRec/HIRecTPCnv/src/HIPixelTrackletsCnv_p1.cxx b/Reconstruction/HeavyIonRec/HIRecTPCnv/src/HIPixelTrackletsCnv_p1.cxx
deleted file mode 100644
index ca494080c0194c4e5b5e0a023cc07c3ef9342dc4..0000000000000000000000000000000000000000
--- a/Reconstruction/HeavyIonRec/HIRecTPCnv/src/HIPixelTrackletsCnv_p1.cxx
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include "HIGlobal/HIPixelTracklets.h"
-
-#include "HIRecTPCnv/HIPixelTrackletsCnv_p1.h"
-
-void HIPixelTrackletsCnv_p1::persToTrans(const HIPixelTracklets_p1 *persObj, HIPixelTracklets *transObj, MsgStream &log) {
- transObj->m_eta = persObj->m_eta;
- transObj->m_phi = persObj->m_phi;
- transObj->m_pt = persObj->m_pt;
- transObj->m_etaS = persObj->m_etaS;
- transObj->m_phiS = persObj->m_phiS;
-}
-
-void HIPixelTrackletsCnv_p1::transToPers(const HIPixelTracklets *transObj, HIPixelTracklets_p1 *persObj, MsgStream &log) {
- log << MSG::DEBUG << "HIPixelTrackletsCnv_p1:transToPers:starting." << endmsg;
- persObj->m_eta = transObj->m_eta;
- persObj->m_phi = transObj->m_phi;
- persObj->m_pt = transObj->m_pt;
- persObj->m_etaS = transObj->m_etaS;
- persObj->m_phiS = transObj->m_phiS;
-}
diff --git a/Reconstruction/HeavyIonRec/HIRecTPCnv/src/HIPixelTrackletsCollectionCnv_tlp1.cxx b/Reconstruction/HeavyIonRec/HIRecTPCnv/src/HIPixelTrackletsCollectionCnv_tlp1.cxx
deleted file mode 100644
index e89b9aea51c4129543b071455268ca2f4525aea1..0000000000000000000000000000000000000000
--- a/Reconstruction/HeavyIonRec/HIRecTPCnv/src/HIPixelTrackletsCollectionCnv_tlp1.cxx
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include "HIRecTPCnv/HIPixelTrackletsCollectionCnv_tlp1.h"
-
-HIPixelTrackletsCollectionCnv_tlp1::HIPixelTrackletsCollectionCnv_tlp1() {
- addMainTPConverter();
-
- addTPConverter( &m_hiPixelTrackletsCnv);
-}
-
-void HIPixelTrackletsCollectionCnv_tlp1::setPStorage( HIPixelTrackletsCollection_tlp1 *storage) {
- setMainCnvPStorage( &storage->m_trackletsCollections );
-
- m_hiPixelTrackletsCnv.setPStorage(&storage->m_tracklets);
-}
-
-T_TPCnv<HIPixelTrackletsCollection, HIPixelTrackletsCollection_tlp1 >::T_TPCnv()
-{ }
-
-void T_TPCnv<HIPixelTrackletsCollection, HIPixelTrackletsCollection_tlp1 >::persToTrans(const HIPixelTrackletsCollection_tlp1* pers, HIPixelTrackletsCollection* trans, MsgStream& msg) {
- setPStorage( const_cast<HIPixelTrackletsCollection_tlp1*> (pers));
- m_mainConverter.pstoreToTrans(0,trans,msg);
-}
diff --git a/Reconstruction/HeavyIonRec/HIRecTPCnv/src/HIRecTPCnv.cxx b/Reconstruction/HeavyIonRec/HIRecTPCnv/src/HIRecTPCnv.cxx
deleted file mode 100644
index 3b634016adb7fc3ac6174d542cb4a41778123af1..0000000000000000000000000000000000000000
--- a/Reconstruction/HeavyIonRec/HIRecTPCnv/src/HIRecTPCnv.cxx
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// generate the T/P converter entries
-#include "AthenaKernel/TPCnvFactory.h"
-
-#include "HIRecTPCnv/EtaPhiBins_p1.h"
-#include "HIRecTPCnv/EtaPhiBinsCnv_p1.h"
-#include "HIRecTPCnv/HIPixelTracklets_p1.h"
-#include "HIRecTPCnv/HIPixelTrackletsCnv_p1.h"
-
-
-// DECLARE_TPCNV_FACTORY(EtaPhiBinsCnv_p1,
-// EtaPhiBins,
-// EtaPhiBins_p1,
-// Athena::TPCnvVers::Current)
-
-// DECLARE_TPCNV_FACTORY(HIPixelTrackletsCnv_p1,
-// HIPixelTracklets,
-// HIPixelTracklets_p1,
-// Athena::TPCnvVers::Current)
diff --git a/Reconstruction/HeavyIonRec/HIRecTPCnv/src/HITRTInfoCnv_p1.cxx b/Reconstruction/HeavyIonRec/HIRecTPCnv/src/HITRTInfoCnv_p1.cxx
deleted file mode 100644
index 3a351febf276e07b5866b9943a7fae0e5ef4e75c..0000000000000000000000000000000000000000
--- a/Reconstruction/HeavyIonRec/HIRecTPCnv/src/HITRTInfoCnv_p1.cxx
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include "HIRecTPCnv/HITRTInfoCnv_p1.h"
-
-void HITRTInfoCnv_p1::persToTrans( const HITRTInfo_p1* pers,
- HITRTInfo* trans,
- MsgStream& msg )
-{
- if (msg.level() <= MSG::DEBUG)
- msg << MSG::DEBUG << "Loading HITRTInfo from persistent state.[start]" << endmsg;
- trans->m_OccupancyPerPart.reserve(pers->infos.size());
- for( unsigned int i(0); i<pers->infos.size(); ++i )
- trans->m_OccupancyPerPart.push_back( pers->infos[i] );
- if (msg.level() <= MSG::DEBUG)
- msg << MSG::DEBUG << "Loading HITRTInfo from persistent state.[end]" << endmsg;
- return;
-}
-
-void HITRTInfoCnv_p1::transToPers( const HITRTInfo* trans,
- HITRTInfo_p1* pers,
- MsgStream& msg )
-{
- if (msg.level() <= MSG::DEBUG)
- msg << MSG::DEBUG << "Creating persistent state of HITRTInfo.[start]" << endmsg;
- pers->infos.reserve(trans->m_OccupancyPerPart.size());
-
- for( unsigned int i(0); i<trans->m_OccupancyPerPart.size(); ++i )
- {
- pers->infos.push_back( trans->m_OccupancyPerPart[i] );
- if (msg.level() <= MSG::DEBUG)
- msg << MSG::DEBUG << "Creating persistent state of HITRTInfo.[" << i << "] : " << trans->m_OccupancyPerPart[i] << endmsg;
- }
- if (msg.level() <= MSG::DEBUG)
- msg << MSG::DEBUG << "Creating persistent state of HITRTInfo.[end]" << endmsg;
- return;
-}
diff --git a/Reconstruction/HeavyIonRec/HIRecTPCnv/src/HITRTInfo_p1.cxx b/Reconstruction/HeavyIonRec/HIRecTPCnv/src/HITRTInfo_p1.cxx
deleted file mode 100644
index e5d5ac26df76821db59b824277efce89edd5a6b6..0000000000000000000000000000000000000000
--- a/Reconstruction/HeavyIonRec/HIRecTPCnv/src/HITRTInfo_p1.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include "HIRecTPCnv/HITRTInfo_p1.h"