Skip to content

ITS3: use const view of ROFs, prepareROFData #14694

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
fgrosa merged 1 commit into from
Sep 26, 2025
Merged

ITS3: use const view of ROFs, prepareROFData #14694

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
4 changes: 3 additions & 1 deletion 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 @@ -90,12 +90,14 @@ struct TimeFrame {
int loadROFrameData(const o2::itsmft::ROFRecord& rof, gsl::span<const itsmft::Cluster> clusters,
const dataformats::MCTruthContainer<MCCompLabel>* mcLabels = nullptr);

int loadROFrameData(gsl::span<o2::itsmft::ROFRecord> rofs,
int loadROFrameData(gsl::span<const o2::itsmft::ROFRecord> rofs,
gsl::span<const itsmft::CompClusterExt> clusters,
gsl::span<const unsigned char>::iterator& pattIt,
const itsmft::TopologyDictionary* dict,
const dataformats::MCTruthContainer<MCCompLabel>* mcLabels = nullptr);
void resetROFrameData(size_t nROFs);
void prepareROFrameData(gsl::span<const o2::itsmft::ROFRecord> rofs,
gsl::span<const itsmft::CompClusterExt> clusters);

int getTotalClusters() const;
auto& getTotVertIteration() { return mTotVertPerIteration; }
Expand Down
2 changes: 1 addition & 1 deletion Detectors/ITSMFT/ITS/tracking/include/ITStracking/TrackingInterface.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ class ITSTrackingInterface
TimeFrameN* mTimeFrame = nullptr;

protected:
virtual void loadROF(gsl::span<itsmft::ROFRecord>& trackROFspan,
virtual void loadROF(gsl::span<const itsmft::ROFRecord>& trackROFspan,
gsl::span<const itsmft::CompClusterExt> clusters,
gsl::span<const unsigned char>::iterator& pattIt,
const dataformats::MCTruthContainer<MCCompLabel>* mcLabels);
Expand Down
37 changes: 22 additions & 15 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 @@ -103,28 +103,17 @@ void TimeFrame<nLayers>::addPrimaryVerticesContributorLabelsInROF(const bounded_
}

template <int nLayers>
int TimeFrame<nLayers>::loadROFrameData(gsl::span<o2::itsmft::ROFRecord> rofs,
int TimeFrame<nLayers>::loadROFrameData(gsl::span<const o2::itsmft::ROFRecord> rofs,
gsl::span<const itsmft::CompClusterExt> clusters,
gsl::span<const unsigned char>::iterator& pattIt,
const itsmft::TopologyDictionary* dict,
const dataformats::MCTruthContainer<MCCompLabel>* mcLabels)
{
resetROFrameData(rofs.size());

GeometryTGeo* geom = GeometryTGeo::Instance();
geom->fillMatrixCache(o2::math_utils::bit2Mask(o2::math_utils::TransformType::T2L, o2::math_utils::TransformType::L2G));

mNrof = rofs.size();
clearResizeBoundedVector(mClusterSize, clusters.size(), mMemoryPool.get());
std::array<int, nLayers> clusterCountPerLayer{};
for (const auto& clus : clusters) {
++clusterCountPerLayer[geom->getLayer(clus.getSensorID())];
}
for (int iLayer{0}; iLayer < nLayers; ++iLayer) {
mUnsortedClusters[iLayer].reserve(clusterCountPerLayer[iLayer]);
mTrackingFrameInfo[iLayer].reserve(clusterCountPerLayer[iLayer]);
mClusterExternalIndices[iLayer].reserve(clusterCountPerLayer[iLayer]);
}
resetROFrameData(rofs.size());
prepareROFrameData(rofs, clusters);

for (size_t iRof{0}; iRof < rofs.size(); ++iRof) {
const auto& rof = rofs[iRof];
Expand Down Expand Up @@ -182,7 +171,7 @@ int TimeFrame<nLayers>::loadROFrameData(gsl::span<o2::itsmft::ROFRecord> rofs,
}

return mNrof;
} // namespace o2::its
}

template <int nLayers>
void TimeFrame<nLayers>::resetROFrameData(size_t nRofs)
Expand All @@ -201,6 +190,24 @@ void TimeFrame<nLayers>::resetROFrameData(size_t nRofs)
}
}

template <int nLayers>
void TimeFrame<nLayers>::prepareROFrameData(gsl::span<const o2::itsmft::ROFRecord> rofs,
gsl::span<const itsmft::CompClusterExt> clusters)
{
GeometryTGeo* geom = GeometryTGeo::Instance();
mNrof = rofs.size();
clearResizeBoundedVector(mClusterSize, clusters.size(), mMemoryPool.get());
std::array<int, nLayers> clusterCountPerLayer{};
for (const auto& clus : clusters) {
++clusterCountPerLayer[geom->getLayer(clus.getSensorID())];
}
for (int iLayer{0}; iLayer < nLayers; ++iLayer) {
mUnsortedClusters[iLayer].reserve(clusterCountPerLayer[iLayer]);
mTrackingFrameInfo[iLayer].reserve(clusterCountPerLayer[iLayer]);
mClusterExternalIndices[iLayer].reserve(clusterCountPerLayer[iLayer]);
}
}

template <int nLayers>
void TimeFrame<nLayers>::prepareClusters(const TrackingParameters& trkParam, const int maxLayers)
{
Expand Down
7 changes: 3 additions & 4 deletions Detectors/ITSMFT/ITS/tracking/src/TrackingInterface.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,11 +139,10 @@ void ITSTrackingInterface::run(framework::ProcessingContext& pc)
mTracker->setBz(o2::base::Propagator::Instance()->getNominalBz());

gsl::span<const unsigned char>::iterator pattIt = patterns.begin();

gsl::span<itsmft::ROFRecord> trackROFspan(trackROFvec);
gsl::span<const itsmft::ROFRecord> trackROFspan(trackROFvec);
loadROF(trackROFspan, compClusters, pattIt, labels);
pattIt = patterns.begin();
std::vector<int> savedROF;

auto logger = [&](const std::string& s) { LOG(info) << s; };
auto fatalLogger = [&](const std::string& s) { LOG(fatal) << s; };
auto errorLogger = [&](const std::string& s) { LOG(error) << s; };
Expand Down Expand Up @@ -406,7 +405,7 @@ void ITSTrackingInterface::setTraitsFromProvider(VertexerTraitsN* vertexerTraits
mVertexer->setMemoryPool(mMemoryPool);
}

void ITSTrackingInterface::loadROF(gsl::span<itsmft::ROFRecord>& trackROFspan,
void ITSTrackingInterface::loadROF(gsl::span<const itsmft::ROFRecord>& trackROFspan,
gsl::span<const itsmft::CompClusterExt> clusters,
gsl::span<const unsigned char>::iterator& pattIt,
const dataformats::MCTruthContainer<MCCompLabel>* mcLabels)
Expand Down
2 changes: 1 addition & 1 deletion Detectors/Upgrades/ITS3/reconstruction/include/ITS3Reconstruction/IOUtils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ void convertCompactClusters(gsl::span<const itsmft::CompClusterExt> clusters,
const its3::TopologyDictionary* dict);

int loadROFrameDataITS3(its::TimeFrame<7>* tf,
gsl::span<o2::itsmft::ROFRecord> rofs,
gsl::span<const o2::itsmft::ROFRecord> rofs,
gsl::span<const itsmft::CompClusterExt> clusters,
gsl::span<const unsigned char>::iterator& pattIt,
const its3::TopologyDictionary* dict,
Expand Down
2 changes: 1 addition & 1 deletion Detectors/Upgrades/ITS3/reconstruction/include/ITS3Reconstruction/TrackingInterface.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class ITS3TrackingInterface final : public its::ITSTrackingInterface
void finaliseCCDB(framework::ConcreteDataMatcher& matcher, void* obj) final;

protected:
void loadROF(gsl::span<itsmft::ROFRecord>& trackROFspan,
void loadROF(gsl::span<const itsmft::ROFRecord>& trackROFspan,
gsl::span<const itsmft::CompClusterExt> clusters,
gsl::span<const unsigned char>::iterator& pattIt,
const dataformats::MCTruthContainer<MCCompLabel>* mcLabels) final;
Expand Down
13 changes: 6 additions & 7 deletions Detectors/Upgrades/ITS3/reconstruction/src/IOUtils.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,22 +58,22 @@ void convertCompactClusters(gsl::span<const itsmft::CompClusterExt> clusters,
}

int loadROFrameDataITS3(its::TimeFrame<7>* tf,
gsl::span<o2::itsmft::ROFRecord> rofs,
gsl::span<const o2::itsmft::ROFRecord> rofs,
gsl::span<const itsmft::CompClusterExt> clusters,
gsl::span<const unsigned char>::iterator& pattIt,
const its3::TopologyDictionary* dict,
const dataformats::MCTruthContainer<MCCompLabel>* mcLabels)
{
tf->resetROFrameData(rofs.size());

auto geom = its::GeometryTGeo::Instance();
geom->fillMatrixCache(o2::math_utils::bit2Mask(o2::math_utils::TransformType::T2L, o2::math_utils::TransformType::L2G));

tf->mNrof = 0;
tf->resetROFrameData(rofs.size());
tf->prepareROFrameData(rofs, clusters);

its::bounded_vector<uint8_t> clusterSizeVec(clusters.size(), tf->getMemoryPool().get());

for (auto& rof : rofs) {
for (size_t iRof{0}; iRof < rofs.size(); ++iRof) {
const auto& rof = rofs[iRof];
for (int clusterId{rof.getFirstEntry()}; clusterId < rof.getFirstEntry() + rof.getNEntries(); ++clusterId) {
auto& c = clusters[clusterId];
auto sensorID = c.getSensorID();
Expand Down Expand Up @@ -108,9 +108,8 @@ int loadROFrameDataITS3(its::TimeFrame<7>* tf,
tf->addClusterExternalIndexToLayer(layer, clusterId);
}
for (unsigned int iL{0}; iL < tf->getUnsortedClusters().size(); ++iL) {
tf->mROFramesClusters[iL].push_back(tf->getUnsortedClusters()[iL].size());
tf->mROFramesClusters[iL][iRof + 1] = tf->getUnsortedClusters()[iL].size();
}
tf->mNrof++;
}

tf->setClusterSize(clusterSizeVec);
Expand Down
2 changes: 1 addition & 1 deletion Detectors/Upgrades/ITS3/reconstruction/src/TrackingInterface.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ void ITS3TrackingInterface::finaliseCCDB(framework::ConcreteDataMatcher& matcher
}
}

void ITS3TrackingInterface::loadROF(gsl::span<itsmft::ROFRecord>& trackROFspan,
void ITS3TrackingInterface::loadROF(gsl::span<const itsmft::ROFRecord>& trackROFspan,
gsl::span<const itsmft::CompClusterExt> clusters,
gsl::span<const unsigned char>::iterator& pattIt,
const dataformats::MCTruthContainer<MCCompLabel>* mcLabels)
Expand Down