Skip to content

Commit a4587e8

Browse files
committed
ITS: fix cluster label access for non-staggered
Signed-off-by: Felix Schlepper <felix.schlepper@cern.ch>
1 parent f308c7b commit a4587e8

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

Detectors/ITSMFT/ITS/tracking/include/ITStracking/TimeFrame.h

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ struct TimeFrame {
150150

151151
const TrackingFrameInfo& getClusterTrackingFrameInfo(int layerId, const Cluster& cl) const;
152152
gsl::span<const MCCompLabel> getClusterLabels(int layerId, const Cluster& cl) const { return getClusterLabels(layerId, cl.clusterId); }
153-
gsl::span<const MCCompLabel> getClusterLabels(int layerId, const int clId) const { return mClusterLabels[layerId]->getLabels(mClusterExternalIndices[layerId][clId]); }
153+
gsl::span<const MCCompLabel> getClusterLabels(int layerId, const int clId) const { return mClusterLabels[((mIsStaggered) ? layerId : 0)]->getLabels(mClusterExternalIndices[layerId][clId]); }
154154
int getClusterExternalIndex(int layerId, const int clId) const { return mClusterExternalIndices[layerId][clId]; }
155155
int getClusterSize(int layer, int clusterId) const { return mClusterSize[layer][clusterId]; }
156156
void setClusterSize(int layer, bounded_vector<uint8_t>& v) { mClusterSize[layer] = std::move(v); }
@@ -194,6 +194,9 @@ struct TimeFrame {
194194
unsigned long getArtefactsMemory() const;
195195
void printArtefactsMemory() const;
196196

197+
/// staggering
198+
void setIsStaggered(bool b) noexcept { mIsStaggered = b; }
199+
197200
/// ROF cuts
198201
int getROFCutClusterMult() const { return mCutClusterMult; };
199202
int getROFCutVertexMult() const { return mCutVertexMult; };
@@ -316,6 +319,8 @@ struct TimeFrame {
316319
ROFVertexLookupTableN mROFVertexLookupTable;
317320
ROFVertexLookupTableN::View mROFVertexLookupTableView;
318321

322+
bool mIsStaggered{false};
323+
319324
std::shared_ptr<BoundedMemoryResource> mMemoryPool;
320325
};
321326

Detectors/ITSMFT/ITS/tracking/src/TrackingInterface.cxx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ void ITSTrackingInterface::initialise()
7272
}
7373
mVertexer->setNThreads(vertConf.nThreads, mTaskArena);
7474
mTracker->setNThreads(trackConf.nThreads, mTaskArena);
75+
mTimeFrame->setIsStaggered(mDoStaggering);
7576

7677
// prepare data filter
7778
for (int iLayer = 0; iLayer < ((mDoStaggering) ? NLayers : 1); ++iLayer) {

0 commit comments

Comments
 (0)