Update ACTS clusterer

Author: njacazio

Detectors/Upgrades/ALICE3/IOTOF/simulation/src/Layer.cxx

@@ -287,14 +287,15 @@ void OTOFLayer::createLayer(TGeoVolume* motherVolume)
     case kBarrelSegmented: {
       // First we create the volume for the whole layer, which will be used as mother volume for the segments
       const double avgRadius = 0.5 * (mInnerRadius + mOuterRadius);
-      TGeoTube* layer = new TGeoTube(mInnerRadius, mOuterRadius, mZLength / 2);
+      const double staveSizeX = mStaves.second;                                                                                                          // cm
+      const double staveSizeY = mOuterRadius - mInnerRadius;                                                                                             // cm
+      const double staveSizeZ = mZLength;                                                                                                                // cm
+      const double deltaForTilt = 0.5 * (std::sin(TMath::DegToRad() * mTiltAngle) * staveSizeX + std::cos(TMath::DegToRad() * mTiltAngle) * staveSizeY); // we increase the size of the layer to account for the tilt of the staves
+      TGeoTube* layer = new TGeoTube(mInnerRadius - deltaForTilt, mOuterRadius + deltaForTilt, mZLength / 2);
       TGeoVolume* layerVol = new TGeoVolume(mLayerName.c_str(), layer, medAir);
       setLayerStyle(layerVol);
 
       // Now we create the volume for a single stave
-      const double staveSizeX = mStaves.second;              // cm
-      const double staveSizeY = mOuterRadius - mInnerRadius; // cm
-      const double staveSizeZ = mZLength;                    // cm
       TGeoBBox* stave = new TGeoBBox(staveSizeX * 0.5, staveSizeY * 0.5, staveSizeZ * 0.5);
       TGeoVolume* staveVol = new TGeoVolume(staveName, stave, medAir);
       setStaveStyle(staveVol);

Detectors/Upgrades/ALICE3/TRK/reconstruction/src/ClustererACTS.cxx

@@ -21,6 +21,7 @@
 
 using namespace o2::trk;
 
+// Data formats for ACTS interface
 struct Cell2D {
   Cell2D(int rowv, int colv) : row(rowv), col(colv) {}
   int row, col;
@@ -196,6 +197,8 @@ void ClustererACTS::process(gsl::span<const Digit> digits,
                                                                     collection,
                                                                     Acts::Ccl::DefaultConnect<Cell, 2>(false));
 
+    LOG(debug) << "Clustering with ACTS, found " << collection.size() << " clusters in ROF " << iROF;
+
     // Sort digit indices within this ROF by (chipID, col, row) so we can process
     // chip by chip, column by column -- the same ordering the ALPIDE scanner expects.
     mSortIdx.resize(nEntries);

Detectors/Upgrades/ALICE3/TRK/workflow/src/ClustererSpec.cxx

@@ -111,7 +111,12 @@ o2::framework::DataProcessorSpec getClustererSpec(bool useMC)
     inputs,
     outputs,
     o2::framework::AlgorithmSpec{o2::framework::adaptFromTask<o2::trk::ClustererDPL>(useMC)},
-    o2::framework::Options{{"nthreads", o2::framework::VariantType::Int, 1, {"Number of clustering threads"}}}};
+    o2::framework::Options{{"nthreads", o2::framework::VariantType::Int, 1, {"Number of clustering threads"}}
+#ifdef O2_WITH_ACTS
+                           ,
+                           {"useACTS", o2::framework::VariantType::Bool, false, {"Use ACTS for clustering"}}
+#endif
+    }};
 }
 
 } // namespace o2::trk