Skip to content

Commit 4568638

Browse files
martenoledavidrohr
authored andcommitted
Fix deflection scale for o2 dataformat
1 parent 1e61c36 commit 4568638

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

GPU/GPUTracking/TRDTracking/GPUTRDTracker.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -595,7 +595,7 @@ GPUd() bool GPUTRDTracker_t<TRDTRK, PROP>::CalculateSpacePoints(int iCollision)
595595
mSpacePoints[trkltIdxGlb].mR = xTrkltSec[0];
596596
mSpacePoints[trkltIdxGlb].mX[0] = xTrkltSec[1];
597597
mSpacePoints[trkltIdxGlb].mX[1] = xTrkltSec[2];
598-
mSpacePoints[trkltIdxGlb].mDy = 0.014f * mTracklets[trkltIdxGlb].GetdY();
598+
mSpacePoints[trkltIdxGlb].mDy = mTracklets[trkltIdxGlb].GetdY();
599599

600600
int modId = mGeo->GetSector(iDet) * GPUTRDGeometry::kNstack + mGeo->GetStack(iDet); // global TRD stack number
601601
unsigned short volId = mGeo->GetGeomManagerVolUID(iDet, modId);

GPU/GPUTracking/TRDTracking/GPUTRDTrackletWord.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ GPUd() int GPUTRDTrackletWord::GetYbin() const
4949
}
5050
}
5151

52-
GPUd() int GPUTRDTrackletWord::GetdY() const
52+
GPUd() int GPUTRDTrackletWord::GetdYbin() const
5353
{
5454
// returns (signed) value of the deflection length
5555
if (mTrackletWord & (1 << 19)) {

GPU/GPUTracking/TRDTracking/GPUTRDTrackletWord.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,16 @@ class GPUTRDTrackletWord
4949

5050
// ----- Getters for contents of tracklet word -----
5151
GPUd() int GetYbin() const;
52-
GPUd() int GetdY() const;
52+
GPUd() int GetdYbin() const;
5353
GPUd() int GetZbin() const { return ((mTrackletWord >> 20) & 0xf); }
5454
GPUd() int GetPID() const { return ((mTrackletWord >> 24) & 0xff); }
5555

5656
// ----- Getters for offline corresponding values -----
5757
GPUd() double GetPID(int /* is */) const { return (double)GetPID() / 256.f; }
5858
GPUd() int GetDetector() const { return mHCId / 2; }
5959
GPUd() int GetHCId() const { return mHCId; }
60-
GPUd() float GetdYdX() const { return (GetdY() * 140e-4f / 3.f); }
60+
GPUd() float GetdYdX() const { return (GetdYbin() * 140e-4f / 3.f); }
61+
GPUd() float GetDy() const { return GetdYbin() * 140e-4f; }
6162
GPUd() float GetY() const { return (GetYbin() * 160e-4f); }
6263
GPUd() unsigned int GetTrackletWord() const { return mTrackletWord; }
6364

0 commit comments

Comments
 (0)