Skip to content

Commit 2b40223

Browse files
author
afurs
committed
AFIT-112: hotfix
AFIT-112: hotfix AFIT-112: hotfix
1 parent 9196a7e commit 2b40223

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

DataFormats/Detectors/FIT/FT0/include/DataFormatsFT0/RecPoints.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ class RecPoints
6161
enum ETimeType { kTimeMean,
6262
kTimeA,
6363
kTimeC,
64-
kVertex };
64+
kTimeVertex };
6565

6666
// Enum for trigger nits specified in rec-points and AOD data
6767
enum ETriggerBits { kOrA = 0, // OrA time-trigger signal
@@ -125,8 +125,8 @@ class RecPoints
125125
bool isValidTime(int side) const { return getCollisionTime(side) < o2::InteractionRecord::DummyTime; }
126126
void setCollisionTime(short time, int side) { mCollisionTime[side] = time; }
127127

128-
short getVertex() const { return getCollisionTime(kVertex); }
129-
void setVertex(short vertex) { mCollisionTime[kVertex] = vertex; }
128+
short getVertex() const { return getCollisionTime(kTimeVertex); }
129+
void setVertex(short vertex) { mCollisionTime[kTimeVertex] = vertex; }
130130

131131
o2::fit::Triggers getTrigger() const { return mTriggers; }
132132
void setTriggers(o2::fit::Triggers trig) { mTriggers = trig; }
@@ -149,9 +149,9 @@ class RecPoints
149149
void initRecPointTriggers(const o2::fit::Triggers& digitTriggers, uint8_t extraTrgWord = 0)
150150
{
151151
const auto digitTriggerWord = digitTriggers.getTriggersignals();
152-
const auto trgAndTechWordPair = parseDigitTriggerWord(digitTriggerWord, true);
152+
const auto trgAndTechWordPair = o2::fit::Triggers::parseDigitTriggerWord(digitTriggerWord, true);
153153
mTriggers.setTriggers(trgAndTechWordPair.first | extraTrgWord);
154-
mTechWord = trgAndTechWordPair.second;
154+
mTechnicalWord = trgAndTechWordPair.second;
155155
}
156156

157157
std::array<short, 4> mCollisionTime = {sDummyCollissionTime,

DataFormats/Detectors/FIT/common/include/DataFormatsFIT/Triggers.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,10 @@ class Triggers
110110
timeA = atimeA;
111111
timeC = atimeC;
112112
}
113+
void setTriggers(uint8_t trgsig)
114+
{
115+
triggersignals = trgsig;
116+
}
113117

114118
void setTriggers(Bool_t isA, Bool_t isC, Bool_t isVrtx, Bool_t isCnt, Bool_t isSCnt, uint8_t chanA, uint8_t chanC, int32_t aamplA,
115119
int32_t aamplC, int16_t atimeA, int16_t atimeC, Bool_t isLaser, Bool_t isOutputsAreBlocked, Bool_t isDataValid)

0 commit comments

Comments
 (0)