Skip to content

Protect RecoContainer TRDtracklets access in absence of the TRD #15670

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

Open
shahor02 wants to merge 2 commits into
base: dev
Choose a base branch
from
+6 −6
Open

Protect RecoContainer TRDtracklets access in absence of the TRD #15670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7919d72
Protect RecoContainer TRDtracklets access in absence of the TRD
shahor02 Aug 9, 2026
2fe0284
Check for TRD container before accessing it
shahor02 Aug 9, 2026
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 DataFormats/Detectors/GlobalTracking/src/RecoContainer.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1276,12 +1276,12 @@ const o2::tpc::ClusterNativeAccess& RecoContainer::getTPCClusters() const

gsl::span<const o2::trd::Tracklet64> RecoContainer::getTRDTracklets() const
{
return inputsTRD->mTracklets;
return inputsTRD ? inputsTRD->mTracklets : gsl::span<const o2::trd::Tracklet64>();
}

gsl::span<const o2::trd::CalibratedTracklet> RecoContainer::getTRDCalibratedTracklets() const
{
return inputsTRD->mSpacePoints;
return inputsTRD ? inputsTRD->mSpacePoints : gsl::span<const o2::trd::CalibratedTracklet>();
}

gsl::span<const o2::trd::TriggerRecord> RecoContainer::getTRDTriggerRecords() const
Expand All @@ -1300,12 +1300,12 @@ gsl::span<const o2::trd::TriggerRecord> RecoContainer::getTRDTriggerRecords() co

const o2::dataformats::MCTruthContainer<o2::MCCompLabel>* RecoContainer::getTRDTrackletsMCLabels() const
{
return inputsTRD->mTrackletLabels.get();
return inputsTRD ? inputsTRD->mTrackletLabels.get() : nullptr;
}

const o2::dataformats::ConstMCTruthContainerView<o2::MCCompLabel>* RecoContainer::getTPCClustersMCLabels() const
{
return inputsTPCclusters->clusterIndex.clustersMCTruth;
return inputsTRD ? inputsTPCclusters->clusterIndex.clustersMCTruth : nullptr;
}

//__________________________________________________________
Expand Down
4 changes: 2 additions & 2 deletions Detectors/TPC/workflow/src/TPCTimeSeriesSpec.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,8 +316,8 @@ class TPCTimeSeries : public Task
// D2: build TPC track index → TRD tracklet data map (for unbinned output)
// For each TPC track that has a TRD match, store the TrackTRD tracklet indices
std::unordered_map<unsigned int, TRDTrackletData> tpcToTRDMap;
auto trdTracklets = mTPCOnly ? gsl::span<const o2::trd::Tracklet64>() : recoData.getTRDTracklets();
auto trdCalibTracklets = mTPCOnly ? gsl::span<const o2::trd::CalibratedTracklet>() : recoData.getTRDCalibratedTracklets();
auto trdTracklets = (mTPCOnly || !recoData.inputsTRD) ? gsl::span<const o2::trd::Tracklet64>() : recoData.getTRDTracklets();
auto trdCalibTracklets = (mTPCOnly || !recoData.inputsTRD) ? gsl::span<const o2::trd::CalibratedTracklet>() : recoData.getTRDCalibratedTracklets();
if (mUnbinnedWriter && !mTPCOnly) {
// scan ITS-TPC-TRD tracks
auto itstpctrdTracks = recoData.getITSTPCTRDTracks<o2::trd::TrackTRD>();
Expand Down