Skip to content

[ITS] Adapt tracker to work with 8 layers for ITS3 #11234

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mconcas merged 1 commit into from
Apr 27, 2023
Merged

[ITS] Adapt tracker to work with 8 layers for ITS3 #11234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 7 additions & 0 deletions Detectors/ITSMFT/ITS/tracking/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,13 @@
# granted to it by virtue of its status as an Intergovernmental Organization
# or submit itself to any jurisdiction.

# see if its3 4-layer tracking option is enabled
option(ENABLE_ITS3_4L "Enable its3 4-layer tracking option" OFF)
if (ENABLE_ITS3_4L)
MESSAGE(STATUS "Enable its3 4-layer tracking option")
add_definitions(-DENABLE_ITS3_4L)
endif()

o2_add_library(ITStracking
TARGETVARNAME targetName
SOURCES src/ClusterLines.cxx
Expand Down
4 changes: 2 additions & 2 deletions Detectors/ITSMFT/ITS/tracking/include/ITStracking/IndexTableUtils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ class IndexTableUtils
int mNzBins = 0;
int mNphiBins = 0;
float mInversePhiBinSize = 0.f;
float mLayerZ[7] = {0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f};
float mInverseZBinSize[7] = {0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f};
float mLayerZ[8] = {0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f};
float mInverseZBinSize[8] = {0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f};
};

template <class T>
Expand Down
4 changes: 4 additions & 0 deletions Detectors/ITSMFT/ITS/tracking/include/ITStracking/Road.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,11 @@ class Road final
}

private:
#ifndef ENABLE_ITS3_4L
int mCellIds[maxRoadSize];
#else
int mCellIds[maxRoadSize + 1];
#endif
// int mLabel;
unsigned char mRoadSize;
bool mIsFakeRoad;
Expand Down
2 changes: 2 additions & 0 deletions Detectors/ITSMFT/ITS/tracking/include/ITStracking/TimeFrame.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,8 @@ class TimeFrame
void addTrackingFrameInfoToLayer(int layer, T&&... args);
void addClusterExternalIndexToLayer(int layer, const int idx);

void resizeVectors(int nLayers);

/// Debug and printing
void checkTrackletLUTs();
void printROFoffsets();
Expand Down
2 changes: 1 addition & 1 deletion Detectors/ITSMFT/ITS/tracking/include/ITStracking/TrackerTraits.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ inline const int4 TrackerTraits::getBinsRect(const Cluster& currentCluster, int

inline void TrackerTraits::initialiseTimeFrame(const int iteration)
{
mTimeFrame->initialise(iteration, mTrkParams[iteration], 7);
mTimeFrame->initialise(iteration, mTrkParams[iteration], mTrkParams[iteration].NLayers);
setIsGPU(false);
}

Expand Down
14 changes: 14 additions & 0 deletions Detectors/ITSMFT/ITS/tracking/src/TimeFrame.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,6 +455,20 @@ void TimeFrame::checkTrackletLUTs()
}
}

void TimeFrame::resizeVectors(int nLayers)
{
mMinR.resize(nLayers, 10000.);
mMaxR.resize(nLayers, -1.);
mClusters.resize(nLayers);
mUnsortedClusters.resize(nLayers);
mTrackingFrameInfo.resize(nLayers);
mClusterExternalIndices.resize(nLayers);
mUsedClusters.resize(nLayers);
mROframesClusters.resize(nLayers, {0});
mNClustersPerROF.resize(nLayers);
mTrackletsIndexROf.resize(2, {0});
}

void TimeFrame::printTrackletLUTonLayer(int i)
{
std::cout << "--------" << std::endl
Expand Down