diff --git a/Tracker/TrackerEventCnv/TrackerSimEventAthenaPool/src/FaserSiHitCollectionCnv.cxx b/Tracker/TrackerEventCnv/TrackerSimEventAthenaPool/src/FaserSiHitCollectionCnv.cxx
index a4725975ac05e81da114e34f703a482c8df7fbf5..51514fb5b599630e9c32d04c406439c5ea891991 100644
--- a/Tracker/TrackerEventCnv/TrackerSimEventAthenaPool/src/FaserSiHitCollectionCnv.cxx
+++ b/Tracker/TrackerEventCnv/TrackerSimEventAthenaPool/src/FaserSiHitCollectionCnv.cxx
@@ -2,8 +2,8 @@
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
-#include "TrackerSimEventTPCnv/TrackerHits/FaserSiHitCollectionCnv_p1.h"
-#include "TrackerSimEventTPCnv/TrackerHits/FaserSiHit_p1.h"
+#include "TrackerSimEventTPCnv/TrackerHits/FaserSiHitCollectionCnv_p3.h"
+//#include "TrackerSimEventTPCnv/TrackerHits/FaserSiHit_p2.h"
#include "FaserSiHitCollectionCnv.h"
@@ -17,14 +17,14 @@ FaserSiHitCollection_PERS* FaserSiHitCollectionCnv::createPersistent(FaserSiHitC
FaserSiHitCollection* FaserSiHitCollectionCnv::createTransient() {
MsgStream mlog(msgSvc(), "FaserSiHitCollectionConverter" );
- FaserSiHitCollectionCnv_p1 converter_p1;
+ FaserSiHitCollectionCnv_p3 converter_p3;
- static const pool::Guid p1_guid("FF9508DE-3E25-425D-9556-16D319DCE0E1");
+ static const pool::Guid p3_guid("FF9508DE-3E25-425D-9556-16D319DCE0E1");
FaserSiHitCollection *trans_cont(0);
- if( this->compareClassGuid(p1_guid)) {
- std::unique_ptr< FaserSiHitCollection_p1 > col_vect( this->poolReadObject< FaserSiHitCollection_p1 >() );
- trans_cont = converter_p1.createTransient( col_vect.get(), mlog );
+ if( this->compareClassGuid(p3_guid)) {
+ std::unique_ptr< FaserSiHitCollection_p3 > col_vect( this->poolReadObject< FaserSiHitCollection_p3 >() );
+ trans_cont = converter_p3.createTransient( col_vect.get(), mlog );
} else {
throw std::runtime_error("Unsupported persistent version of Data container");
}
diff --git a/Tracker/TrackerEventCnv/TrackerSimEventAthenaPool/src/FaserSiHitCollectionCnv.h b/Tracker/TrackerEventCnv/TrackerSimEventAthenaPool/src/FaserSiHitCollectionCnv.h
index 1467731fec80812428550f9c75cc3393dcf07047..3a81e19fa0671a028948f7217aa256c06e94c9a1 100644
--- a/Tracker/TrackerEventCnv/TrackerSimEventAthenaPool/src/FaserSiHitCollectionCnv.h
+++ b/Tracker/TrackerEventCnv/TrackerSimEventAthenaPool/src/FaserSiHitCollectionCnv.h
@@ -6,14 +6,14 @@
#define FASERSIHITCOLLECTIONCNV
#include "TrackerSimEvent/FaserSiHitCollection.h"
-#include "TrackerSimEventTPCnv/TrackerHits/FaserSiHitCollection_p1.h"
-#include "TrackerSimEventTPCnv/TrackerHits/FaserSiHitCollectionCnv_p1.h"
+#include "TrackerSimEventTPCnv/TrackerHits/FaserSiHitCollection_p3.h"
+#include "TrackerSimEventTPCnv/TrackerHits/FaserSiHitCollectionCnv_p3.h"
#include "AthenaPoolCnvSvc/T_AthenaPoolCustomCnv.h"
// Gaudi
#include "GaudiKernel/MsgStream.h"
// typedef to the latest persistent version
-typedef FaserSiHitCollection_p1 FaserSiHitCollection_PERS;
-typedef FaserSiHitCollectionCnv_p1 FaserSiHitCollectionCnv_PERS;
+typedef FaserSiHitCollection_p3 FaserSiHitCollection_PERS;
+typedef FaserSiHitCollectionCnv_p3 FaserSiHitCollectionCnv_PERS;
class FaserSiHitCollectionCnv : public T_AthenaPoolCustomCnv<FaserSiHitCollection, FaserSiHitCollection_PERS > {
friend class CnvFactory<FaserSiHitCollectionCnv>;
diff --git a/Tracker/TrackerEventCnv/TrackerSimEventTPCnv/TrackerSimEventTPCnv/TrackerHits/FaserSiHitCnv_p1.h b/Tracker/TrackerEventCnv/TrackerSimEventTPCnv/TrackerSimEventTPCnv/TrackerHits/FaserSiHitCnv_p2.h
similarity index 60%
rename from Tracker/TrackerEventCnv/TrackerSimEventTPCnv/TrackerSimEventTPCnv/TrackerHits/FaserSiHitCnv_p1.h
rename to Tracker/TrackerEventCnv/TrackerSimEventTPCnv/TrackerSimEventTPCnv/TrackerHits/FaserSiHitCnv_p2.h
index 3a4bec3cdaca91575a51d5589310e9b89306c395..791df726101c1e4178b3d9ceb1248174a91b7fd0 100644
--- a/Tracker/TrackerEventCnv/TrackerSimEventTPCnv/TrackerSimEventTPCnv/TrackerHits/FaserSiHitCnv_p1.h
+++ b/Tracker/TrackerEventCnv/TrackerSimEventTPCnv/TrackerSimEventTPCnv/TrackerHits/FaserSiHitCnv_p2.h
@@ -2,30 +2,30 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#ifndef FASERSIHITCNV_P1_H
-#define FASERSIHITCNV_P1_H
+#ifndef FASERSIHITCNV_P2_H
+#define FASERSIHITCNV_P2_H
/*
Transient/Persistent converter for FaserSiHit class
*/
#include "TrackerSimEvent/FaserSiHit.h"
-#include "FaserSiHit_p1.h"
+#include "FaserSiHit_p2.h"
#include "AthenaPoolCnvSvc/T_AthenaPoolTPConverter.h"
class MsgStream;
-class FaserSiHitCnv_p1 : public T_AthenaPoolTPCnvBase<FaserSiHit, FaserSiHit_p1>
+class FaserSiHitCnv_p2 : public T_AthenaPoolTPCnvBase<FaserSiHit, FaserSiHit_p2>
{
public:
- FaserSiHitCnv_p1() {}
+ FaserSiHitCnv_p2() {}
- virtual void persToTrans(const FaserSiHit_p1* persObj, FaserSiHit*
+ virtual void persToTrans(const FaserSiHit_p2* persObj, FaserSiHit*
transObj, MsgStream &log);
- virtual void transToPers(const FaserSiHit* transObj, FaserSiHit_p1*
+ virtual void transToPers(const FaserSiHit* transObj, FaserSiHit_p2*
persObj, MsgStream &log);
};
diff --git a/Tracker/TrackerEventCnv/TrackerSimEventTPCnv/TrackerSimEventTPCnv/TrackerHits/FaserSiHitCollectionCnv_p1.h b/Tracker/TrackerEventCnv/TrackerSimEventTPCnv/TrackerSimEventTPCnv/TrackerHits/FaserSiHitCollectionCnv_p3.h
similarity index 61%
rename from Tracker/TrackerEventCnv/TrackerSimEventTPCnv/TrackerSimEventTPCnv/TrackerHits/FaserSiHitCollectionCnv_p1.h
rename to Tracker/TrackerEventCnv/TrackerSimEventTPCnv/TrackerSimEventTPCnv/TrackerHits/FaserSiHitCollectionCnv_p3.h
index 488221edc81c645ae56e453a2cafb18195f1242d..3f2eb8610682ccf021f0c57904dd9487d35e559e 100644
--- a/Tracker/TrackerEventCnv/TrackerSimEventTPCnv/TrackerSimEventTPCnv/TrackerHits/FaserSiHitCollectionCnv_p1.h
+++ b/Tracker/TrackerEventCnv/TrackerSimEventTPCnv/TrackerSimEventTPCnv/TrackerHits/FaserSiHitCollectionCnv_p3.h
@@ -2,31 +2,31 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#ifndef FASERSIHITCOLLECTIONCNV_P1_H
-#define FASERSIHITCOLLECTIONCNV_P1_H
+#ifndef FASERSIHITCOLLECTIONCNV_P3_H
+#define FASERSIHITCOLLECTIONCNV_P3_H
-// FaserSiHitCollectionCnv_p1, T/P separation of FaserSi Hits
+// FaserSiHitCollectionCnv_p3, T/P separation of FaserSi Hits
// author D.Costanzo <davide.costanzo@cern.ch>
// author O.Arnaez <olivier.arnaez@cern.ch>
#include "AthenaPoolCnvSvc/T_AthenaPoolTPConverter.h"
#include "TrackerSimEvent/FaserSiHitCollection.h"
-#include "FaserSiHitCollection_p1.h"
+#include "FaserSiHitCollection_p3.h"
-class FaserSiHitCollectionCnv_p1 : public T_AthenaPoolTPCnvBase<FaserSiHitCollection, FaserSiHitCollection_p1>
+class FaserSiHitCollectionCnv_p3 : public T_AthenaPoolTPCnvBase<FaserSiHitCollection, FaserSiHitCollection_p3>
{
public:
- FaserSiHitCollectionCnv_p1() {};
+ FaserSiHitCollectionCnv_p3() {};
- virtual FaserSiHitCollection* createTransient(const FaserSiHitCollection_p1* persObj, MsgStream &log);
+ virtual FaserSiHitCollection* createTransient(const FaserSiHitCollection_p3* persObj, MsgStream &log);
- virtual void persToTrans(const FaserSiHitCollection_p1* persCont,
+ virtual void persToTrans(const FaserSiHitCollection_p3* persCont,
FaserSiHitCollection* transCont,
MsgStream &log) ;
virtual void transToPers(const FaserSiHitCollection* transCont,
- FaserSiHitCollection_p1* persCont,
+ FaserSiHitCollection_p3* persCont,
MsgStream &log) ;
private:
diff --git a/Tracker/TrackerEventCnv/TrackerSimEventTPCnv/TrackerSimEventTPCnv/TrackerHits/FaserSiHitCollection_p1.h b/Tracker/TrackerEventCnv/TrackerSimEventTPCnv/TrackerSimEventTPCnv/TrackerHits/FaserSiHitCollection_p3.h
similarity index 88%
rename from Tracker/TrackerEventCnv/TrackerSimEventTPCnv/TrackerSimEventTPCnv/TrackerHits/FaserSiHitCollection_p1.h
rename to Tracker/TrackerEventCnv/TrackerSimEventTPCnv/TrackerSimEventTPCnv/TrackerHits/FaserSiHitCollection_p3.h
index fa4018a016b99d2bc7baf9e46a8711fa6278e787..b07b2e3810eaed573449bd4c389befee571bea7f 100644
--- a/Tracker/TrackerEventCnv/TrackerSimEventTPCnv/TrackerSimEventTPCnv/TrackerHits/FaserSiHitCollection_p1.h
+++ b/Tracker/TrackerEventCnv/TrackerSimEventTPCnv/TrackerSimEventTPCnv/TrackerHits/FaserSiHitCollection_p3.h
@@ -2,8 +2,8 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#ifndef FASERSIHITCOLLECTION_P1_H
-#define FASERSIHITCOLLECTION_P1_H
+#ifndef FASERSIHITCOLLECTION_P3_H
+#define FASERSIHITCOLLECTION_P3_H
/*
@@ -14,11 +14,11 @@ Authors: Davide Costanzo Rob Duxfield
#include <vector>
#include <string>
-class FaserSiHitCollection_p1
+class FaserSiHitCollection_p3
{
public:
/// Default constructor
- FaserSiHitCollection_p1 ();
+ FaserSiHitCollection_p3 ();
//private:
std::vector<float> m_hit1_meanTime; // 1 element per string
@@ -52,6 +52,6 @@ class FaserSiHitCollection_p1
// inlines
inline
-FaserSiHitCollection_p1::FaserSiHitCollection_p1 () {}
+FaserSiHitCollection_p3::FaserSiHitCollection_p3 () {}
#endif
diff --git a/Tracker/TrackerEventCnv/TrackerSimEventTPCnv/TrackerSimEventTPCnv/TrackerHits/FaserSiHit_p1.h b/Tracker/TrackerEventCnv/TrackerSimEventTPCnv/TrackerSimEventTPCnv/TrackerHits/FaserSiHit_p2.h
similarity index 83%
rename from Tracker/TrackerEventCnv/TrackerSimEventTPCnv/TrackerSimEventTPCnv/TrackerHits/FaserSiHit_p1.h
rename to Tracker/TrackerEventCnv/TrackerSimEventTPCnv/TrackerSimEventTPCnv/TrackerHits/FaserSiHit_p2.h
index 159caf56dd047bd4d7d7fa505b3076dd96b07534..fa8e50a85a8fceafa20e4dbed50f60c052510d0e 100644
--- a/Tracker/TrackerEventCnv/TrackerSimEventTPCnv/TrackerSimEventTPCnv/TrackerHits/FaserSiHit_p1.h
+++ b/Tracker/TrackerEventCnv/TrackerSimEventTPCnv/TrackerSimEventTPCnv/TrackerHits/FaserSiHit_p2.h
@@ -2,12 +2,12 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#ifndef FASERSIHIT_P1_H
-#define FASERSIHIT_P1_H
+#ifndef FASERSIHIT_P2_H
+#define FASERSIHIT_P2_H
#include "GeneratorObjectsTPCnv/HepMcParticleLink_p2.h"
-class FaserSiHit_p1 {
+class FaserSiHit_p2 {
public:
float m_stX, m_stY, m_stZ;
float m_enX, m_enY, m_enZ;
diff --git a/Tracker/TrackerEventCnv/TrackerSimEventTPCnv/TrackerSimEventTPCnv/TrackerSimEventTPCnvDict.h b/Tracker/TrackerEventCnv/TrackerSimEventTPCnv/TrackerSimEventTPCnv/TrackerSimEventTPCnvDict.h
index 6146be90a917d1eaf49b9a7c9996f5cc4eb66262..a730fca90074a9da71420e41651384173aa298cf 100644
--- a/Tracker/TrackerEventCnv/TrackerSimEventTPCnv/TrackerSimEventTPCnv/TrackerSimEventTPCnvDict.h
+++ b/Tracker/TrackerEventCnv/TrackerSimEventTPCnv/TrackerSimEventTPCnv/TrackerSimEventTPCnvDict.h
@@ -7,14 +7,14 @@
//-----------------------------------------------------------------------------
//
-// file: TrackerSimEventTPCnvDict_p1.h
+// file: TrackerSimEventTPCnvDict.h
//
//-----------------------------------------------------------------------------
-#include "TrackerSimEventTPCnv/TrackerHits/FaserSiHitCnv_p1.h"
-#include "TrackerSimEventTPCnv/TrackerHits/FaserSiHitCollectionCnv_p1.h"
-#include "TrackerSimEventTPCnv/TrackerHits/FaserSiHitCollection_p1.h"
-#include "TrackerSimEventTPCnv/TrackerHits/FaserSiHit_p1.h"
+#include "TrackerSimEventTPCnv/TrackerHits/FaserSiHitCnv_p2.h"
+#include "TrackerSimEventTPCnv/TrackerHits/FaserSiHitCollectionCnv_p3.h"
+#include "TrackerSimEventTPCnv/TrackerHits/FaserSiHitCollection_p3.h"
+#include "TrackerSimEventTPCnv/TrackerHits/FaserSiHit_p2.h"
#endif // TRACKERSIMEVENTTPCNV_TRACKERSIMEVENTTPCNVDICT_H
diff --git a/Tracker/TrackerEventCnv/TrackerSimEventTPCnv/TrackerSimEventTPCnv/selection.xml b/Tracker/TrackerEventCnv/TrackerSimEventTPCnv/TrackerSimEventTPCnv/selection.xml
index 72a04265e6367e090af8a543dd0a550d4e948af5..7684404421c37267df94656b57ff9067dcce9503 100644
--- a/Tracker/TrackerEventCnv/TrackerSimEventTPCnv/TrackerSimEventTPCnv/selection.xml
+++ b/Tracker/TrackerEventCnv/TrackerSimEventTPCnv/TrackerSimEventTPCnv/selection.xml
@@ -1,6 +1,6 @@
<lcgdict>
<!-- FaserSiHits -->
- <class name="FaserSiHit_p1" />
- <class name="std::vector<FaserSiHit_p1>" />
- <class name="FaserSiHitCollection_p1" id="FF9508DE-3E25-425D-9556-16D319DCE0E1" />
+ <class name="FaserSiHit_p2" />
+ <class name="std::vector<FaserSiHit_p2>" />
+ <class name="FaserSiHitCollection_p3" id="FF9508DE-3E25-425D-9556-16D319DCE0E1" />
</lcgdict>
diff --git a/Tracker/TrackerEventCnv/TrackerSimEventTPCnv/src/TrackerHits/FaserSiHitCnv_p1.cxx b/Tracker/TrackerEventCnv/TrackerSimEventTPCnv/src/TrackerHits/FaserSiHitCnv_p2.cxx
similarity index 85%
rename from Tracker/TrackerEventCnv/TrackerSimEventTPCnv/src/TrackerHits/FaserSiHitCnv_p1.cxx
rename to Tracker/TrackerEventCnv/TrackerSimEventTPCnv/src/TrackerHits/FaserSiHitCnv_p2.cxx
index a6e9c320e1118143f505e4f3ad3f7234a3afd498..5dde908345fee67f41b4f7f5c4b71407d25c926e 100644
--- a/Tracker/TrackerEventCnv/TrackerSimEventTPCnv/src/TrackerHits/FaserSiHitCnv_p1.cxx
+++ b/Tracker/TrackerEventCnv/TrackerSimEventTPCnv/src/TrackerHits/FaserSiHitCnv_p2.cxx
@@ -6,12 +6,12 @@
#include "Identifier/Identifier.h"
#include "GeneratorObjectsTPCnv/HepMcParticleLinkCnv_p2.h"
-#include "TrackerSimEventTPCnv/TrackerHits/FaserSiHit_p1.h"
-#include "TrackerSimEventTPCnv/TrackerHits/FaserSiHitCnv_p1.h"
+#include "TrackerSimEventTPCnv/TrackerHits/FaserSiHit_p2.h"
+#include "TrackerSimEventTPCnv/TrackerHits/FaserSiHitCnv_p2.h"
void
-FaserSiHitCnv_p1::persToTrans(const FaserSiHit_p1* persObj, FaserSiHit* transObj, MsgStream &log)
+FaserSiHitCnv_p2::persToTrans(const FaserSiHit_p2* persObj, FaserSiHit* transObj, MsgStream &log)
{
HepMcParticleLinkCnv_p2 HepMcPLCnv;
HepMcParticleLink link;
@@ -32,7 +32,7 @@ FaserSiHitCnv_p1::persToTrans(const FaserSiHit_p1* persObj, FaserSiHit* transObj
void
-FaserSiHitCnv_p1::transToPers(const FaserSiHit* transObj, FaserSiHit_p1* persObj, MsgStream &log)
+FaserSiHitCnv_p2::transToPers(const FaserSiHit* transObj, FaserSiHit_p2* persObj, MsgStream &log)
{
// if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "FaserSiHitCnv_p1::transToPers called " << endmsg;
HepMcParticleLinkCnv_p2 HepMcPLCnv;
diff --git a/Tracker/TrackerEventCnv/TrackerSimEventTPCnv/src/TrackerHits/FaserSiHitCollectionCnv_p1.cxx b/Tracker/TrackerEventCnv/TrackerSimEventTPCnv/src/TrackerHits/FaserSiHitCollectionCnv_p3.cxx
similarity index 93%
rename from Tracker/TrackerEventCnv/TrackerSimEventTPCnv/src/TrackerHits/FaserSiHitCollectionCnv_p1.cxx
rename to Tracker/TrackerEventCnv/TrackerSimEventTPCnv/src/TrackerHits/FaserSiHitCollectionCnv_p3.cxx
index c31eed267329943e8a0627881057281bcb7248df..e8c9549040bca63195e340694c1114371e8f0259 100644
--- a/Tracker/TrackerEventCnv/TrackerSimEventTPCnv/src/TrackerHits/FaserSiHitCollectionCnv_p1.cxx
+++ b/Tracker/TrackerEventCnv/TrackerSimEventTPCnv/src/TrackerHits/FaserSiHitCollectionCnv_p3.cxx
@@ -4,8 +4,8 @@
#include "TrackerSimEvent/FaserSiHit.h"
#include "TrackerSimEvent/FaserSiHitCollection.h"
-#include "TrackerSimEventTPCnv/TrackerHits/FaserSiHitCollection_p1.h"
-#include "TrackerSimEventTPCnv/TrackerHits/FaserSiHitCollectionCnv_p1.h"
+#include "TrackerSimEventTPCnv/TrackerHits/FaserSiHitCollection_p3.h"
+#include "TrackerSimEventTPCnv/TrackerHits/FaserSiHitCollectionCnv_p3.h"
#include "GeneratorObjects/HepMcParticleLink.h"
#include <cmath>
@@ -53,14 +53,14 @@ inline double cycle(double a, double b)
}
-const double FaserSiHitCollectionCnv_p1::m_persEneUnit = 1.0e-5;
-const double FaserSiHitCollectionCnv_p1::m_persLenUnit = 1.0e-5;
-const double FaserSiHitCollectionCnv_p1::m_persAngUnit = 1.0e-5;
-const double FaserSiHitCollectionCnv_p1::m_2bHalfMaximum = pow(2.0, 15.0);
-const int FaserSiHitCollectionCnv_p1::m_2bMaximum = (unsigned short)(-1);
+const double FaserSiHitCollectionCnv_p3::m_persEneUnit = 1.0e-5;
+const double FaserSiHitCollectionCnv_p3::m_persLenUnit = 1.0e-5;
+const double FaserSiHitCollectionCnv_p3::m_persAngUnit = 1.0e-5;
+const double FaserSiHitCollectionCnv_p3::m_2bHalfMaximum = pow(2.0, 15.0);
+const int FaserSiHitCollectionCnv_p3::m_2bMaximum = (unsigned short)(-1);
-void FaserSiHitCollectionCnv_p1::transToPers(const FaserSiHitCollection* transCont, FaserSiHitCollection_p1* persCont, MsgStream &/*log*/)
+void FaserSiHitCollectionCnv_p3::transToPers(const FaserSiHitCollection* transCont, FaserSiHitCollection_p3* persCont, MsgStream &/*log*/)
{
// Finds hits belonging to a "string" (in which the end point of one hit is the same as the start point of the next) and
// persistifies the end point of each hit plus the start point of the first hit in each string.
@@ -241,14 +241,14 @@ void FaserSiHitCollectionCnv_p1::transToPers(const FaserSiHitCollection* transCo
}
-FaserSiHitCollection* FaserSiHitCollectionCnv_p1::createTransient(const FaserSiHitCollection_p1* persObj, MsgStream &log) {
+FaserSiHitCollection* FaserSiHitCollectionCnv_p3::createTransient(const FaserSiHitCollection_p3* persObj, MsgStream &log) {
std::unique_ptr<FaserSiHitCollection> trans(std::make_unique<FaserSiHitCollection>("DefaultCollectionName",persObj->m_nHits.size()));
persToTrans(persObj, trans.get(), log);
return(trans.release());
}
-void FaserSiHitCollectionCnv_p1::persToTrans(const FaserSiHitCollection_p1* persCont, FaserSiHitCollection* transCont, MsgStream &/*log*/)
+void FaserSiHitCollectionCnv_p3::persToTrans(const FaserSiHitCollection_p3* persCont, FaserSiHitCollection* transCont, MsgStream &/*log*/)
{
unsigned int hitCount = 0;
unsigned int angleCount = 0;