Merge branch 'AliceO2Group:master' into master

Author: amatyja

ALICE3/CMakeLists.txt

@@ -14,4 +14,4 @@ add_subdirectory(Core)
 # add_subdirectory(DataModel)
 add_subdirectory(Tasks)
 add_subdirectory(TableProducer)
-add_subdirectory(Tools)
+# add_subdirectory(Tools)

ALICE3/Core/CMakeLists.txt

@@ -11,6 +11,7 @@
 
 o2physics_add_library(ALICE3Core
                       SOURCES TOFResoALICE3.cxx
+                              TrackUtilities.cxx
                               DelphesO2TrackSmearer.cxx
                       PUBLIC_LINK_LIBRARIES O2::Framework
                                             O2Physics::AnalysisCore)

ALICE3/Core/DelphesO2LutWriter.cxx

@@ -8,24 +8,27 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-
-///
-/// @file DelphesO2LutWriter.h
-/// @brief Porting to O2Physics of DelphesO2 code.
+/// \file DelphesO2LutWriter.h
+/// \brief Porting to O2Physics of DelphesO2 code.
 ///        Minimal changes have been made to the original code for adaptation purposes, formatting and commented parts have been considered.
 ///        Relevant sources:
 ///                 DelphesO2/src/lutWrite.cc https://github.com/AliceO2Group/DelphesO2/blob/master/src/lutWrite.cc
-/// @author: Roberto Preghenella
-/// @email: preghenella@bo.infn.it
+/// \author: Roberto Preghenella
+/// \email: preghenella@bo.infn.it
 ///
 
 #ifndef ALICE3_CORE_DELPHESO2LUTWRITER_H_
 #define ALICE3_CORE_DELPHESO2LUTWRITER_H_
 
 #include "ALICE3/Core/DelphesO2TrackSmearer.h"
 #include "ALICE3/Core/FastTracker.h"
+
+#include "ReconstructionDataFormats/PID.h"
+
 #include "TGraph.h"
 
+#include <string>
+
 namespace o2::fastsim
 {
 class DelphesO2LutWriter
@@ -34,7 +37,33 @@ class DelphesO2LutWriter
   DelphesO2LutWriter() = default;
   virtual ~DelphesO2LutWriter() = default;
 
+  // Setters
+  void setBinningNch(bool log, int nbins, float min, float max) { mNchBinning = {log, nbins, min, max}; }
+  void setBinningRadius(bool log, int nbins, float min, float max) { mRadiusBinning = {log, nbins, min, max}; }
+  void setBinningEta(bool log, int nbins, float min, float max) { mEtaBinning = {log, nbins, min, max}; }
+  void setBinningPt(bool log, int nbins, float min, float max) { mPtBinning = {log, nbins, min, max}; }
+  void setEtaMaxBarrel(float eta) { etaMaxBarrel = eta; }
+  void setAtLeastHits(int n) { mAtLeastHits = n; }
+  void setAtLeastCorr(int n) { mAtLeastCorr = n; }
+  void setAtLeastFake(int n) { mAtLeastFake = n; }
+  bool fatSolve(lutEntry_t& lutEntry,
+                float pt = 0.1,
+                float eta = 0.0,
+                const float mass = o2::track::pid_constants::sMasses[o2::track::PID::Pion],
+                size_t itof = 0,
+                size_t otof = 0,
+                int q = 1,
+                const float nch = 1);
+
+  void print() const;
+  bool fwdSolve(float* covm, float pt = 0.1, float eta = 0.0, float mass = o2::track::pid_constants::sMasses[o2::track::PID::Pion]);
+  bool fwdPara(lutEntry_t& lutEntry, float pt = 0.1, float eta = 0.0, float mass = o2::track::pid_constants::sMasses[o2::track::PID::Pion], float Bfield = 0.5);
+  void lutWrite(const char* filename = "lutCovm.dat", int pdg = 211, float field = 0.2, size_t itof = 0, size_t otof = 0);
+  TGraph* lutRead(const char* filename, int pdg, int what, int vs, float nch = 0., float radius = 0., float eta = 0., float pt = 0.);
+
   o2::fastsim::FastTracker fat;
+
+ private:
   void diagonalise(lutEntry_t& lutEntry);
   float etaMaxBarrel = 1.75f;
   bool usePara = true;        // use fwd parameterisation
@@ -44,23 +73,19 @@ class DelphesO2LutWriter
   int mAtLeastHits = 4;
   int mAtLeastCorr = 4;
   int mAtLeastFake = 0;
-  void SetAtLeastHits(int n) { mAtLeastHits = n; }
-  void SetAtLeastCorr(int n) { mAtLeastCorr = n; }
-  void SetAtLeastFake(int n) { mAtLeastFake = n; }
 
-  void printLutWriterConfiguration();
-  bool fatSolve(lutEntry_t& lutEntry,
-                float pt = 0.1,
-                float eta = 0.0,
-                const float mass = 0.13957000,
-                int itof = 0,
-                int otof = 0,
-                int q = 1,
-                const float nch = 1);
-  bool fwdSolve(float* covm, float pt = 0.1, float eta = 0.0, float mass = 0.13957000);
-  bool fwdPara(lutEntry_t& lutEntry, float pt = 0.1, float eta = 0.0, float mass = 0.13957000, float Bfield = 0.5);
-  void lutWrite(const char* filename = "lutCovm.dat", int pdg = 211, float field = 0.2, int itof = 0, int otof = 0);
-  TGraph* lutRead(const char* filename, int pdg, int what, int vs, float nch = 0., float radius = 0., float eta = 0., float pt = 0.);
+  // Binning of the LUT to make
+  struct LutBinning {
+    bool log;
+    int nbins;
+    float min;
+    float max;
+    std::string toString() const;
+  };
+  LutBinning mNchBinning = {true, 20, 0.5f, 3.5f};
+  LutBinning mRadiusBinning = {false, 1, 0.0f, 100.0f};
+  LutBinning mEtaBinning = {false, 80, -4.0f, 4.0f};
+  LutBinning mPtBinning = {true, 200, -2.0f, 2.0f};
 
   ClassDef(DelphesO2LutWriter, 1);
 };

ALICE3/Core/DelphesO2LutWriter.h

@@ -368,7 +368,9 @@ int FastTracker::FastTrack(o2::track::TrackParCov inputTrack, o2::track::TrackPa
     }
 
     if (layers[il].isInert()) {
-      LOG(info) << "Skipping inert layer: " << layers[il].getName() << " at radius " << layers[il].getRadius() << " cm";
+      if (mVerboseLevel > 0) {
+        LOG(info) << "Skipping inert layer: " << layers[il].getName() << " at radius " << layers[il].getRadius() << " cm";
+      }
       continue; // inert layer, skip
     }
 

ALICE3/Core/FastTracker.cxx

@@ -0,0 +1,40 @@
+// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
+// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
+// All rights not expressly granted are reserved.
+//
+// This software is distributed under the terms of the GNU General Public
+// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
+//
+// In applying this license CERN does not waive the privileges and immunities
+// granted to it by virtue of its status as an Intergovernmental Organization
+// or submit itself to any jurisdiction.
+///
+/// \file   TrackUtilities.cxx
+/// \author Nicolò Jacazio, Universita del Piemonte Orientale (IT)
+/// \brief  Set of utilities for the ALICE3 track handling
+/// \since  May 21, 2025
+///
+
+#include "TrackUtilities.h"
+
+#include <vector>
+
+void o2::upgrade::convertTLorentzVectorToO2Track(const int charge,
+                                                 const TLorentzVector particle,
+                                                 const std::vector<double> productionVertex,
+                                                 o2::track::TrackParCov& o2track)
+{
+  std::array<float, 5> params;
+  std::array<float, 15> covm = {0.};
+  float s, c, x;
+  o2::math_utils::sincos(static_cast<float>(particle.Phi()), s, c);
+  o2::math_utils::rotateZInv(static_cast<float>(productionVertex[0]), static_cast<float>(productionVertex[1]), x, params[0], s, c);
+  params[1] = static_cast<float>(productionVertex[2]);
+  params[2] = 0.; // since alpha = phi
+  const auto theta = 2. * std::atan(std::exp(-particle.PseudoRapidity()));
+  params[3] = 1. / std::tan(theta);
+  params[4] = charge / particle.Pt();
+
+  // Initialize TrackParCov in-place
+  new (&o2track)(o2::track::TrackParCov)(x, particle.Phi(), params, covm);
+}

ALICE3/Core/TrackUtilities.cxx

@@ -9,23 +9,21 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 ///
-/// \file TrackUtilities.h
-///
-/// \brief Set of utilities for the ALICE3 track handling
-///
+/// \file   TrackUtilities.h
+/// \author Nicolò Jacazio, Universita del Piemonte Orientale (IT)
+/// \brief  Set of utilities for the ALICE3 track handling
 /// \since  May 21, 2025
 ///
 
 #ifndef ALICE3_CORE_TRACKUTILITIES_H_
 #define ALICE3_CORE_TRACKUTILITIES_H_
 
-#include <vector>
-
 #include "ReconstructionDataFormats/Track.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "Framework/AnalysisHelpers.h"
+
 #include "TLorentzVector.h"
 
+#include <vector>
+
 namespace o2::upgrade
 {
 
@@ -37,34 +35,20 @@ namespace o2::upgrade
 void convertTLorentzVectorToO2Track(const int charge,
                                     const TLorentzVector particle,
                                     const std::vector<double> productionVertex,
-                                    o2::track::TrackParCov& o2track)
-{
-  std::array<float, 5> params;
-  std::array<float, 15> covm = {0.};
-  float s, c, x;
-  o2::math_utils::sincos(static_cast<float>(particle.Phi()), s, c);
-  o2::math_utils::rotateZInv(static_cast<float>(productionVertex[0]), static_cast<float>(productionVertex[1]), x, params[0], s, c);
-  params[1] = static_cast<float>(productionVertex[2]);
-  params[2] = 0.; // since alpha = phi
-  const auto theta = 2. * std::atan(std::exp(-particle.PseudoRapidity()));
-  params[3] = 1. / std::tan(theta);
-  params[4] = charge / particle.Pt();
-
-  // Initialize TrackParCov in-place
-  new (&o2track)(o2::track::TrackParCov)(x, particle.Phi(), params, covm);
-}
+                                    o2::track::TrackParCov& o2track);
 
 /// Function to convert a TLorentzVector into a perfect Track
 /// \param pdgCode particle pdg
 /// \param particle the particle to convert (TLorentzVector)
 /// \param productionVertex where the particle was produced
 /// \param o2track the address of the resulting TrackParCov
 /// \param pdg the pdg service
+template <typename PdgService>
 void convertTLorentzVectorToO2Track(int pdgCode,
                                     TLorentzVector particle,
                                     std::vector<double> productionVertex,
                                     o2::track::TrackParCov& o2track,
-                                    const o2::framework::Service<o2::framework::O2DatabasePDG>& pdg)
+                                    const PdgService& pdg)
 {
   const auto pdgInfo = pdg->GetParticle(pdgCode);
   int charge = 0;
@@ -78,10 +62,10 @@ void convertTLorentzVectorToO2Track(int pdgCode,
 /// \param particle the particle to convert (mcParticle)
 /// \param o2track the address of the resulting TrackParCov
 /// \param pdg the pdg service
-template <typename McParticleType>
+template <typename McParticleType, typename PdgService>
 void convertMCParticleToO2Track(McParticleType& particle,
                                 o2::track::TrackParCov& o2track,
-                                const o2::framework::Service<o2::framework::O2DatabasePDG>& pdg)
+                                const PdgService& pdg)
 {
   static TLorentzVector tlv;
   tlv.SetPxPyPzE(particle.px(), particle.py(), particle.pz(), particle.e());
@@ -92,9 +76,9 @@ void convertMCParticleToO2Track(McParticleType& particle,
 /// \param particle the particle to convert (mcParticle)
 /// \param o2track the address of the resulting TrackParCov
 /// \param pdg the pdg service
-template <typename McParticleType>
+template <typename McParticleType, typename PdgService>
 o2::track::TrackParCov convertMCParticleToO2Track(McParticleType& particle,
-                                                  const o2::framework::Service<o2::framework::O2DatabasePDG>& pdg)
+                                                  const PdgService& pdg)
 {
   o2::track::TrackParCov o2track;
   convertMCParticleToO2Track(particle, o2track, pdg);