cleanup

Author: OliverRietmann

GPU/GPUTracking/Merger/GPUTPCGMMerger.cxx

@@ -701,7 +701,7 @@ GPUd() void GPUTPCGMMerger::MergeSectorsPrepareStep2(int32_t nBlocks, int32_t nT
       const GPUTPCGMSectorTrack* trackMin = track;
       while (track->NextSegmentNeighbour() >= 0 && track->Sector() == mSectorTrackInfos[track->NextSegmentNeighbour()].Sector()) {
         track = &mSectorTrackInfos[track->NextSegmentNeighbour()];
-        if ((*track->OrigTrack()).Param().X() < (*trackMin->OrigTrack()).Param().X()) {
+        if ((*track->OrigTrack()).Param().X() < trackMin->OrigTrack()->Param().X()) {
           trackMin = track;
         }
       }

GPU/GPUTracking/Merger/GPUTPCGMSectorTrack.cxx

@@ -96,7 +96,7 @@ GPUd() void GPUTPCGMSectorTrack::SetParam2(const GPUTPCGMTrackParam& trk)
 GPUd() bool GPUTPCGMSectorTrack::FilterErrors(const GPUTPCGMMerger* merger, int32_t iSector, float maxSinPhi, float sinPhiMargin)
 {
   float lastX;
-  // float lastX = GPUTPCGeometry::Row2X(mOrigTrack->Cluster(mOrigTrack->NHits() - 1).GetRow()); // TODO: Why is this needed to be set below, Row2X should work, but looses some tracks
+  // float lastX = GPUTPCGeometry::Row2X(mOrigTrack->Cluster(mOrigTrack->NClusters() - 1).GetRow()); // TODO: Why is this needed to be set below, Row2X should work, but looses some tracks
   float y, z;
   int32_t row, index;
   const GPUTPCTracker& trk = merger->GetConstantMem()->tpcTrackers[iSector];

GPU/GPUTracking/SectorTracker/GPUTPCTracker.h

@@ -196,10 +196,7 @@ class GPUTPCTracker : public GPUProcessor
   GPUhd() GPUglobalref() GPUTPCHitId* TrackletStartHits() { return mTrackletStartHits; }
   GPUhd() GPUglobalref() GPUTPCHitId* TrackletTmpStartHits() const { return mTrackletTmpStartHits; }
 
-  GPUhd() GPUglobalref() MemLayout::wrapper<GPUTPCTrackletSkeleton, MemLayout::reference_restrict> Tracklet(int32_t i) { return mTracklets[i]; }
-
-  template <MemLayout::Flag layout>
-  GPUhd() GPUglobalref() TrackletArrayType<layout> Tracklets() const { return mTracklets; }
+  GPUhd() GPUglobalref() auto Tracklets() const { return mTracklets; }
   GPUhd() GPUglobalref() calink* TrackletRowHits() const { return mTrackletRowHits; }
 
   GPUhd() GPUglobalref() GPUAtomic(uint32_t) * NTracks() const { return &mCommonMem->nTracks; }

GPU/GPUTracking/SectorTracker/GPUTPCTrackerDump.cxx

@@ -130,22 +130,22 @@ void GPUTPCTracker::DumpTrackletHits(std::ostream& out)
   std::iota(Ids.begin(), Ids.end(), 0);
   if (mRec->GetProcessingSettings().deterministicGPUReconstruction) {
     std::sort(Ids.begin(), Ids.end(), [this](const int32_t& a, const int32_t& b) {
-      if (this->Tracklet(a).FirstRow() != this->Tracklet(b).FirstRow()) {
-        return this->Tracklet(a).FirstRow() > this->Tracklet(b).FirstRow();
+      if (this->Tracklets()[a].FirstRow() != this->Tracklets()[b].FirstRow()) {
+        return this->Tracklets()[a].FirstRow() > this->Tracklets()[b].FirstRow();
       }
-      if (this->Tracklet(a).LastRow() != this->Tracklet(b).LastRow()) {
-        return this->Tracklet(a).LastRow() > this->Tracklet(b).LastRow();
+      if (this->Tracklets()[a].LastRow() != this->Tracklets()[b].LastRow()) {
+        return this->Tracklets()[a].LastRow() > this->Tracklets()[b].LastRow();
       }
-      if (this->Tracklet(a).Param().Y() != this->Tracklet(b).Param().Y()) {
-        return this->Tracklet(a).Param().Y() > this->Tracklet(b).Param().Y();
+      if (this->Tracklets()[a].Param().Y() != this->Tracklets()[b].Param().Y()) {
+        return this->Tracklets()[a].Param().Y() > this->Tracklets()[b].Param().Y();
       }
-      return this->Tracklet(a).Param().Z() > this->Tracklet(b).Param().Z();
+      return this->Tracklets()[a].Param().Z() > this->Tracklets()[b].Param().Z();
     });
   }
   for (int32_t jj = 0; jj < nTracklets; jj++) {
     const int32_t j = Ids[jj];
-    const auto& tracklet = Tracklet(j);
-    out << "Tracklet " << std::setw(4) << jj << " (Rows: " << Tracklet(j).FirstRow() << " - " << tracklet.LastRow() << ", Weight " << Tracklet(j).HitWeight() << ") ";
+    const auto& tracklet = Tracklets()[j];
+    out << "Tracklet " << std::setw(4) << jj << " (Rows: " << Tracklets()[j].FirstRow() << " - " << tracklet.LastRow() << ", Weight " << Tracklets()[j].HitWeight() << ") ";
     if (tracklet.LastRow() > tracklet.FirstRow() && (tracklet.FirstRow() >= GPUCA_ROW_COUNT || tracklet.LastRow() >= GPUCA_ROW_COUNT)) {
       GPUError("Error: Tracklet %d First %d Last %d", j, tracklet.FirstRow(), tracklet.LastRow());
       out << " (Error: Tracklet " << j << " First " << tracklet.FirstRow() << " Last " << tracklet.LastRow() << ") ";

GPU/GPUTracking/SectorTracker/GPUTPCTrackletConstructor.cxx

@@ -79,7 +79,7 @@ GPUd() void GPUTPCTrackletConstructor::StoreTracklet(int32_t /*nBlocks*/, int32_
     return;
   }
 
-  GPUglobalref() MemLayout::wrapper<GPUTPCTrackletSkeleton, MemLayout::reference_restrict> tracklet = tracker.Tracklet(itrout);
+  GPUglobalref() MemLayout::wrapper<GPUTPCTrackletSkeleton, MemLayout::reference_restrict> tracklet = tracker.Tracklets()[itrout];
 
   CADEBUG(printf("    Storing tracklet: %d rows\n", nHits));
 

GPU/GPUTracking/SectorTracker/GPUTPCTrackletSelector.cxx

@@ -40,7 +40,7 @@ GPUdii() void GPUTPCTrackletSelector::Thread<0>(int32_t nBlocks, int32_t nThread
   for (int32_t itr = s.mItr0 + iThread; itr < s.mNTracklets; itr += s.mNThreadsTotal) {
     GPUbarrierWarp();
 
-    GPUglobalref() MemLayout::wrapper<GPUTPCTrackletSkeleton, MemLayout::reference_restrict> tracklet = tracker.Tracklet(itr);
+    GPUglobalref() MemLayout::wrapper<GPUTPCTrackletSkeleton, MemLayout::reference_restrict> tracklet = tracker.Tracklets()[itr];
 
     int32_t firstRow = tracklet.FirstRow();
     int32_t lastRow = tracklet.LastRow();