From 855b8af79a145bcab2c76db6474d283dfe0862c0 Mon Sep 17 00:00:00 2001
From: John Baines <john.baines@stfc.ac.uk>
Date: Fri, 11 Dec 2015 16:49:45 +0100
Subject: [PATCH] bugfix for 6th FTK_RawTrack dataword
(TrigFTK_RawDataTPCnv-00-00-06)
2015-12-11 John Baines <john.baines@stfc.ac.uk>
* FTK_RawTrackCnv_p1.cxx: bugfix for 6th FTK_RawTrack dataword
* tag TrigFTK_RawDataTPCnv-00-00-06
2015-12-09 John Baines <john.baines@stfc.ac.uk>
* Changes for increase in FTK datawords from 5 to 6
* tag TrigFTK_RawDataTPCnv-00-00-05
---
.../TrigFTK_RawDataTPCnv/FTK_RawTrackCnv_p1.h | 2 +-
.../TrigFTK_RawDataTPCnv/TrigFTK_RawDataTPCnv/FTK_RawTrack_p1.h | 2 +-
Trigger/TrigFTK/TrigFTK_RawDataTPCnv/src/FTK_RawTrackCnv_p1.cxx | 2 ++
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/Trigger/TrigFTK/TrigFTK_RawDataTPCnv/TrigFTK_RawDataTPCnv/FTK_RawTrackCnv_p1.h b/Trigger/TrigFTK/TrigFTK_RawDataTPCnv/TrigFTK_RawDataTPCnv/FTK_RawTrackCnv_p1.h
index 24d3342d838d4..994b85a06b3a3 100644
--- a/Trigger/TrigFTK/TrigFTK_RawDataTPCnv/TrigFTK_RawDataTPCnv/FTK_RawTrackCnv_p1.h
+++ b/Trigger/TrigFTK/TrigFTK_RawDataTPCnv/TrigFTK_RawDataTPCnv/FTK_RawTrackCnv_p1.h
@@ -21,7 +21,7 @@ public:
virtual void persToTrans( const FTK_RawTrack_p1 *, FTK_RawTrack *, MsgStream& );
virtual void transToPers( const FTK_RawTrack *, FTK_RawTrack_p1 *, MsgStream& );
- enum {th1=0, th2=1, th3=2, th4=3, th5=4};
+ enum {th1=0, th2=1, th3=2, th4=3, th5=4,th6=5};
};
diff --git a/Trigger/TrigFTK/TrigFTK_RawDataTPCnv/TrigFTK_RawDataTPCnv/FTK_RawTrack_p1.h b/Trigger/TrigFTK/TrigFTK_RawDataTPCnv/TrigFTK_RawDataTPCnv/FTK_RawTrack_p1.h
index 88c00738cb3b3..77f7771b4a984 100644
--- a/Trigger/TrigFTK/TrigFTK_RawDataTPCnv/TrigFTK_RawDataTPCnv/FTK_RawTrack_p1.h
+++ b/Trigger/TrigFTK/TrigFTK_RawDataTPCnv/TrigFTK_RawDataTPCnv/FTK_RawTrack_p1.h
@@ -18,7 +18,7 @@ class FTK_RawTrack_p1
private:
- uint32_t m_pars[5];
+ uint32_t m_pars[6];
uint32_t m_pars_pix[8];
uint32_t m_pars_sct[8];
signed long m_barcodes_sct[8];
diff --git a/Trigger/TrigFTK/TrigFTK_RawDataTPCnv/src/FTK_RawTrackCnv_p1.cxx b/Trigger/TrigFTK/TrigFTK_RawDataTPCnv/src/FTK_RawTrackCnv_p1.cxx
index 5964ca9f52588..d45442e408803 100644
--- a/Trigger/TrigFTK/TrigFTK_RawDataTPCnv/src/FTK_RawTrackCnv_p1.cxx
+++ b/Trigger/TrigFTK/TrigFTK_RawDataTPCnv/src/FTK_RawTrackCnv_p1.cxx
@@ -28,6 +28,7 @@ void FTK_RawTrackCnv_p1::persToTrans(const FTK_RawTrack_p1* persObj,
transObj->setTH3(persObj->m_pars[th3]);
transObj->setTH4(persObj->m_pars[th4]);
transObj->setTH5(persObj->m_pars[th5]);
+ transObj->setTH6(persObj->m_pars[th6]);
transObj->setBarcode(persObj->m_barcode);
// Pixel Clusters //
@@ -136,6 +137,7 @@ void FTK_RawTrackCnv_p1::transToPers(const FTK_RawTrack* transObj,
persObj->m_pars[th3] = transObj->getTH3();
persObj->m_pars[th4] = transObj->getTH4();
persObj->m_pars[th5] = transObj->getTH5();
+ persObj->m_pars[th6] = transObj->getTH6();
persObj->m_barcode = transObj->getBarcode();
// Pixel Clusters //
--
GitLab