ITS: remove copying vertices addPrimaryVertices

Signed-off-by: Felix Schlepper <felix.schlepper@cern.ch>

Author: f3sch

Detectors/ITSMFT/ITS/tracking/include/ITStracking/TimeFrame.h

@@ -77,11 +77,9 @@ struct TimeFrame {
   gsl::span<const std::array<float, 2>> getPrimaryVerticesXAlpha(int rofId) const;
   void fillPrimaryVerticesXandAlpha();
   int getPrimaryVerticesNum(int rofId = -1) const;
-  void addPrimaryVertices(const bounded_vector<Vertex>& vertices);
   void addPrimaryVerticesLabels(bounded_vector<std::pair<MCCompLabel, float>>& labels);
   void addPrimaryVerticesContributorLabels(bounded_vector<MCCompLabel>& labels);
-  void addPrimaryVertices(const bounded_vector<Vertex>& vertices, const int rofId, const int iteration);
-  void addPrimaryVertices(const gsl::span<const Vertex>& vertices, const int rofId, const int iteration);
+  void addPrimaryVertices(const bounded_vector<Vertex>& vertices, const int iteration);
   void addPrimaryVerticesInROF(const bounded_vector<Vertex>& vertices, const int rofId, const int iteration);
   void addPrimaryVerticesLabelsInROF(const bounded_vector<std::pair<MCCompLabel, float>>& labels, const int rofId);
   void addPrimaryVerticesContributorLabelsInROF(const bounded_vector<MCCompLabel>& labels, const int rofId);

Detectors/ITSMFT/ITS/tracking/src/TimeFrame.cxx

@@ -59,24 +59,19 @@ TimeFrame<nLayers>::~TimeFrame()
 }
 
 template <int nLayers>
-void TimeFrame<nLayers>::addPrimaryVertices(const bounded_vector<Vertex>& vertices)
+void TimeFrame<nLayers>::addPrimaryVertices(const bounded_vector<Vertex>& vertices, const int iteration)
 {
   for (const auto& vertex : vertices) {
-    mPrimaryVertices.emplace_back(vertex);
-    if (!isBeamPositionOverridden) {
+    mPrimaryVertices.emplace_back(vertex); // put a copy in the present
+    mTotVertPerIteration[iteration]++;
+    if (!isBeamPositionOverridden) { // beam position is updated only at first occurrence of the vertex. A bit sketchy if we have past/future vertices, it should not impact too much.
       const float w = vertex.getNContributors();
       mBeamPos[0] = (mBeamPos[0] * mBeamPosWeight + vertex.getX() * w) / (mBeamPosWeight + w);
       mBeamPos[1] = (mBeamPos[1] * mBeamPosWeight + vertex.getY() * w) / (mBeamPosWeight + w);
       mBeamPosWeight += w;
     }
   }
-  mROFramesPV.push_back(mPrimaryVertices.size());
-}
-
-template <int nLayers>
-void TimeFrame<nLayers>::addPrimaryVertices(const bounded_vector<Vertex>& vertices, const int rofId, const int iteration)
-{
-  addPrimaryVertices(gsl::span<const Vertex>(vertices), rofId, iteration);
+  mROFramesPV.push_back(mPrimaryVertices.size()); // current rof must have number of vertices up to present
 }
 
 template <int nLayers>
@@ -119,34 +114,6 @@ void TimeFrame<nLayers>::addPrimaryVerticesContributorLabelsInROF(const bounded_
   mVerticesContributorLabels.insert(mVerticesContributorLabels.begin() + n, labels.begin(), labels.end());
 }
 
-template <int nLayers>
-void TimeFrame<nLayers>::addPrimaryVertices(const gsl::span<const Vertex>& vertices, const int rofId, const int iteration)
-{
-  bounded_vector<Vertex> futureVertices(mMemoryPool.get());
-  for (const auto& vertex : vertices) {
-    if (vertex.getTimeStamp().getTimeStamp() < rofId) { // put a copy in the past
-      insertPastVertex(vertex, iteration);
-    } else {
-      if (vertex.getTimeStamp().getTimeStamp() > rofId) { // or put a copy in the future
-        futureVertices.emplace_back(vertex);
-      }
-    }
-    mPrimaryVertices.emplace_back(vertex); // put a copy in the present
-    mTotVertPerIteration[iteration]++;
-    if (!isBeamPositionOverridden) { // beam position is updated only at first occurrence of the vertex. A bit sketchy if we have past/future vertices, it should not impact too much.
-      const float w = vertex.getNContributors();
-      mBeamPos[0] = (mBeamPos[0] * mBeamPosWeight + vertex.getX() * w) / (mBeamPosWeight + w);
-      mBeamPos[1] = (mBeamPos[1] * mBeamPosWeight + vertex.getY() * w) / (mBeamPosWeight + w);
-      mBeamPosWeight += w;
-    }
-  }
-  mROFramesPV.push_back(mPrimaryVertices.size()); // current rof must have number of vertices up to present
-  for (auto& vertex : futureVertices) {
-    mPrimaryVertices.emplace_back(vertex);
-    mTotVertPerIteration[iteration]++;
-  }
-}
-
 template <int nLayers>
 int TimeFrame<nLayers>::loadROFrameData(gsl::span<o2::itsmft::ROFRecord> rofs,
                                         gsl::span<const itsmft::CompClusterExt> clusters,

Detectors/ITSMFT/ITS/tracking/src/TrackingInterface.cxx

@@ -165,7 +165,7 @@ void ITSTrackingInterface::run(framework::ProcessingContext& pc)
   gsl::span<const std::pair<MCCompLabel, float>> vMCRecInfo;
   gsl::span<const MCCompLabel> vMCContLabels;
   for (auto iRof{0}; iRof < trackROFspan.size(); ++iRof) {
-    std::vector<Vertex> vtxVecLoc;
+    bounded_vector<Vertex> vtxVecLoc;
     auto& vtxROF = vertROFvec.emplace_back(trackROFspan[iRof]);
     vtxROF.setFirstEntry(vertices.size());
     if (mRunVertexer) {
@@ -223,7 +223,7 @@ void ITSTrackingInterface::run(framework::ProcessingContext& pc)
       for (auto& v : vtxVecLoc) {
         vertices.push_back(v);
       }
-      mTimeFrame->addPrimaryVertices(vtxVecLoc, iRof, 0);
+      mTimeFrame->addPrimaryVertices(vtxVecLoc, 0);
     }
   }
   if (mRunVertexer) {

Detectors/ITSMFT/ITS/tracking/src/VertexerTraits.cxx

@@ -520,7 +520,7 @@ void VertexerTraits::computeVertices(const int iteration)
       }
     }
     if (!iteration) {
-      mTimeFrame->addPrimaryVertices(vertices, rofId, iteration);
+      mTimeFrame->addPrimaryVertices(vertices, iteration);
       if (mTimeFrame->hasMCinformation()) {
         mTimeFrame->addPrimaryVerticesLabels(polls);
         if (mVrtParams[iteration].outputContLabels) {
@@ -625,7 +625,7 @@ void VertexerTraits::addTruthSeedingVertices()
     } else {
       mTimeFrame->getNoVertexROF()++;
     }
-    mTimeFrame->addPrimaryVertices(verts, iROF, 0);
+    mTimeFrame->addPrimaryVertices(verts, 0);
     mTimeFrame->addPrimaryVerticesLabels(polls);
   }
   LOGP(info, "Found {}/{} ROFs with {} vertices -> <NV>={:.2f}", vertices.size(), mTimeFrame->getNrof(), nVerts, (float)nVerts / (float)vertices.size());