Fix conflicts

Author: fgrosa

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

@@ -202,6 +202,8 @@ class TimeFrame
   void addTrackingFrameInfoToLayer(int layer, T&&... args);
   void addClusterExternalIndexToLayer(int layer, const int idx);
 
+  void resizeVectors(int nLayers);
+
   /// Debug and printing
   void checkTrackletLUTs();
   void printROFoffsets();

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

@@ -136,7 +136,7 @@ inline const int4 TrackerTraits::getBinsRect(const Cluster& currentCluster, int
 
 inline void TrackerTraits::initialiseTimeFrame(const int iteration)
 {
-  mTimeFrame->initialise(iteration, mTrkParams[iteration], 7);
+  mTimeFrame->initialise(iteration, mTrkParams[iteration], mTrkParams[iteration].NLayers);
   setIsGPU(false);
 }
 

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

@@ -455,6 +455,20 @@ void TimeFrame::checkTrackletLUTs()
   }
 }
 
+void TimeFrame::resizeVectors(int nLayers)
+{
+  mMinR.resize(nLayers, 10000.);
+  mMaxR.resize(nLayers, -1.);
+  mClusters.resize(nLayers);
+  mUnsortedClusters.resize(nLayers);
+  mTrackingFrameInfo.resize(nLayers);
+  mClusterExternalIndices.resize(nLayers);
+  mUsedClusters.resize(nLayers);
+  mROframesClusters.resize(nLayers, {0});
+  mNClustersPerROF.resize(nLayers);
+  mTrackletsIndexROf.resize(2, {0});
+}
+
 void TimeFrame::printTrackletLUTonLayer(int i)
 {
   std::cout << "--------" << std::endl