Skip to content

Commit 04178e8

Browse files
committed
Check for TRD container before accessing it
1 parent 7919d72 commit 04178e8

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

DataFormats/Detectors/GlobalTracking/src/RecoContainer.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1305,7 +1305,7 @@ const o2::dataformats::MCTruthContainer<o2::MCCompLabel>* RecoContainer::getTRDT
13051305

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

13111311
//__________________________________________________________

Detectors/TPC/workflow/src/TPCTimeSeriesSpec.cxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -316,8 +316,8 @@ class TPCTimeSeries : public Task
316316
// D2: build TPC track index → TRD tracklet data map (for unbinned output)
317317
// For each TPC track that has a TRD match, store the TrackTRD tracklet indices
318318
std::unordered_map<unsigned int, TRDTrackletData> tpcToTRDMap;
319-
auto trdTracklets = mTPCOnly ? gsl::span<const o2::trd::Tracklet64>() : recoData.getTRDTracklets();
320-
auto trdCalibTracklets = mTPCOnly ? gsl::span<const o2::trd::CalibratedTracklet>() : recoData.getTRDCalibratedTracklets();
319+
auto trdTracklets = (mTPCOnly || !recoData.inputsTRD) ? gsl::span<const o2::trd::Tracklet64>() : recoData.getTRDTracklets();
320+
auto trdCalibTracklets = (mTPCOnly || !recoData.inputsTRD) ? gsl::span<const o2::trd::CalibratedTracklet>() : recoData.getTRDCalibratedTracklets();
321321
if (mUnbinnedWriter && !mTPCOnly) {
322322
// scan ITS-TPC-TRD tracks
323323
auto itstpctrdTracks = recoData.getITSTPCTRDTracks<o2::trd::TrackTRD>();

0 commit comments

Comments
 (0)