Merge branch 'dev' into fix

Author: atriolo

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

@@ -299,7 +299,7 @@ struct TimeFrame {
   virtual bool isGPU() const noexcept { return false; }
   virtual const char* getName() const noexcept { return "CPU"; }
 
- private:
+ protected:
   void prepareClusters(const TrackingParameters& trkParam, const int maxLayers = nLayers);
   float mBz = 5.;
   unsigned int mNTotalLowPtVertices = 0;

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

@@ -72,6 +72,7 @@ class Tracker
   bool isMatLUT() const { return mTraits->isMatLUT(); }
   void setNThreads(int n, std::shared_ptr<tbb::task_arena>& arena) { mTraits->setNThreads(n, arena); }
   void printSummary() const;
+  void computeTracksMClabels();
 
  private:
   void initialiseTimeFrame(int iteration) { mTraits->initialiseTimeFrame(iteration); }
@@ -84,7 +85,6 @@ class Tracker
 
   // MC interaction
   void computeRoadsMClabels();
-  void computeTracksMClabels();
   void rectifyClusterIndices();
 
   template <typename... T, typename... F>

Detectors/Upgrades/ALICE3/FT3/simulation/src/FT3Module.cxx

@@ -108,7 +108,7 @@ void FT3Module::create_layout(double mZ, int layerNumber, int direction, double
 
   double carbonFiberThickness = 0.01;
 
-  double foamSpacingThickness = 0.5;
+  double foamSpacingThickness = 1.0;
 
   int dist_offset = 0;
 

Detectors/Upgrades/ALICE3/TRK/CMakeLists.txt

@@ -12,4 +12,5 @@
 add_subdirectory(base)
 add_subdirectory(macros)
 add_subdirectory(simulation)
-add_subdirectory(workflow)
+add_subdirectory(reconstruction)
+add_subdirectory(workflow)

Detectors/Upgrades/ALICE3/TRK/base/include/TRKBase/TRKBaseParam.h

@@ -31,6 +31,13 @@ enum eLayout {
   kStaggered,
 };
 
+enum eVDLayout {
+  kIRIS4 = 0,
+  kIRISFullCyl,
+  kIRIS5,
+  kIRIS4a,
+};
+
 struct TRKBaseParam : public o2::conf::ConfigurableParamHelper<TRKBaseParam> {
   std::string configFile = "";
   float serviceTubeX0 = 0.02f; // X0 Al2O3
@@ -40,9 +47,11 @@ struct TRKBaseParam : public o2::conf::ConfigurableParamHelper<TRKBaseParam> {
 
   eLayout layoutML = kTurboStaves; // Type of segmentation for the middle layers
   eLayout layoutOL = kStaggered;   // Type of segmentation for the outer layers
+  eVDLayout layoutVD = kIRIS4;     // VD detector layout design
 
   eLayout getLayoutML() const { return layoutML; }
   eLayout getLayoutOL() const { return layoutOL; }
+  eVDLayout getLayoutVD() const { return layoutVD; }
 
   O2ParamDef(TRKBaseParam, "TRKBase");
 };

Detectors/Upgrades/ALICE3/TRK/macros/test/CMakeLists.txt

@@ -18,4 +18,14 @@ o2_add_test_root_macro(CheckDigits.C
                                              O2::SimulationDataFormat
                                              O2::DetectorsBase
                                              O2::Steer
+                       LABELS trk COMPILE_ONLY)
+
+o2_add_test_root_macro(CheckTracksCA.C
+                       PUBLIC_LINK_LIBRARIES O2::DataFormatsITS
+                                             O2::ITStracking
+                                             O2::SimulationDataFormat
+                                             O2::DetectorsBase
+                                             O2::TRKBase
+                                             O2::TRKSimulation
+                                             O2::Steer
                        LABELS trk COMPILE_ONLY)