Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ struct TrackingParameters {
float Diamond[3] = {0.f, 0.f, 0.f};

/// General parameters
bool AllowSharingFirstCluster = false;
int ClusterSharing = 0;
int MinTrackLength = 7;
float NSigmaCut = 5;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ struct TrackerParamConfig : public o2::conf::ConfigurableParamHelper<TrackerPara
size_t maxMemory = std::numeric_limits<size_t>::max();
bool dropTFUponFailure = false;
bool fataliseUponFailure = true; // granular management of the fatalisation in async mode
bool allowSharingFirstCluster = false; // allow first cluster sharing among tracks

O2ParamDef(TrackerParamConfig, "ITSCATrackerParam");
};
Expand Down
1 change: 1 addition & 0 deletions Detectors/ITSMFT/ITS/tracking/src/Configuration.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,7 @@ std::vector<TrackingParameters> TrackingMode::getTrackingParameters(TrackingMode
p.DropTFUponFailure = tc.dropTFUponFailure;
p.SaveTimeBenchmarks = tc.saveTimeBenchmarks;
p.FataliseUponFailure = tc.fataliseUponFailure;
p.AllowSharingFirstCluster = tc.allowSharingFirstCluster;

if (tc.useMatCorrTGeo) {
p.CorrType = o2::base::PropagatorImpl<float>::MatCorrType::USEMatCorrTGeo;
Expand Down
44 changes: 41 additions & 3 deletions Detectors/ITSMFT/ITS/tracking/src/TrackerTraits.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -718,6 +718,10 @@ void TrackerTraits<nLayers>::processNeighbours(int iLayer, int iLevel, const bou
template <int nLayers>
void TrackerTraits<nLayers>::findRoads(const int iteration)
{
bounded_vector<bounded_vector<int>> firstClusters(mTrkParams[iteration].NLayers, bounded_vector<int>(mMemoryPool.get()), mMemoryPool.get());
bounded_vector<bounded_vector<int>> sharedFirstClusters(mTrkParams[iteration].NLayers, bounded_vector<int>(mMemoryPool.get()), mMemoryPool.get());
firstClusters.resize(mTrkParams[iteration].NLayers);
sharedFirstClusters.resize(mTrkParams[iteration].NLayers);
for (int startLevel{mTrkParams[iteration].CellsPerRoad()}; startLevel >= mTrkParams[iteration].CellMinimumLevel(); --startLevel) {

auto seedFilter = [&](const auto& seed) {
Expand Down Expand Up @@ -827,15 +831,22 @@ void TrackerTraits<nLayers>::findRoads(const int iteration)
for (auto& track : tracks) {
int nShared = 0;
bool isFirstShared{false};
int firstLayer{-1}, firstCluster{-1};
for (int iLayer{0}; iLayer < mTrkParams[0].NLayers; ++iLayer) {
if (track.getClusterIndex(iLayer) == constants::UnusedIndex) {
continue;
}
nShared += int(mTimeFrame->isClusterUsed(iLayer, track.getClusterIndex(iLayer)));
isFirstShared |= !iLayer && mTimeFrame->isClusterUsed(iLayer, track.getClusterIndex(iLayer));
bool isShared = mTimeFrame->isClusterUsed(iLayer, track.getClusterIndex(iLayer));
nShared += int(isShared);
if (firstLayer < 0) {
firstCluster = track.getClusterIndex(iLayer);
isFirstShared = isShared && mTrkParams[0].AllowSharingFirstCluster && std::find(firstClusters[iLayer].begin(), firstClusters[iLayer].end(), firstCluster) != firstClusters[iLayer].end();
firstLayer = iLayer;
}
}

if (nShared > mTrkParams[0].ClusterSharing) {
/// do not account for the first cluster in the shared clusters number if it is allowed
if (nShared - int(isFirstShared && mTrkParams[0].AllowSharingFirstCluster) > mTrkParams[0].ClusterSharing) {
continue;
}

Expand Down Expand Up @@ -864,6 +875,33 @@ void TrackerTraits<nLayers>::findRoads(const int iteration)
track.setNextROFbit();
}
mTimeFrame->getTracks(o2::gpu::CAMath::Min(rofs[0], rofs[1])).emplace_back(track);

firstClusters[firstLayer].push_back(firstCluster);
if (isFirstShared) {
sharedFirstClusters[firstLayer].push_back(firstCluster);
}
}
}

/// Now we have to set the shared cluster flag
for (int iLayer{0}; iLayer < mTrkParams[0].NLayers; ++iLayer) {
std::sort(sharedFirstClusters[iLayer].begin(), sharedFirstClusters[iLayer].end());
}

for (int iROF{0}; iROF < mTimeFrame->getNrof(); ++iROF) {
for (auto& track : mTimeFrame->getTracks(iROF)) {
int firstLayer{mTrkParams[0].NLayers}, firstCluster{constants::UnusedIndex};
for (int iLayer{0}; iLayer < mTrkParams[0].NLayers; ++iLayer) {
if (track.getClusterIndex(iLayer) == constants::UnusedIndex) {
continue;
}
firstLayer = iLayer;
firstCluster = track.getClusterIndex(iLayer);
break;
}
if (std::binary_search(sharedFirstClusters[firstLayer].begin(), sharedFirstClusters[firstLayer].end(), firstCluster)) {
track.setSharedClusters();
}
}
}
}
Expand Down