Update TrackUtilities.h

Author: njacazio

ALICE3/Core/TrackUtilities.h

@@ -19,11 +19,9 @@
 #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 <vector>
 #include "TLorentzVector.h"
 
 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);