Skip to content

Commit 9bc07e5

Browse files
shahor02shahor02
committed
Fix TOF matches index access in RecoContainer
1 parent 2fa3ba2 commit 9bc07e5

1 file changed

Lines changed: 9 additions & 9 deletions

File tree

‎DataFormats/Detectors/GlobalTracking/src/RecoContainer.cxx‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -607,7 +607,7 @@ const o2::track::TrackParCov& RecoContainer::getTrackParamOut(GTrackID gidx) con
607607
if (trSrc == GTrackID::ITSTPC) {
608608
return getTrack<o2d::TrackTPCITS>(gidx).getParamOut();
609609
} else if (trSrc == GTrackID::ITSTPCTOF) { // the physical tracks are in ITS-TPC, need to get reference from match info
610-
return getTrack<o2d::TrackTPCITS>(getTOFMatch(gidx).getTrackRef().getIndex()).getParamOut();
610+
return getTrack<o2d::TrackTPCITS>(getTOFMatch(gidx).getTrackRef()).getParamOut();
611611
} else if (trSrc == GTrackID::TPCTOF) {
612612
return getTrack<o2d::TrackTPCTOF>(gidx).getParamOut();
613613
} else if (trSrc == GTrackID::ITS) {
@@ -637,7 +637,7 @@ const o2::track::TrackParCov& RecoContainer::getTrackParam(GTrackID gidx) const
637637
// get base track
638638
auto trSrc = gidx.getSource();
639639
if (trSrc == GTrackID::ITSTPCTOF) { // the physical tracks are in ITS-TPC, need to get reference from match info
640-
gidx = getTOFMatch(gidx).getTrackRef().getIndex();
640+
gidx = getTOFMatch(gidx).getTrackRef();
641641
}
642642
return getObject<o2::track::TrackParCov>(gidx, TRACKS);
643643
}
@@ -646,7 +646,7 @@ const o2::track::TrackParCov& RecoContainer::getTrackParam(GTrackID gidx) const
646646
const o2::dataformats::TrackTPCITS& RecoContainer::getITSTPCTOFTrack(GTrackID gidx) const
647647
{
648648
// get ITS-TPC track pointed by global TOF match
649-
return getTPCITSTrack(getTOFMatch(gidx).getTrackRef().getIndex());
649+
return getTPCITSTrack(getTOFMatch(gidx).getTrackRef());
650650
}
651651

652652
//________________________________________________________
@@ -689,15 +689,15 @@ RecoContainer::GlobalIDSet RecoContainer::getSingleDetectorRefs(GTrackID gidx) c
689689
}
690690
if (src == GTrackID::ITSTPCTOF) {
691691
const auto& parent0 = getTOFMatch(gidx); //ITS/TPC : TOF
692-
const auto& parent1 = getTPCITSTrack(parent0.getTrackRef().getIndex());
693-
table[GTrackID::ITSTPC] = parent0.getTrackRef().getIndex();
692+
const auto& parent1 = getTPCITSTrack(parent0.getTrackRef());
693+
table[GTrackID::ITSTPC] = parent0.getTrackRef();
694694
table[GTrackID::TOF] = {unsigned(parent0.getIdxTOFCl()), GTrackID::TOF};
695695
table[GTrackID::TPC] = parent1.getRefTPC();
696696
table[parent1.getRefITS().getSource()] = parent1.getRefITS(); // ITS source might be an ITS track or ITSAB tracklet
697697
} else if (src == GTrackID::TPCTOF) {
698698
const auto& parent0 = getTPCTOFMatch(gidx); //TPC : TOF
699699
table[GTrackID::TOF] = {unsigned(parent0.getIdxTOFCl()), GTrackID::TOF};
700-
table[GTrackID::TPC] = parent0.getTrackRef().getIndex();
700+
table[GTrackID::TPC] = parent0.getTrackRef();
701701
} else if (src == GTrackID::ITSTPC) {
702702
const auto& parent0 = getTPCITSTrack(gidx);
703703
table[GTrackID::TPC] = parent0.getRefTPC();
@@ -718,11 +718,11 @@ GTrackID RecoContainer::getTPCContributorGID(GTrackID gidx) const
718718
return parent1.getRefTPC();
719719
} else if (src == GTrackID::ITSTPCTOF) {
720720
const auto& parent0 = getTOFMatch(gidx); //ITS/TPC : TOF
721-
const auto& parent1 = getTPCITSTrack(parent0.getTrackRef().getIndex());
721+
const auto& parent1 = getTPCITSTrack(parent0.getTrackRef());
722722
return parent1.getRefTPC();
723723
} else if (src == GTrackID::TPCTOF) {
724724
const auto& parent0 = getTPCTOFMatch(gidx); //TPC : TOF
725-
return parent0.getTrackRef().getIndex();
725+
return parent0.getTrackRef();
726726
} else if (src == GTrackID::ITSTPC) {
727727
const auto& parent0 = getTPCITSTrack(gidx);
728728
return parent0.getRefTPC();
@@ -742,7 +742,7 @@ GTrackID RecoContainer::getITSContributorGID(GTrackID gidx) const
742742
return parent1.getRefITS();
743743
} else if (src == GTrackID::ITSTPCTOF) {
744744
const auto& parent0 = getTOFMatch(gidx); //ITS/TPC : TOF
745-
const auto& parent1 = getTPCITSTrack(parent0.getTrackRef().getIndex());
745+
const auto& parent1 = getTPCITSTrack(parent0.getTrackRef());
746746
return parent1.getRefITS();
747747
} else if (src == GTrackID::ITSTPC) {
748748
const auto& parent0 = getTPCITSTrack(gidx);

0 commit comments

Comments
 (0)