Skip to content

Commit 759049f

Browse files
authored
ITS: minor fixes to enable multiRof (#12225)
1 parent a806da8 commit 759049f

File tree

4 files changed

+9
-7
lines changed

4 files changed

+9
-7
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,8 @@ class TimeFrame
230230

231231
void resizeVectors(int nLayers);
232232

233+
void setExtAllocator(bool ext) { mExtAllocator = ext; }
234+
bool getExtAllocator() const { return mExtAllocator; }
233235
/// Debug and printing
234236
void checkTrackletLUTs();
235237
void printROFoffsets();
@@ -243,9 +245,7 @@ class TimeFrame
243245
IndexTableUtils mIndexTableUtils;
244246

245247
bool mIsGPU = false;
246-
// void setChain(o2::gpu::GPUChainITS*);
247-
void setExtAllocator(bool ext) { mExtAllocator = ext; }
248-
bool getExtAllocator() const { return mExtAllocator; }
248+
249249
std::vector<std::vector<Cluster>> mClusters;
250250
std::vector<std::vector<TrackingFrameInfo>> mTrackingFrameInfo;
251251
std::vector<std::vector<int>> mClusterExternalIndices;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ struct TrackerParamConfig : public o2::conf::ConfigurableParamHelper<TrackerPara
5555
// Use TGeo for mat. budget
5656
bool useMatCorrTGeo = false;
5757
bool useFastMaterial = false;
58+
int deltaRof = 0;
5859
float sysErrY2[7] = {0}; // systematic error^2 in Y per layer
5960
float sysErrZ2[7] = {0}; // systematic error^2 in Z per layer
6061
float maxChi2ClusterAttachment = -1.f;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ int TimeFrame::loadROFrameData(gsl::span<o2::itsmft::ROFRecord> rofs,
223223
addClusterExternalIndexToLayer(layer, clusterId);
224224
}
225225
for (unsigned int iL{0}; iL < mUnsortedClusters.size(); ++iL) {
226-
mNClustersPerROF[iL].push_back(mUnsortedClusters[iL].size() - mROframesClusters[iL].back());
226+
// mNClustersPerROF[iL].push_back(mUnsortedClusters[iL].size() - mROframesClusters[iL].back());
227227
mROframesClusters[iL].push_back(mUnsortedClusters[iL].size());
228228
}
229229
mNrof++;
@@ -415,7 +415,7 @@ unsigned long TimeFrame::getArtefactsMemory()
415415
size += sizeof(Tracklet) * trkl.size();
416416
}
417417
for (auto& cells : mCells) {
418-
size += sizeof(Cell) * cells.size();
418+
size += sizeof(CellSeed) * cells.size();
419419
}
420420
for (auto& cellsN : mCellsNeighbours) {
421421
size += sizeof(int) * cellsN.size();

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ void Tracker::clustersToTracks(std::function<void(std::string s)> logger, std::f
5959
}
6060
float trackletsPerCluster = mTraits->getTFNumberOfClusters() > 0 ? float(mTraits->getTFNumberOfTracklets()) / mTraits->getTFNumberOfClusters() : 0.f;
6161
if (trackletsPerCluster > mTrkParams[iteration].TrackletsPerClusterLimit) {
62-
error(fmt::format("Too many tracklets per cluster ({}) in iteration {}, check the detector status and/or the selections.", trackletsPerCluster, iteration));
62+
error(fmt::format("Too many tracklets per cluster ({}) in iteration {}, check the detector status and/or the selections. Current limit is {}", trackletsPerCluster, iteration, mTrkParams[iteration].TrackletsPerClusterLimit));
6363
break;
6464
}
6565

@@ -71,7 +71,7 @@ void Tracker::clustersToTracks(std::function<void(std::string s)> logger, std::f
7171
}
7272
float cellsPerCluster = mTraits->getTFNumberOfClusters() > 0 ? float(mTraits->getTFNumberOfCells()) / mTraits->getTFNumberOfClusters() : 0.f;
7373
if (cellsPerCluster > mTrkParams[iteration].CellsPerClusterLimit) {
74-
error(fmt::format("Too many cells per cluster ({}) in iteration {}, check the detector status and/or the selections.", cellsPerCluster, iteration));
74+
error(fmt::format("Too many cells per cluster ({}) in iteration {}, check the detector status and/or the selections. Current limit is {}", cellsPerCluster, iteration, mTrkParams[iteration].CellsPerClusterLimit));
7575
break;
7676
}
7777

@@ -402,6 +402,7 @@ void Tracker::getGlobalConfiguration()
402402
params.SystErrorZ2[i] = tc.sysErrZ2[i] > 0 ? tc.sysErrZ2[i] : params.SystErrorZ2[i];
403403
}
404404
}
405+
params.DeltaROF = tc.deltaRof;
405406
params.MaxChi2ClusterAttachment = tc.maxChi2ClusterAttachment > 0 ? tc.maxChi2ClusterAttachment : params.MaxChi2ClusterAttachment;
406407
params.MaxChi2NDF = tc.maxChi2NDF > 0 ? tc.maxChi2NDF : params.MaxChi2NDF;
407408
params.PhiBins = tc.LUTbinsPhi > 0 ? tc.LUTbinsPhi : params.PhiBins;

0 commit comments

Comments
 (0)