Move modifications to ITS code in dedicated PR

Author: fgrosa

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

@@ -48,8 +48,13 @@ class IndexTableUtils
   int mNzBins = 0;
   int mNphiBins = 0;
   float mInversePhiBinSize = 0.f;
+<<<<<<< HEAD
   float mLayerZ[8] = {0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f};
   float mInverseZBinSize[8] = {0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f};
+=======
+  float mLayerZ[7] = {0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f};
+  float mInverseZBinSize[7] = {0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f};
+>>>>>>> Move modifications to ITS code in dedicated PR
 };
 
 template <class T>
@@ -58,10 +63,6 @@ inline void IndexTableUtils::setTrackingParameters(const T& params)
   mInversePhiBinSize = params.PhiBins / constants::math::TwoPi;
   mNzBins = params.ZBins;
   mNphiBins = params.PhiBins;
-  if (params.LayerZ.size() > 7) {
-    mLayerZ.resize(params.LayerZ.size());
-    mInverseZBinSize.resize(params.LayerZ.size());
-  }
   for (int iLayer{0}; iLayer < params.LayerZ.size(); ++iLayer) {
     mLayerZ[iLayer] = params.LayerZ[iLayer];
   }

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

@@ -202,8 +202,6 @@ 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,17 +136,17 @@ inline const int4 TrackerTraits::getBinsRect(const Cluster& currentCluster, int
 
 inline void TrackerTraits::initialiseTimeFrame(const int iteration)
 {
-  mTimeFrame->initialise(iteration, mTrkParams[iteration], mTrkParams[iteration].NLayers);
+  mTimeFrame->initialise(iteration, mTrkParams[iteration], 7);
   setIsGPU(false);
 }
 
 inline const int4 TrackerTraits::getBinsRect(const int layerIndex, float phi, float maxdeltaphi,
                                              float z1, float z2, float maxdeltaz)
 {
   const float zRangeMin = o2::gpu::GPUCommonMath::Min(z1, z2) - maxdeltaz;
-  const float phiRangeMin = phi - maxdeltaphi;
+  const float phiRangeMin = o2::gpu::GPUCommonMath::Max(-constants::math::TwoPi, phi - maxdeltaphi);
   const float zRangeMax = o2::gpu::GPUCommonMath::Max(z1, z2) + maxdeltaz;
-  const float phiRangeMax = phi + maxdeltaphi;
+  const float phiRangeMax = o2::gpu::GPUCommonMath::Min(phi + maxdeltaphi, 2 * constants::math::TwoPi);
 
   if (zRangeMax < -mTrkParams[0].LayerZ[layerIndex + 1] ||
       zRangeMin > mTrkParams[0].LayerZ[layerIndex + 1] || zRangeMin > zRangeMax) {

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

@@ -455,20 +455,6 @@ 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

Detectors/Upgrades/ITS3/README.md

@@ -99,4 +99,7 @@ As above, it is important to provide the correct run number using `-—configKey
 
 If the `FourLayers` geometry was used in the simulation, it should be set also for the reconstruction to set properly the tracker to work with the additional layer. If something else of the geometry was set differently (`mRadii`, `mLength`, `mGapY`, `mGapPhi`, `mGapXDirection4thLayer`, or `mDetectorThickness`), it is necessary to remap the file with the geometry to replace the one on the CCDB, which would be different. This can be done by copying the `o2sim_geometry-aligned.root` file created during the simulation to a directory called `GLO/Config/GeometryAligned`, with the name `snapshot.root` in a local path of choice. Then, the following argument has to be added to the reco workflow: `--condition-remap "file://local_path=GLO/Config/GeometryAligned"`.
 
-<!-- > **_NOTE:_**  reconstruction for the `FourLayers` geometry is not implemented yet. -->
+> **_NOTE:_**  in order to make the reconstruction for the `FourLayers` geometry work, the following line has to be added to the CMake options in the [o2.sh](https://github.com/alisw/alidist/blob/master/o2.sh) recipe in alidist:
+```bash
+${ENABLE_ITS3_4L:+-DENABLE_ITS3_4L=ON}
+```