Skip to content

ITS3: propagating split dict to external code #14137

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
shahor02 merged 1 commit into from
Apr 14, 2025
Merged

ITS3: propagating split dict to external code #14137

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
8 changes: 4 additions & 4 deletions Detectors/GlobalTracking/src/MatchTPCITS.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -661,7 +661,8 @@ bool MatchTPCITS::prepareITSData()
auto pattID = clus.getPatternID();
unsigned int npix;
#ifdef ENABLE_UPGRADES
if ((pattID == o2::itsmft::CompCluster::InvalidPatternID) || ((withITS3) ? mIT3Dict->isGroup(pattID) : mITSDict->isGroup(pattID))) { // braces guarantee evaluation order
auto ib = o2::its3::constants::detID::isDetITS3(clus.getChipID());
if ((pattID == o2::itsmft::CompCluster::InvalidPatternID) || ((withITS3) ? mIT3Dict->isGroup(pattID, ib) : mITSDict->isGroup(pattID))) { // braces guarantee evaluation order
#else
if (pattID == o2::itsmft::CompCluster::InvalidPatternID || mITSDict->isGroup(pattID)) {
#endif
Expand All @@ -671,7 +672,7 @@ bool MatchTPCITS::prepareITSData()
} else {
#ifdef ENABLE_UPGRADES
if (withITS3) {
npix = mIT3Dict->getNpixels(pattID);
npix = mIT3Dict->getNpixels(pattID, ib);
} else {
npix = mITSDict->getNpixels(pattID);
}
Expand Down Expand Up @@ -1434,8 +1435,7 @@ void MatchTPCITS::refitWinners(pmr::vector<o2::dataformats::TrackTPCITS>& matche

#ifdef WITH_OPENMP
#pragma omp parallel for schedule(dynamic) num_threads(mNThreads) \
reduction(+ \
: nFailedRefit)
reduction(+ : nFailedRefit)
#endif
for (int ifit = 0; ifit < nToFit; ifit++) {
int iTPC = tpcToFit[ifit], iITS;
Expand Down
8 changes: 4 additions & 4 deletions Detectors/Vertexing/StrangenessTracking/include/StrangenessTracking/StrangenessTracker.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,20 +279,20 @@ class StrangenessTracker
for (unsigned int iClus{0}; iClus < ITSclus.size(); ++iClus) {
auto& clus = ITSclus[iClus];
auto pattID = clus.getPatternID();
auto ib = o2::its3::constants::detID::isDetITS3(clus.getChipID());
int npix;
o2::itsmft::ClusterPattern patt;

if (pattID == o2::itsmft::CompCluster::InvalidPatternID || mdict->isGroup(pattID)) {
if (pattID == o2::itsmft::CompCluster::InvalidPatternID || mdict->isGroup(pattID, ib)) {
patt.acquirePattern(pattIt);
npix = patt.getNPixels();
} else {

npix = mdict->getNpixels(pattID);
patt = mdict->getPattern(pattID);
npix = mdict->getNpixels(pattID, ib);
patt = mdict->getPattern(pattID, ib);
}
clusSizeVec[iClus] = npix;
}
// LOG(info) << " Patt Npixel: " << pattVec[0].getNPixels();
}
#endif

Expand Down