[ALICE3] Adapt CA for 2T simulations (#15075)

Author: mpuccio

Detectors/Upgrades/ALICE3/TRK/reconstruction/include/TRKReconstruction/TimeFrame.h

@@ -62,9 +62,6 @@ class TimeFrame : public o2::its::TimeFrame<nLayers>
   /// \param nEvents Number of events to process
   /// \param inROFpileup Number of events per ROF
   void getPrimaryVerticesFromMC(TTree* mcHeaderTree, int nRofs, Long64_t nEvents, int inROFpileup);
-
- private:
-  ClassDefNV(TimeFrame, 1);
 };
 
 } // namespace trk

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

@@ -64,10 +64,12 @@ int TimeFrame<nLayers>::loadROFsFromHitTree(TTree* hitsTree, GeometryTGeo* gman,
       }
       int subDetID = gman->getSubDetID(hit.GetDetectorID());
       const int layer = startLayer[subDetID] + gman->getLayer(hit.GetDetectorID());
+      if (layer >= nLayers) {
+        continue;
+      }
       ++clusterCountPerLayer[layer];
       totalNHits++;
     }
-    trkHit->clear();
   }
 
   // Reserve memory for all layers
@@ -106,6 +108,9 @@ int TimeFrame<nLayers>::loadROFsFromHitTree(TTree* hitsTree, GeometryTGeo* gman,
       o2::math_utils::Point3D<float> gloXYZ;
       o2::math_utils::Point3D<float> trkXYZ;
       float r{0.f};
+      if (layer >= nLayers) {
+        continue;
+      }
       if (layer >= 3) {
         int chipID = hit.GetDetectorID();
         alpha = gman->getSensorRefAlphaMLOT(chipID);

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

@@ -10,11 +10,13 @@
 // or submit itself to any jurisdiction.
 
 #include <vector>
+#include <chrono>
 
 #include "DetectorsBase/GeometryManager.h"
 #include "ITStracking/TimeFrame.h"
 #include "ITStracking/Configuration.h"
 #include "Field/MagneticField.h"
+#include "Field/MagFieldParam.h"
 #include "Framework/ControlService.h"
 #include "Framework/ConfigParamRegistry.h"
 #include "Framework/CCDBParamSpec.h"
@@ -276,7 +278,7 @@ void TrackerDPL::run(ProcessingContext& pc)
     itsTrackerTraits.adoptTimeFrame(static_cast<o2::its::TimeFrame<11>*>(&timeFrame));
     itsTracker.adoptTimeFrame(timeFrame);
     itsTrackerTraits.setBz(mHitRecoConfig["geometry"]["bz"].get<float>());
-    auto field = o2::field::MagneticField::createNominalField(std::round(mHitRecoConfig["geometry"]["bz"].get<float>()), true);
+    auto field = new field::MagneticField("ALICE3Mag", "ALICE 3 Magnetic Field", mHitRecoConfig["geometry"]["bz"].get<float>() / 5.f, 0.0, o2::field::MagFieldParam::k5kGUniform);
     TGeoGlobalMagField::Instance()->SetField(field);
     TGeoGlobalMagField::Instance()->Lock();
 
@@ -291,6 +293,7 @@ void TrackerDPL::run(ProcessingContext& pc)
 
     itsTrackerTraits.updateTrackingParameters(trackingParams);
 
+    const auto trackingLoopStart = std::chrono::steady_clock::now();
     for (size_t iter{0}; iter < trackingParams.size(); ++iter) {
       LOGP(info, "{}", trackingParams[iter].asString());
       timeFrame.initialise(iter, trackingParams[iter], 11, false);
@@ -304,6 +307,8 @@ void TrackerDPL::run(ProcessingContext& pc)
       LOGP(info, "Number of roads in iteration {}: {}", iter, timeFrame.getNumberOfTracks());
       itsTrackerTraits.extendTracks(iter);
     }
+    const auto trackingLoopElapsedMs = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::steady_clock::now() - trackingLoopStart).count();
+    LOGP(info, "Tracking iterations block took {} ms", trackingLoopElapsedMs);
 
     itsTracker.computeTracksMClabels();