diff --git a/InnerDetector/InDetEventCnv/InDetEventTPCnv/InDetEventTPCnv/InDetPrepRawData/SiCluster_p1.h b/InnerDetector/InDetEventCnv/InDetEventTPCnv/InDetEventTPCnv/InDetPrepRawData/SiCluster_p1.h
index 6641829432d5e3157900630900d4c246eed5f190..c5e7b1d4d0f901c9cfe35ec2c8f6cac6a4b963a3 100644
--- a/InnerDetector/InDetEventCnv/InDetEventTPCnv/InDetEventTPCnv/InDetPrepRawData/SiCluster_p1.h
+++ b/InnerDetector/InDetEventCnv/InDetEventTPCnv/InDetEventTPCnv/InDetPrepRawData/SiCluster_p1.h
@@ -11,7 +11,6 @@
//
//-----------------------------------------------------------------------------
#include "AthenaPoolUtilities/TPObjRef.h"
-#include "TrkEventTPCnv/TrkEventPrimitives/HepPoint3D_p1.h"
namespace InDet
diff --git a/Reconstruction/HeavyIonRec/HIRecTPCnv/HIRecTPCnv/HIPixelTrackletsCollection_tlp1.h b/Reconstruction/HeavyIonRec/HIRecTPCnv/HIRecTPCnv/HIPixelTrackletsCollection_tlp1.h
index e3b9fee63f3ba9f2dd0b54c77e3ebf382e860ace..0cea08db6fa1fbef7299a046eb936f7c48f91bc2 100644
--- a/Reconstruction/HeavyIonRec/HIRecTPCnv/HIRecTPCnv/HIPixelTrackletsCollection_tlp1.h
+++ b/Reconstruction/HeavyIonRec/HIRecTPCnv/HIRecTPCnv/HIPixelTrackletsCollection_tlp1.h
@@ -4,25 +4,16 @@
#ifndef HIPIXELTRACKLETSCOLLECTION_TLP1_H
#define HIPIXELTRACKLETSCOLLECTION_TLP1_H
+
#include "HIRecTPCnv/HIPixelTrackletsCollection_p1.h"
#include "HIRecTPCnv/HIPixelTracklets_p1.h"
-#include "TrkEventTPCnv/TrkEventPrimitives/HepPoint3DCnv_p1.h"
-#include "InDetEventTPCnv/InDetPrepRawData/PixelClusterCnv_p1.h"
-#include "AthenaPoolUtilities/TPCnvTokenList_p1.h"
-
-#include <ios>
class HIPixelTrackletsCollection_tlp1 {
public:
HIPixelTrackletsCollection_tlp1(){}
- //
- TPCnvTokenList_p1 m_tokenList;
std::vector<HIPixelTrackletsCollection_p1> m_trackletsCollections;
std::vector<HIPixelTracklets_p1> m_tracklets;
- std::vector<HepPoint3DCnv_p1> m_hepPoint3Ds;
- std::vector<PixelClusterCnv_p1> m_pixelClusters;
-
};
#endif
diff --git a/Reconstruction/HeavyIonRec/HIRecTPCnv/src/HIPixelTrackletsCnv_p1.cxx b/Reconstruction/HeavyIonRec/HIRecTPCnv/src/HIPixelTrackletsCnv_p1.cxx
index a05cd69c2b97b02dd5e60afb201a07e885e76061..ca494080c0194c4e5b5e0a023cc07c3ef9342dc4 100644
--- a/Reconstruction/HeavyIonRec/HIRecTPCnv/src/HIPixelTrackletsCnv_p1.cxx
+++ b/Reconstruction/HeavyIonRec/HIRecTPCnv/src/HIPixelTrackletsCnv_p1.cxx
@@ -2,12 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#define private public
-#define protected public
#include "HIGlobal/HIPixelTracklets.h"
-#include "CLHEP/Geometry/Point3D.h"
-#undef private
-#undef protected
#include "HIRecTPCnv/HIPixelTrackletsCnv_p1.h"
@@ -17,33 +12,13 @@ void HIPixelTrackletsCnv_p1::persToTrans(const HIPixelTracklets_p1 *persObj, HIP
transObj->m_pt = persObj->m_pt;
transObj->m_etaS = persObj->m_etaS;
transObj->m_phiS = persObj->m_phiS;
- HepGeom::Point3D<double>* ptmp = createTransFromPStore(&m_hepPoint3DCnv,persObj->m_vrt, log);
- //transObj->m_vrt = *ptmp;
- delete ptmp;
- std::vector<PixelCluster*>* vtmp = m_clusterVectorCnv.createTransient(&persObj->m_clusters, log );
- //transObj->m_clusters.swap(*vtmp);
- delete vtmp;
}
void HIPixelTrackletsCnv_p1::transToPers(const HIPixelTracklets *transObj, HIPixelTracklets_p1 *persObj, MsgStream &log) {
- log << MSG::INFO << "HIPixelTrackletsCnv_p1:transToPers:starting." << endmsg;
+ log << MSG::DEBUG << "HIPixelTrackletsCnv_p1:transToPers:starting." << endmsg;
persObj->m_eta = transObj->m_eta;
- log << MSG::INFO << "eta value finished." << endmsg;
persObj->m_phi = transObj->m_phi;
persObj->m_pt = transObj->m_pt;
persObj->m_etaS = transObj->m_etaS;
persObj->m_phiS = transObj->m_phiS;
- log << MSG::INFO << "phiS value finished." << endmsg;
-
-
- //HepGeom::Point3D<double> pointx(transObj->m_vrt.x(),transObj->m_vrt.y(),transObj->m_vrt.z());
- //persObj->m_vrt = HepGeom::Point3D<double>(transObj->m_vrt.x(),transObj->m_vrt.y(),transObj->m_vrt.z());
- //m_hepPoint3DCnv->transToPers(&(transObj->m_vrt),&(persObj->m_vrt),log );
- //persObj->m_vrt = toPersistent(&m_hepPoint3DCnv,&(transObj->m_vrt),log);
- //log << MSG::INFO << "vrt: " << persObj->m_vrt.x() << endmsg;
-// log << MSG::INFO << "vertex value finished." << endmsg;
-// //log << MSG::INFO << "energy Loss: " << (transObj->m_clusters)[0]->energyLoss() << endmsg;
-// //log << MSG::INFO << "m_clusterVectorCnv: " << m_clusterVectorCnv << endmsg;
-// m_clusterVectorCnv.transToPers( &(transObj->m_clusters), &(persObj->m_clusters), log);
-// log << MSG::INFO << "HIPixelTrackletsCnv_p1:transToPers:ending." << endmsg;
}
diff --git a/Reconstruction/HeavyIonRec/HIRecTPCnv/src/HIPixelTrackletsCollectionCnv_tlp1.cxx b/Reconstruction/HeavyIonRec/HIRecTPCnv/src/HIPixelTrackletsCollectionCnv_tlp1.cxx
index aab65121be3f45801db9fcd25928db78f617dc1e..e89b9aea51c4129543b071455268ca2f4525aea1 100644
--- a/Reconstruction/HeavyIonRec/HIRecTPCnv/src/HIPixelTrackletsCollectionCnv_tlp1.cxx
+++ b/Reconstruction/HeavyIonRec/HIRecTPCnv/src/HIPixelTrackletsCollectionCnv_tlp1.cxx
@@ -8,25 +8,16 @@ HIPixelTrackletsCollectionCnv_tlp1::HIPixelTrackletsCollectionCnv_tlp1() {
addMainTPConverter();
addTPConverter( &m_hiPixelTrackletsCnv);
- addTPConverter( &m_hepPoint3DCnv);
- addTPConverter( &m_pixelClusterCnv);
}
void HIPixelTrackletsCollectionCnv_tlp1::setPStorage( HIPixelTrackletsCollection_tlp1 *storage) {
setMainCnvPStorage( &storage->m_trackletsCollections );
m_hiPixelTrackletsCnv.setPStorage(&storage->m_tracklets);
- //m_hepPoint3DCnv.setPStorage(&storage->m_hepPoint3Ds);
- //m_pixelClusterCnv.setPStorage(&storage->m_pixelClusters);
}
-// 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);
-// }
-T_TPCnv<HIPixelTrackletsCollection, HIPixelTrackletsCollection_tlp1 >::T_TPCnv() {
-
-}
+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));
diff --git a/Reconstruction/RecAthenaPool/src/MuonCaloEnergyContainerCnv.h b/Reconstruction/RecAthenaPool/src/MuonCaloEnergyContainerCnv.h
index f5d3ff40e774a0645f5c18efcc68624e19ae22dc..911ca717e3b7f458d49b626b8f6931a5c580bf17 100755
--- a/Reconstruction/RecAthenaPool/src/MuonCaloEnergyContainerCnv.h
+++ b/Reconstruction/RecAthenaPool/src/MuonCaloEnergyContainerCnv.h
@@ -9,7 +9,6 @@
#include "AthenaPoolCnvSvc/T_AthenaPoolCustomCnv.h"
// RecTPCnv includes
-// #include "RecTPCnv/MuonCaloEnergyContainer_tlp1.h"
#include "RecTPCnv/MuonCaloEnergyContainer_p1.h"
// muonEvent includes
@@ -17,7 +16,6 @@
// the latest persistent representation type of DataCollection:
typedef MuonCaloEnergyContainer_p1 MuonCaloEnergyContainer_PERS;
-//typedef MuonCaloEnergyContainer_tlp1 MuonCaloEnergyContainer_PERS;
class MuonCaloEnergyContainerCnv: public T_AthenaPoolCustomCnv< MuonCaloEnergyContainer, MuonCaloEnergyContainer_PERS > {
friend class CnvFactory<MuonCaloEnergyContainerCnv>;
diff --git a/Reconstruction/RecTPCnv/RecTPCnv/MuonCaloEnergyContainerCnv_tlp1.h b/Reconstruction/RecTPCnv/RecTPCnv/MuonCaloEnergyContainerCnv_tlp1.h
index 5f5ab84f8f68fdb9110e20a01108fc1e73e9baf2..f4032bcd8102d5b3c045238b33331442411a2fb6 100644
--- a/Reconstruction/RecTPCnv/RecTPCnv/MuonCaloEnergyContainerCnv_tlp1.h
+++ b/Reconstruction/RecTPCnv/RecTPCnv/MuonCaloEnergyContainerCnv_tlp1.h
@@ -18,8 +18,6 @@
#include "RecTPCnv/CaloEnergyCnv_p2.h"
-#include <iostream>
-
class MuonCaloEnergyContainerCnv_tlp1:
public AthenaPoolTopLevelTPConverter<MuonCaloEnergyContainerCnv_p1, MuonCaloEnergyContainer_tlp1>
{
diff --git a/Tracking/TrkEventCnv/TrkEventTPCnv/CMakeLists.txt b/Tracking/TrkEventCnv/TrkEventTPCnv/CMakeLists.txt
index 90fdb2f39cb51da597241c8db269707d3a181de6..95b60f570221888b6931519354ada09882881b76 100644
--- a/Tracking/TrkEventCnv/TrkEventTPCnv/CMakeLists.txt
+++ b/Tracking/TrkEventCnv/TrkEventTPCnv/CMakeLists.txt
@@ -47,7 +47,8 @@ atlas_depends_on_subdirs(
Control/AthenaKernel
Control/CxxUtils
Tracking/TrkDetDescr/TrkDetDescrUtils
- Tracking/TrkEvent/TrkTrackLink )
+ Tracking/TrkEvent/TrkTrackLink
+ )
# External dependencies:
find_package( CLHEP )
@@ -111,7 +112,7 @@ atlas_add_dictionary( TrkEventTPCnvDict
LINK_LIBRARIES TrkEventTPCnv )
atlas_add_dictionary( OLD_TrkEventTPCnvDict
- TrkEventTPCnv/TrkEventTPCnvDict.h TrkEventTPCnv/OLD_selection.xml
+ TrkEventTPCnv/TrkEventTPCnvOLDDict.h TrkEventTPCnv/OLD_selection.xml
LINK_LIBRARIES TrkEventTPCnv )
# Add all the test(s) of the package:
diff --git a/Tracking/TrkEventCnv/TrkEventTPCnv/TrkEventTPCnv/OLD_selection.xml b/Tracking/TrkEventCnv/TrkEventTPCnv/TrkEventTPCnv/OLD_selection.xml
index e93e1d627d2121ac586bb08fc9f0e1feb146d042..febc58842301d3c613a6041f826c0297827828fa 100644
--- a/Tracking/TrkEventCnv/TrkEventTPCnv/TrkEventTPCnv/OLD_selection.xml
+++ b/Tracking/TrkEventCnv/TrkEventTPCnv/TrkEventTPCnv/OLD_selection.xml
@@ -1,8 +1,11 @@
<lcgdict>
<!-- all the ARA converters and Athena persistent classes that are not WRITTEN by default should be moved here. -->
- <!-- The following should not be here! -->
- <class name="HepPoint3D_p1" />
+
+<!-- TrkV0Vertex top level collection -->
+ <class name="Trk::V0Container_tlp1" id="402A9BD1-4476-4E97-A5E4-EB4D742FBB38" />
+<!-- Vertex top level collection -->
+ <class name="Trk::VxContainer_tlp1" id="AFA5FE76-EEC6-4BD1-B704-B5747F729291" />
<!-- Track top level collection -->
<class name="Trk::TrackCollection_tlp1" id="ECB12567-B999-4908-B0C6-C43CF9F9A987" />
@@ -37,6 +40,9 @@
<class name="std::vector<Trk::Perigee_p1>" />
<class name="Trk::Perigee_p2" />
<class name="std::vector<Trk::Perigee_p2>" />
+
+ <class name="Trk::MaterialEffectsOnTrack_p1" />
+ <class name="std::vector<Trk::MaterialEffectsOnTrack_p1>" />
<class name="Trk::RecVertex_p1" />
<class name="std::vector<Trk::RecVertex_p1>" />
diff --git a/Tracking/TrkEventCnv/TrkEventTPCnv/TrkEventTPCnv/SegmentCollectionCnv_tlp1.h b/Tracking/TrkEventCnv/TrkEventTPCnv/TrkEventTPCnv/SegmentCollectionCnv_tlp1.h
index 6d5c588a976c4ad8296c3ad0925988e07f1a5f14..25a44733873058b2a0b8b18444da104e4ae986d0 100644
--- a/Tracking/TrkEventCnv/TrkEventTPCnv/TrkEventTPCnv/SegmentCollectionCnv_tlp1.h
+++ b/Tracking/TrkEventCnv/TrkEventTPCnv/TrkEventTPCnv/SegmentCollectionCnv_tlp1.h
@@ -35,7 +35,6 @@
#include "TrkEventTPCnv/TrkEventPrimitives/ErrorMatrixCnv_p1.h"
#include "TrkEventTPCnv/TrkEventPrimitives/CovarianceMatrixCnv_p1.h"
#include "TrkEventTPCnv/TrkEventPrimitives/LocalParametersCnv_p1.h"
-#include "TrkEventTPCnv/TrkEventPrimitives/HepPoint3DCnv_p1.h"
#include "TrkEventTPCnv/TrkRIO_OnTrack/RIO_OnTrackCnv_p1.h"
#include "TrkEventTPCnv/TrkPseudoMeasurementOnTrack/PseudoMeasurementOnTrackCnv_p1.h"
diff --git a/Tracking/TrkEventCnv/TrkEventTPCnv/TrkEventTPCnv/SegmentCollectionCnv_tlp2.h b/Tracking/TrkEventCnv/TrkEventTPCnv/TrkEventTPCnv/SegmentCollectionCnv_tlp2.h
index f5e2263aa237cf758c261be1439ab4697eefa5e3..7e6fe8e3dd8a5201d5b9e77b769fe8c08bc31aa5 100644
--- a/Tracking/TrkEventCnv/TrkEventTPCnv/TrkEventTPCnv/SegmentCollectionCnv_tlp2.h
+++ b/Tracking/TrkEventCnv/TrkEventTPCnv/TrkEventTPCnv/SegmentCollectionCnv_tlp2.h
@@ -29,15 +29,12 @@
#include "TrkEventTPCnv/TrkEventPrimitives/ErrorMatrixCnv_p1.h"
#include "TrkEventTPCnv/TrkEventPrimitives/CovarianceMatrixCnv_p1.h"
#include "TrkEventTPCnv/TrkEventPrimitives/LocalParametersCnv_p1.h"
-#include "TrkEventTPCnv/TrkEventPrimitives/HepPoint3DCnv_p1.h"
-// #include "TrkEventTPCnv/TrkRIO_OnTrack/RIO_OnTrackCnv_p2.h"
#include "TrkEventTPCnv/TrkPseudoMeasurementOnTrack/PseudoMeasurementOnTrackCnv_p1.h"
#include "TrkEventTPCnv/TrkCompetingRIOsOnTrack/CompetingRIOsOnTrackCnv_p1.h"
#include "TrkEventTPCnv/TrkDetElementSurface/DetElementSurfaceCnv_p1.h"
-#include <iostream>
class SegmentCollectionCnv_tlp2
: public AthenaPoolTopLevelTPConverter< SegmentCollectionCnv_p1, Trk::SegmentCollection_tlp2 >
@@ -80,8 +77,6 @@ protected:
ErrorMatrixCnv_p1 m_errorMatricesCnv;
LocalParametersCnv_p1 m_localParametersCnv;
- //trial and error for the datavector ...
- // RIO_OnTrackCnv_p2 m_RIOsCnv;
PseudoMeasurementOnTrackCnv_p1 m_pseudoMeasurementOnTrackCnv;
CompetingRIOsOnTrackCnv_p1 m_crotCnv;
diff --git a/Tracking/TrkEventCnv/TrkEventTPCnv/TrkEventTPCnv/SegmentCollection_tlp2.h b/Tracking/TrkEventCnv/TrkEventTPCnv/TrkEventTPCnv/SegmentCollection_tlp2.h
index b88bc91d390b29ecbf859c2348da85ddc51a7db0..65b3ab87b084986f3568ca5a21d6083999fcac1e 100644
--- a/Tracking/TrkEventCnv/TrkEventTPCnv/TrkEventTPCnv/SegmentCollection_tlp2.h
+++ b/Tracking/TrkEventCnv/TrkEventTPCnv/TrkEventTPCnv/SegmentCollection_tlp2.h
@@ -77,7 +77,6 @@ namespace Trk
std::vector< Trk::LocalParameters_p1 > m_localParameters;
std::vector< Trk::HepSymMatrix_p1 > m_hepSymMatrices;
- // std::vector< Trk::RIO_OnTrack_p2 > m_RIO_OnTrack;
std::vector< Trk::PseudoMeasurementOnTrack_p1 > m_pseudoMeasurementOnTrack;
std::vector< Trk::CompetingRIOsOnTrack_p1 > m_competingRotsOnTrack;
diff --git a/Tracking/TrkEventCnv/TrkEventTPCnv/TrkEventTPCnv/TrackCollectionCnv_tlp1.h b/Tracking/TrkEventCnv/TrkEventTPCnv/TrkEventTPCnv/TrackCollectionCnv_tlp1.h
index 94d352eb7dc4e62e983749e47adde4d329396d02..9242d33429cd12a94c680d406452f71eab0bd8ba 100644
--- a/Tracking/TrkEventCnv/TrkEventTPCnv/TrkEventTPCnv/TrackCollectionCnv_tlp1.h
+++ b/Tracking/TrkEventCnv/TrkEventTPCnv/TrkEventTPCnv/TrackCollectionCnv_tlp1.h
@@ -48,9 +48,6 @@
#include "TrkEventTPCnv/TrkEventPrimitives/LocalPositionCnv_p1.h"
#include "TrkEventTPCnv/TrkEventPrimitives/LocalParametersCnv_p1.h"
-#include "TrkEventTPCnv/TrkEventPrimitives/HepPoint3DCnv_p1.h"
-
-#include <iostream>
class TrackCollectionCnv_tlp1
: public AthenaPoolTopLevelTPConverter< TrackCollectionCnv_p1, Trk::TrackCollection_tlp1 >
@@ -110,8 +107,6 @@ protected:
LocalPositionCnv_p1 m_localPositionsCnv;
LocalParametersCnv_p1 m_localParametersCnv;
- HepPoint3DCnv_p1 m_pointsCnv;
-
CompetingRIOsOnTrackCnv_p1 m_crotCnv;
};
diff --git a/Tracking/TrkEventCnv/TrkEventTPCnv/TrkEventTPCnv/TrackCollectionCnv_tlp2.h b/Tracking/TrkEventCnv/TrkEventTPCnv/TrkEventTPCnv/TrackCollectionCnv_tlp2.h
index 450e0578af5aa89ff5afca3debb23daed0df9e92..fae3aaf7f1bcce9eb5c3d4ed9cc87a30c5ed6a3b 100644
--- a/Tracking/TrkEventCnv/TrkEventTPCnv/TrkEventTPCnv/TrackCollectionCnv_tlp2.h
+++ b/Tracking/TrkEventCnv/TrkEventTPCnv/TrkEventTPCnv/TrackCollectionCnv_tlp2.h
@@ -52,9 +52,6 @@
#include "TrkEventTPCnv/TrkEventPrimitives/LocalPositionCnv_p1.h"
#include "TrkEventTPCnv/TrkEventPrimitives/LocalParametersCnv_p1.h"
-#include "TrkEventTPCnv/TrkEventPrimitives/HepPoint3DCnv_p1.h"
-
-#include <iostream>
class TrackCollectionCnv_tlp2
: public AthenaPoolTopLevelTPConverter< TrackCollectionCnv_p2, Trk::TrackCollection_tlp2 >
@@ -118,8 +115,6 @@ protected:
LocalDirectionCnv_p1 m_localDirectionsCnv;
LocalPositionCnv_p1 m_localPositionsCnv;
LocalParametersCnv_p1 m_localParametersCnv;
-
- HepPoint3DCnv_p1 m_pointsCnv;
};
#endif
diff --git a/Tracking/TrkEventCnv/TrkEventTPCnv/TrkEventTPCnv/TrackCollectionCnv_tlp3.h b/Tracking/TrkEventCnv/TrkEventTPCnv/TrkEventTPCnv/TrackCollectionCnv_tlp3.h
index 2927c8d8f705fd34d141ac9ce767f9ec86637c93..5d5b96039dbdae49ecef4a3b09c548dc42485de0 100644
--- a/Tracking/TrkEventCnv/TrkEventTPCnv/TrkEventTPCnv/TrackCollectionCnv_tlp3.h
+++ b/Tracking/TrkEventCnv/TrkEventTPCnv/TrkEventTPCnv/TrackCollectionCnv_tlp3.h
@@ -55,10 +55,6 @@
#include "TrkEventTPCnv/TrkEventPrimitives/LocalPositionCnv_p1.h"
#include "TrkEventTPCnv/TrkEventPrimitives/LocalParametersCnv_p1.h"
-#include "TrkEventTPCnv/TrkEventPrimitives/HepPoint3DCnv_p1.h"
-
-#include <iostream>
-
class TrackCollectionCnv_tlp3
: public AthenaPoolTopLevelTPConverter< TrackCollectionCnv_p3, Trk::TrackCollection_tlp3 >
@@ -127,7 +123,6 @@ protected:
LocalPositionCnv_p1 m_localPositionsCnv;
LocalParametersCnv_p1 m_localParametersCnv;
- HepPoint3DCnv_p1 m_pointsCnv;
TrackInfoCnv_p1 m_trackInfosCnv;
};
#endif
diff --git a/Tracking/TrkEventCnv/TrkEventTPCnv/TrkEventTPCnv/TrackCollectionCnv_tlp4.h b/Tracking/TrkEventCnv/TrkEventTPCnv/TrkEventTPCnv/TrackCollectionCnv_tlp4.h
index b9b3977658a71ee69f9119f6428a6a0e208d663b..52396c4d2bb8b1833ee8977f02c254b40e173743 100644
--- a/Tracking/TrkEventCnv/TrkEventTPCnv/TrkEventTPCnv/TrackCollectionCnv_tlp4.h
+++ b/Tracking/TrkEventCnv/TrkEventTPCnv/TrkEventTPCnv/TrackCollectionCnv_tlp4.h
@@ -49,12 +49,8 @@
#include "TrkEventTPCnv/TrkEventPrimitives/LocalPositionCnv_p1.h"
#include "TrkEventTPCnv/TrkEventPrimitives/LocalParametersCnv_p1.h"
-#include "TrkEventTPCnv/TrkEventPrimitives/HepPoint3DCnv_p1.h"
-
#include "TrkEventTPCnv/TrkTrackSummary/TrackSummaryCnv_p2.h"
-#include <iostream>
-
class TrackCollectionCnv_tlp4
: public AthenaPoolTopLevelTPConverter< TrackCollectionCnv_p3, Trk::TrackCollection_tlp4 >
@@ -122,7 +118,6 @@ protected:
LocalPositionCnv_p1 m_localPositionsCnv;
LocalParametersCnv_p1 m_localParametersCnv;
- HepPoint3DCnv_p1 m_pointsCnv;
TrackInfoCnv_p1 m_trackInfosCnv;
TrackSummaryCnv_p2 m_trackSummaryCnv;
diff --git a/Tracking/TrkEventCnv/TrkEventTPCnv/TrkEventTPCnv/TrackCollection_tlp1.h b/Tracking/TrkEventCnv/TrkEventTPCnv/TrkEventTPCnv/TrackCollection_tlp1.h
index 9e536a21d4cedf3dc8f075cb68e69a69870418ed..4d39253e2a4d20f1227759a57d0548ac1ea5c74d 100644
--- a/Tracking/TrkEventCnv/TrkEventTPCnv/TrkEventTPCnv/TrackCollection_tlp1.h
+++ b/Tracking/TrkEventCnv/TrkEventTPCnv/TrkEventTPCnv/TrackCollection_tlp1.h
@@ -63,14 +63,8 @@
#include "TrkEventTPCnv/TrkPseudoMeasurementOnTrack/PseudoMeasurementOnTrack_p1.h"
#include "TrkEventTPCnv/TrkCompetingRIOsOnTrack/CompetingRIOsOnTrack_p1.h"
-//-----------------------------------------------------------------------------
-// TrkPrepRawData
-//-----------------------------------------------------------------------------
-// #include "TrkEventTPCnv/TrkPrepRawData/PrepRawData_p1.h"
-
#include "AthenaPoolUtilities/TPCnvTokenList_p1.h"
-//#include "TrkEventTPCnv/TrkEventPrimitives/HepPoint3D_p1.h"
namespace Trk
{
@@ -111,9 +105,6 @@ namespace Trk
std::vector< Trk::LocalDirection_p1 > m_localDirections;
std::vector< Trk::LocalPosition_p1 > m_localPositions;
std::vector< Trk::LocalParameters_p1 > m_localParameters;
-
- //std::vector< HepPoint3D_p1 > m_points;
-
};
}
diff --git a/Tracking/TrkEventCnv/TrkEventTPCnv/TrkEventTPCnv/TrkEventPrimitives/HepPoint3DCnv_p1.h b/Tracking/TrkEventCnv/TrkEventTPCnv/TrkEventTPCnv/TrkEventPrimitives/HepPoint3DCnv_p1.h
deleted file mode 100644
index 650efdeecb501fa20ab8d9cb18e790e2f1868556..0000000000000000000000000000000000000000
--- a/Tracking/TrkEventCnv/TrkEventTPCnv/TrkEventTPCnv/TrkEventPrimitives/HepPoint3DCnv_p1.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef HepPoint3D_Cnv_P1_H
-#define HepPoint3D_Cnv_P1_H
-
-//-----------------------------------------------------------------------------
-//
-// file: HepPoint3DCnv_p1.h
-//
-//-----------------------------------------------------------------------------
-
-#include "AthenaPoolCnvSvc/T_AthenaPoolTPConverter.h"
-
-#include "CLHEP/Geometry/Point3D.h"
-#include "TrkEventTPCnv/TrkEventPrimitives/HepPoint3D_p1.h"
-
-class MsgStream;
-
-class HepPoint3DCnv_p1
- : public T_AthenaPoolTPCnvBase< HepGeom::Point3D<double>, HepPoint3D_p1 >
-{
-public:
- HepPoint3DCnv_p1() {}
-
- virtual void persToTrans( const HepPoint3D_p1 *persObj, HepGeom::Point3D<double> *transObj, MsgStream &log );
- virtual void transToPers( const HepGeom::Point3D<double> *transObj, HepPoint3D_p1 *persObj, MsgStream &log );
-};
-
-
-inline
-void
-HepPoint3DCnv_p1::persToTrans( const HepPoint3D_p1 *persObj, HepGeom::Point3D<double> *transObj, MsgStream &) {
- transObj->setX( persObj->m_x );
- transObj->setY( persObj->m_y );
- transObj->setZ( persObj->m_z );
-}
-
-inline
-void
-HepPoint3DCnv_p1::transToPers( const HepGeom::Point3D<double> *transObj, HepPoint3D_p1 *persObj, MsgStream & ) {
- persObj->m_x = transObj->x();
- persObj->m_y = transObj->y();
- persObj->m_z = transObj->z();
-}
-
-#endif
-
diff --git a/Tracking/TrkEventCnv/TrkEventTPCnv/TrkEventTPCnv/TrkEventPrimitives/HepPoint3D_p1.h b/Tracking/TrkEventCnv/TrkEventTPCnv/TrkEventTPCnv/TrkEventPrimitives/HepPoint3D_p1.h
deleted file mode 100644
index 132b9cbcb7da432e461b919564d1e26380dd25a9..0000000000000000000000000000000000000000
--- a/Tracking/TrkEventCnv/TrkEventTPCnv/TrkEventTPCnv/TrkEventPrimitives/HepPoint3D_p1.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef HepPoint3D_P1_H
-#define HepPoint3D_P1_H
-
-class HepPoint3D_p1
-{
-public:
- HepPoint3D_p1() : m_x(0.0), m_y(0.0), m_z(0.0){}
-
- #ifdef UseFloatsIn_HepPoint3D
- float m_x, m_y, m_z;
- #else
- double m_x, m_y, m_z;
- #endif
-};
-
-#endif
-
diff --git a/Tracking/TrkEventCnv/TrkEventTPCnv/TrkEventTPCnv/TrkEventTPCnvDict.h b/Tracking/TrkEventCnv/TrkEventTPCnv/TrkEventTPCnv/TrkEventTPCnvDict.h
index d12306a34bef3b040b2c043652f0e99d055c57af..d73f60f2523f679068eda00bd43f18fb3e20d418 100644
--- a/Tracking/TrkEventCnv/TrkEventTPCnv/TrkEventTPCnv/TrkEventTPCnvDict.h
+++ b/Tracking/TrkEventCnv/TrkEventTPCnv/TrkEventTPCnv/TrkEventTPCnvDict.h
@@ -6,28 +6,17 @@
#define TRKEVENTTPCNV_TRKEVENTTPCNVDICT_H
-#include "TrkEventTPCnv/TrackCollection_tlp1.h"
-#include "TrkEventTPCnv/TrackCollection_tlp2.h"
-#include "TrkEventTPCnv/TrackCollection_tlp3.h"
-#include "TrkEventTPCnv/TrackCollection_tlp4.h"
#include "TrkEventTPCnv/TrackCollection_tlp5.h"
-#include "TrkEventTPCnv/VxContainer_tlp1.h"
#include "TrkEventTPCnv/VxContainer_tlp2.h"
#include "TrkEventTPCnv/MVFVxContainer_tlp1.h"
-#include "TrkEventTPCnv/V0Container_tlp1.h"
#include "TrkEventTPCnv/V0Container_tlp2.h"
#include "TrkEventTPCnv/SegmentCollection_tlp3.h"
-#include "TrkEventTPCnv/SegmentCollection_tlp2.h"
-#include "TrkEventTPCnv/SegmentCollection_tlp1.h"
//-----------------------------------------------------------------------------
// TrkTrack
//-----------------------------------------------------------------------------
#include "TrkEventTPCnv/TrkTrack/TrackCollection_p1.h"
-#include "TrkEventTPCnv/TrkTrack/Track_p1.h"
-#include "TrkEventTPCnv/TrkTrack/Track_p12.h"
#include "TrkEventTPCnv/TrkTrack/TrackStateOnSurface_p1.h"
-#include "TrkEventTPCnv/TrkTrack/Track_p2.h"
#include "TrkEventTPCnv/TrkTrack/Track_p4.h"
#include "TrkEventTPCnv/TrkTrack/TrackInfo_p1.h"
@@ -42,7 +31,6 @@
//-----------------------------------------------------------------------------
#include "TrkEventTPCnv/TrkTrackSummary/TrackSummary_p1.h"
#include "TrkEventTPCnv/TrkTrackSummary/InDetTrackSummary_p1.h"
-#include "TrkEventTPCnv/TrkTrackSummary/MuonTrackSummary_p1.h"
#include "TrkEventTPCnv/TrkTrackSummary/MuonTrackSummary_p2.h"
#include "TrkEventTPCnv/TrkTrackSummary/TrackSummary_p2.h"
@@ -58,7 +46,6 @@
// TrkMaterialOnTrack
//-----------------------------------------------------------------------------
#include "TrkEventTPCnv/TrkMaterialOnTrack/ScatteringAngleOnTrack_p1.h"
-#include "TrkEventTPCnv/TrkMaterialOnTrack/MaterialEffectsOnTrack_p1.h"
#include "TrkEventTPCnv/TrkMaterialOnTrack/MaterialEffectsBase_p1.h"
#include "TrkEventTPCnv/TrkMaterialOnTrack/MaterialEffectsOnTrack_p2.h"
#include "TrkEventTPCnv/TrkMaterialOnTrack/EnergyLoss_p1.h"
@@ -76,7 +63,6 @@
//-----------------------------------------------------------------------------
// TrkSurfaces
//-----------------------------------------------------------------------------
-#include "TrkEventTPCnv/TrkSurfaces/Surface_p1.h"
#include "TrkEventTPCnv/TrkSurfaces/Surface_p2.h"
#include "TrkEventTPCnv/TrkSurfaces/BoundSurface_p1.h"
@@ -92,17 +78,14 @@
// TrkParameters (also used by TrackNeutralParameters)
//-----------------------------------------------------------------------------
#include "TrkEventTPCnv/TrkParameters/TrackParameters_p2.h"
-#include "TrkEventTPCnv/TrkParameters/TrackParameters_p1.h"
#include "TrkEventTPCnv/TrkParameters/AtaSurface_p1.h"
#include "TrkEventTPCnv/TrkParameters/MeasuredAtaSurface_p1.h"
-// #include "TrkEventTPCnv/TrkParameters/Perigee_p1.h"
#include "TrkEventTPCnv/TrkParameters/Perigee_p2.h"
#include "TrkEventTPCnv/TrkParameters/MeasuredPerigee_p1.h"
//-----------------------------------------------------------------------------
// TrkRIO_OnTrack
//-----------------------------------------------------------------------------
-#include "TrkEventTPCnv/TrkRIO_OnTrack/RIO_OnTrack_p1.h"
#include "TrkEventTPCnv/TrkRIO_OnTrack/RIO_OnTrack_p2.h"
//-----------------------------------------------------------------------------
@@ -110,22 +93,16 @@
//-----------------------------------------------------------------------------
#include "TrkEventTPCnv/TrkCompetingRIOsOnTrack/CompetingRIOsOnTrack_p1.h"
-
//-----------------------------------------------------------------------------
// TrkPrepRawData
//-----------------------------------------------------------------------------
#include "TrkEventTPCnv/TrkPrepRawData/PrepRawData_p1.h"
-
-#include "TrkEventTPCnv/TrkEventPrimitives/HepPoint3D_p1.h"
-
//-----------------------------------------------------------------------------
// VxVertex
//-----------------------------------------------------------------------------
#include "TrkEventTPCnv/VxVertex/Vertex_p1.h"
-#include "TrkEventTPCnv/VxVertex/RecVertex_p1.h"
#include "TrkEventTPCnv/VxVertex/RecVertex_p2.h"
-#include "TrkEventTPCnv/VxVertex/VxTrackAtVertex_p1.h"
#include "TrkEventTPCnv/VxVertex/VxTrackAtVertex_p2.h"
#include "TrkEventTPCnv/VxVertex/VxCandidate_p1.h"
#include "TrkEventTPCnv/VxVertex/ExtendedVxCandidate_p1.h"
@@ -150,89 +127,5 @@
//-----------------------------------------------------------------------------
#include "TrkEventTPCnv/TrkParticleBase/TrackParticleBase_p1.h"
-//namespace TrackEventTPCnvDict
-
-struct TrackEventTPCnvDict
-{
- std::vector< Trk::TrackCollection_p1 > m_v1;
- std::vector< Trk::Track_p1 > m_v2;
- std::vector< Trk::Track_p12 > m_v2AB;
- std::vector< Trk::Track_p2 > m_v2b;
- std::vector< Trk::TrackInfo_p1 > m_v2c;
- std::vector< Trk::ScatteringAngleOnTrack_p1 > m_v3;
- std::vector< Trk::TrackStateOnSurface_p1 > m_v4;
-
- std::vector< Trk::RIO_OnTrack_p1 > m_v5;
- std::vector< Trk::RIO_OnTrack_p2 > m_v51;
- std::vector< Trk::PrepRawData_p1 > m_v6;
-
- std::vector< Trk::TrackParameters_p1 > m_v7;
- std::vector< Trk::TrackParameters_p2 > m_v7a;
- std::vector< Trk::AtaSurface_p1 > m_v8;
- std::vector< Trk::MeasuredAtaSurface_p1 > m_v9;
- std::vector< Trk::Perigee_p1 > m_v10;
- std::vector< Trk::Perigee_p2 > m_v10A;
- std::vector< Trk::MeasuredPerigee_p1 > m_v11;
-
- std::vector< Trk::BoundSurface_p1 > m_v12;
- std::vector< Trk::Surface_p1 > m_v13;
- std::vector< Trk::Surface_p1 > m_v13a;
- std::vector< Trk::CylinderBounds_p1 > m_v14;
- std::vector< Trk::DiamondBounds_p1 > m_v15;
- std::vector< Trk::DiscBounds_p1 > m_v16;
- std::vector< Trk::RectangleBounds_p1 > m_v17;
- std::vector< Trk::TrapezoidBounds_p1 > m_v18;
- std::vector< Trk::RotatedTrapezoidBounds_p1 > m_v18b;
- std::vector< Trk::TriangleBounds_p1 > m_v18c;
- std::vector< Trk::EllipseBounds_p1 > m_v18d;
-
- std::vector< Trk::FitQuality_p1 > m_v19;
- std::vector< Trk::HepSymMatrix_p1 > m_v20;
- std::vector< Trk::MaterialEffectsOnTrack_p1 > m_v21;
- std::vector< Trk::LocalDirection_p1 > m_v22;
- std::vector< Trk::LocalPosition_p1 > m_v23;
- std::vector< Trk::LocalParameters_p1 > m_v24;
-
- std::vector< Trk::Vertex_p1 > m_v25;
- std::vector< Trk::RecVertex_p1 > m_v26;
- std::vector< Trk::RecVertex_p2 > m_v26a;
- std::vector< Trk::VxTrackAtVertex_p1 > m_v27;
- std::vector< Trk::VxTrackAtVertex_p2 > m_v27a;
- std::vector< Trk::VxCandidate_p1 > m_v28;
- std::vector< Trk::ExtendedVxCandidate_p1 > m_v29;
- std::vector< Trk::VxContainer_p1 > m_v30;
-
- std::vector< Trk::MVFVxTrackAtVertex_p1 > m_v31;
- std::vector< Trk::MVFVxCandidate_p1 > m_v32;
- std::vector< Trk::MVFVxContainer_p1 > m_v33;
-
- std::vector< Trk::Segment_p1> m_v34;
- std::vector< Trk::TrackSegment_p1> m_v35;
- std::vector< Trk::SegmentCollection_p1> m_v36;
-
- std::vector< Trk::V0Hypothesis_p1 > m_v37;
- std::vector< Trk::V0Candidate_p1 > m_v38;
- std::vector< Trk::V0Container_p1 > m_v39;
-
- std::vector< Trk::PseudoMeasurementOnTrack_p1 > m_v40;
- std::vector< Trk::PseudoMeasurementOnTrack_p2 > m_v40a;
-
- std::vector< Trk::TrackSummary_p1 > m_v41;
- std::vector< Trk::TrackSummary_p2 > m_v41ilija;
- std::vector< Trk::InDetTrackSummary_p1 > m_v41b;
- std::vector< Trk::MuonTrackSummary_p1 > m_v41a;
- std::vector< Trk::MuonTrackSummary_p2 > m_v41c;
-
- std::vector< Trk::TrackParticleBase_p1 > m_v42;
-
- std::vector< Trk::CompetingRIOsOnTrack_p1 > m_v44;
- std::vector< Trk::TrackStateOnSurface_p2 > m_v45;
- std::vector< Trk::MaterialEffectsOnTrack_p2 > m_v46;
- std::vector< Trk::MaterialEffectsBase_p1 > m_v47;
- std::vector< Trk::EnergyLoss_p1 > m_v48;
- std::vector< Trk::EstimatedBremOnTrack_p1 > m_v49;
- std::vector< Trk::VertexOnTrack_p1 > m_v50;
- std::vector< Trk::Track_p4 > m_v52;
-};
#endif // TRKEVENTTPCNV_H
diff --git a/Tracking/TrkEventCnv/TrkEventTPCnv/TrkEventTPCnv/TrkEventTPCnvOLDDict.h b/Tracking/TrkEventCnv/TrkEventTPCnv/TrkEventTPCnv/TrkEventTPCnvOLDDict.h
new file mode 100644
index 0000000000000000000000000000000000000000..516b296e00dc522ec42a82fb8ca5aff2873ef203
--- /dev/null
+++ b/Tracking/TrkEventCnv/TrkEventTPCnv/TrkEventTPCnv/TrkEventTPCnvOLDDict.h
@@ -0,0 +1,149 @@
+/*
+ Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef TRKEVENTTPCNV_TRKEVENTTPCNV_OLDDICT_H
+#define TRKEVENTTPCNV_TRKEVENTTPCNV_OLDDICT_H
+
+
+#include "TrkEventTPCnv/TrackCollection_tlp1.h"
+#include "TrkEventTPCnv/TrackCollection_tlp2.h"
+#include "TrkEventTPCnv/TrackCollection_tlp3.h"
+#include "TrkEventTPCnv/TrackCollection_tlp4.h"
+#include "TrkEventTPCnv/TrackCollection_tlp5.h"
+#include "TrkEventTPCnv/VxContainer_tlp1.h"
+#include "TrkEventTPCnv/VxContainer_tlp2.h"
+#include "TrkEventTPCnv/MVFVxContainer_tlp1.h"
+#include "TrkEventTPCnv/V0Container_tlp1.h"
+#include "TrkEventTPCnv/V0Container_tlp2.h"
+#include "TrkEventTPCnv/SegmentCollection_tlp3.h"
+#include "TrkEventTPCnv/SegmentCollection_tlp2.h"
+#include "TrkEventTPCnv/SegmentCollection_tlp1.h"
+
+//-----------------------------------------------------------------------------
+// TrkTrack
+//-----------------------------------------------------------------------------
+#include "TrkEventTPCnv/TrkTrack/TrackCollection_p1.h"
+#include "TrkEventTPCnv/TrkTrack/Track_p1.h"
+#include "TrkEventTPCnv/TrkTrack/Track_p12.h"
+#include "TrkEventTPCnv/TrkTrack/TrackStateOnSurface_p1.h"
+#include "TrkEventTPCnv/TrkTrack/Track_p2.h"
+#include "TrkEventTPCnv/TrkTrack/Track_p4.h"
+#include "TrkEventTPCnv/TrkTrack/TrackInfo_p1.h"
+
+//-----------------------------------------------------------------------------
+// TrkPseudoMeasurementOnTrack
+//-----------------------------------------------------------------------------
+#include "TrkEventTPCnv/TrkPseudoMeasurementOnTrack/PseudoMeasurementOnTrack_p1.h"
+#include "TrkEventTPCnv/TrkVertexOnTrack/VertexOnTrack_p1.h"
+
+//-----------------------------------------------------------------------------
+// TrkTrackSummary
+//-----------------------------------------------------------------------------
+#include "TrkEventTPCnv/TrkTrackSummary/TrackSummary_p1.h"
+#include "TrkEventTPCnv/TrkTrackSummary/InDetTrackSummary_p1.h"
+#include "TrkEventTPCnv/TrkTrackSummary/MuonTrackSummary_p1.h"
+#include "TrkEventTPCnv/TrkTrackSummary/MuonTrackSummary_p2.h"
+
+#include "TrkEventTPCnv/TrkTrackSummary/TrackSummary_p2.h"
+
+//-----------------------------------------------------------------------------
+// TrkSegment
+//-----------------------------------------------------------------------------
+#include "TrkEventTPCnv/TrkSegment/SegmentCollection_p1.h"
+#include "TrkEventTPCnv/TrkSegment/Segment_p1.h"
+#include "TrkEventTPCnv/TrkSegment/TrackSegment_p1.h"
+
+//-----------------------------------------------------------------------------
+// TrkMaterialOnTrack
+//-----------------------------------------------------------------------------
+#include "TrkEventTPCnv/TrkMaterialOnTrack/ScatteringAngleOnTrack_p1.h"
+#include "TrkEventTPCnv/TrkMaterialOnTrack/MaterialEffectsOnTrack_p1.h"
+#include "TrkEventTPCnv/TrkMaterialOnTrack/MaterialEffectsBase_p1.h"
+#include "TrkEventTPCnv/TrkMaterialOnTrack/MaterialEffectsOnTrack_p2.h"
+#include "TrkEventTPCnv/TrkMaterialOnTrack/EnergyLoss_p1.h"
+#include "TrkEventTPCnv/TrkMaterialOnTrack/EstimatedBremOnTrack_p1.h"
+
+//-----------------------------------------------------------------------------
+// TrkEventPrimitives
+//-----------------------------------------------------------------------------
+#include "TrkEventTPCnv/TrkEventPrimitives/FitQuality_p1.h"
+#include "TrkEventTPCnv/TrkEventPrimitives/LocalPosition_p1.h"
+#include "TrkEventTPCnv/TrkEventPrimitives/LocalDirection_p1.h"
+#include "TrkEventTPCnv/TrkEventPrimitives/LocalParameters_p1.h"
+#include "TrkEventTPCnv/TrkEventPrimitives/HepSymMatrix_p1.h"
+
+//-----------------------------------------------------------------------------
+// TrkSurfaces
+//-----------------------------------------------------------------------------
+#include "TrkEventTPCnv/TrkSurfaces/Surface_p1.h"
+#include "TrkEventTPCnv/TrkSurfaces/Surface_p2.h"
+#include "TrkEventTPCnv/TrkSurfaces/BoundSurface_p1.h"
+
+#include "TrkEventTPCnv/TrkSurfaces/CylinderBounds_p1.h"
+#include "TrkEventTPCnv/TrkSurfaces/DiamondBounds_p1.h"
+#include "TrkEventTPCnv/TrkSurfaces/DiscBounds_p1.h"
+#include "TrkEventTPCnv/TrkSurfaces/RectangleBounds_p1.h"
+#include "TrkEventTPCnv/TrkSurfaces/TrapezoidBounds_p1.h"
+#include "TrkEventTPCnv/TrkSurfaces/TriangleBounds_p1.h"
+#include "TrkEventTPCnv/TrkSurfaces/EllipseBounds_p1.h"
+
+//-----------------------------------------------------------------------------
+// TrkParameters (also used by TrackNeutralParameters)
+//-----------------------------------------------------------------------------
+#include "TrkEventTPCnv/TrkParameters/TrackParameters_p2.h"
+#include "TrkEventTPCnv/TrkParameters/TrackParameters_p1.h"
+#include "TrkEventTPCnv/TrkParameters/AtaSurface_p1.h"
+#include "TrkEventTPCnv/TrkParameters/MeasuredAtaSurface_p1.h"
+// #include "TrkEventTPCnv/TrkParameters/Perigee_p1.h"
+#include "TrkEventTPCnv/TrkParameters/Perigee_p2.h"
+#include "TrkEventTPCnv/TrkParameters/MeasuredPerigee_p1.h"
+
+//-----------------------------------------------------------------------------
+// TrkRIO_OnTrack
+//-----------------------------------------------------------------------------
+#include "TrkEventTPCnv/TrkRIO_OnTrack/RIO_OnTrack_p1.h"
+#include "TrkEventTPCnv/TrkRIO_OnTrack/RIO_OnTrack_p2.h"
+
+//-----------------------------------------------------------------------------
+// TrkCompetingRioOnTrack
+//-----------------------------------------------------------------------------
+#include "TrkEventTPCnv/TrkCompetingRIOsOnTrack/CompetingRIOsOnTrack_p1.h"
+
+//-----------------------------------------------------------------------------
+// TrkPrepRawData
+//-----------------------------------------------------------------------------
+#include "TrkEventTPCnv/TrkPrepRawData/PrepRawData_p1.h"
+
+//-----------------------------------------------------------------------------
+// VxVertex
+//-----------------------------------------------------------------------------
+#include "TrkEventTPCnv/VxVertex/Vertex_p1.h"
+#include "TrkEventTPCnv/VxVertex/RecVertex_p1.h"
+#include "TrkEventTPCnv/VxVertex/RecVertex_p2.h"
+#include "TrkEventTPCnv/VxVertex/VxTrackAtVertex_p1.h"
+#include "TrkEventTPCnv/VxVertex/VxTrackAtVertex_p2.h"
+#include "TrkEventTPCnv/VxVertex/VxCandidate_p1.h"
+#include "TrkEventTPCnv/VxVertex/ExtendedVxCandidate_p1.h"
+#include "TrkEventTPCnv/VxVertex/VxContainer_p1.h"
+
+//-----------------------------------------------------------------------------
+// VxMultiVertex
+//-----------------------------------------------------------------------------
+#include "TrkEventTPCnv/VxMultiVertex/MVFVxTrackAtVertex_p1.h"
+#include "TrkEventTPCnv/VxMultiVertex/MVFVxCandidate_p1.h"
+#include "TrkEventTPCnv/VxMultiVertex/MVFVxContainer_p1.h"
+
+//-----------------------------------------------------------------------------
+// TrkV0Vertex
+//-----------------------------------------------------------------------------
+#include "TrkEventTPCnv/TrkV0Vertex/V0Hypothesis_p1.h"
+#include "TrkEventTPCnv/TrkV0Vertex/V0Candidate_p1.h"
+#include "TrkEventTPCnv/TrkV0Vertex/V0Container_p1.h"
+
+//-----------------------------------------------------------------------------
+// TrkParticleBase
+//-----------------------------------------------------------------------------
+#include "TrkEventTPCnv/TrkParticleBase/TrackParticleBase_p1.h"
+
+#endif
diff --git a/Tracking/TrkEventCnv/TrkEventTPCnv/TrkEventTPCnv/selection.xml b/Tracking/TrkEventCnv/TrkEventTPCnv/TrkEventTPCnv/selection.xml
index 33492e8af4f4fb329140d2ab1792fdc5a20bcb8a..2335beeaebf0c2fe3eb4ac99151137597b430690 100644
--- a/Tracking/TrkEventCnv/TrkEventTPCnv/TrkEventTPCnv/selection.xml
+++ b/Tracking/TrkEventCnv/TrkEventTPCnv/TrkEventTPCnv/selection.xml
@@ -3,17 +3,13 @@
<!-- please clean up everything that is not really needed.
current size = 3.371 Mb -->
-
<class name="Trk::TrackCollection_tlp5" id="436E4996-9D6E-11E3-AD2A-6C3BE51AB9F1" />
- <!-- Vertex top level collection -->
- <class name="Trk::VxContainer_tlp1" id="AFA5FE76-EEC6-4BD1-B704-B5747F729291" />
- <!-- Vertex top level collection -->
+
+ <!-- Vertex top level collection -->
<class name="Trk::VxContainer_tlp2" id="B5254571-6B6D-47F7-A52C-CBE857CF1812" />
- <!-- Multi Vertex top level collection -->
+ <!-- Multi Vertex top level collection -->
<class name="Trk::MVFVxContainer_tlp1" id="D7BAA7AD-1A46-4DA3-9CA7-350A1A3F0656" />
- <!-- TrkV0Vertex top level collection -->
- <class name="Trk::V0Container_tlp1" id="402A9BD1-4476-4E97-A5E4-EB4D742FBB38" />
- <!-- TrkV0Vertex top level collection -->
+ <!-- TrkV0Vertex top level collection -->
<class name="Trk::V0Container_tlp2" id="9BC2B917-940A-4121-8E8B-8C99E178D8C1" />
<!-- Segment top level collection -->
<class name="Trk::SegmentCollection_tlp3" id="1AA73E8A-AF6D-11E3-A8C8-6C3BE51AB9F1" />
@@ -78,9 +74,6 @@
<class name="std::vector<Trk::EstimatedBremOnTrack_p1>" />
- <class name="Trk::MaterialEffectsOnTrack_p1" />
- <class name="std::vector<Trk::MaterialEffectsOnTrack_p1>" />
-
<!-- TrkSurfaces -->
<class name="Trk::Surface_p2" />
<class name="std::vector<Trk::Surface_p2>" />
@@ -110,8 +103,6 @@
<class name="std::vector<Trk::VxCandidate_p1>" />
<class name="Trk::Vertex_p1" />
<class name="std::vector<Trk::Vertex_p1>" />
- <!-- <class name="Trk::Vertex_p2" />
- <class name="std::vector<Trk::Vertex_p2>" /> -->
<class name="Trk::RecVertex_p2" />
<class name="std::vector<Trk::RecVertex_p2>" />
diff --git a/Tracking/TrkEventCnv/TrkEventTPCnv/src/SegmentCollectionCnv_tlp2.cxx b/Tracking/TrkEventCnv/TrkEventTPCnv/src/SegmentCollectionCnv_tlp2.cxx
index 108444426c75bff49c6fb4da379a4f787fb569c7..2298f8c0ef40d6ce16f44f0f17ab10e3d514e297 100644
--- a/Tracking/TrkEventCnv/TrkEventTPCnv/src/SegmentCollectionCnv_tlp2.cxx
+++ b/Tracking/TrkEventCnv/TrkEventTPCnv/src/SegmentCollectionCnv_tlp2.cxx
@@ -6,7 +6,6 @@
SegmentCollectionCnv_tlp2::SegmentCollectionCnv_tlp2( )
{
-// std::cout << "SegmentCollectionCnv_tlp2::SegmentCollectionCnv_tlp2( )" << std::endl;
// Add all converters defined in this top level converter:
// never change the order of adding converters!
@@ -50,7 +49,6 @@ SegmentCollectionCnv_tlp2::~SegmentCollectionCnv_tlp2()
void SegmentCollectionCnv_tlp2::setPStorage( Trk::SegmentCollection_tlp2 *storage )
{
// for implicit TrackCollection_p1 from the base class:
-// std::cout << "SegmentCollectionCnv_tlp2::setPStorage( Trk::SegmentCollection_tlp2 *storage )" << std::endl;
setMainCnvPStorage( &storage->m_segmentCollections );
// for all converters defined in this top level converter
@@ -74,7 +72,6 @@ void SegmentCollectionCnv_tlp2::setPStorage( Trk::SegmentCollection_tlp2 *storag
m_errorMatricesCnv. setPStorage( &storage->m_hepSymMatrices );
m_localParametersCnv. setPStorage( &storage->m_localParameters );
- // m_RIOsCnv. setPStorage( &storage->m_RIO_OnTrack );
m_pseudoMeasurementOnTrackCnv. setPStorage( &storage->m_pseudoMeasurementOnTrack );
m_crotCnv. setPStorage( &storage->m_competingRotsOnTrack );
m_detElSurfCnv. setPStorage( &storage->m_detElementSurfaces ); // 21
diff --git a/Tracking/TrkEventCnv/TrkEventTPCnv/src/TrackCollectionCnv_tlp1.cxx b/Tracking/TrkEventCnv/TrkEventTPCnv/src/TrackCollectionCnv_tlp1.cxx
index 25b409002716e647ef4737c2de1937e576166297..266028d1c2061f8812329baa1e7d80f06f2845ae 100644
--- a/Tracking/TrkEventCnv/TrkEventTPCnv/src/TrackCollectionCnv_tlp1.cxx
+++ b/Tracking/TrkEventCnv/TrkEventTPCnv/src/TrackCollectionCnv_tlp1.cxx
@@ -106,7 +106,5 @@ void TrackCollectionCnv_tlp1::setPStorage( Trk::TrackCollection_tlp1 *storage )
m_localPositionsCnv. setPStorage( &storage->m_localPositions );
m_localParametersCnv. setPStorage( &storage->m_localParameters );
m_crotCnv. setPStorage( &storage->m_competingRotsOnTrack );
-
- //m_pointsCnv. setPStorage( &storage->m_points );
}
diff --git a/Tracking/TrkEventCnv/TrkEventTPCnv/src/TrkEventTPCnv.cxx b/Tracking/TrkEventCnv/TrkEventTPCnv/src/TrkEventTPCnv.cxx
index a57fd19075d48688d41fa1507fb67695a9decd60..98289cec549f41db6a4cbe9206c7708aa586d5f8 100644
--- a/Tracking/TrkEventCnv/TrkEventTPCnv/src/TrkEventTPCnv.cxx
+++ b/Tracking/TrkEventCnv/TrkEventTPCnv/src/TrkEventTPCnv.cxx
@@ -113,7 +113,6 @@
// TrkPrepRawData
//-----------------------------------------------------------------------------
#include "TrkEventTPCnv/TrkPrepRawData/PrepRawData_p1.h"
-#include "TrkEventTPCnv/TrkEventPrimitives/HepPoint3D_p1.h"
//-----------------------------------------------------------------------------
// VxVertex