Merge remote-tracking branch 'refs/remotes/upstream/master'

Author: MattOckleton

.github/workflows/clean-test.yml

@@ -34,6 +34,11 @@ name: Clean PR checks
         type: boolean
         default: true
 
+      'check_build/O2Physics/staging':
+        description: build/O2Physics/staging
+        type: boolean
+        default: true
+
 permissions: {}
 
 jobs:

ALICE3/Core/ALICE3CoreLinkDef.h

@@ -13,6 +13,5 @@
 #pragma link off all classes;
 #pragma link off all functions;
 
-#pragma link C++ class o2::pid::tof::TOFResoALICE3 + ;
 #pragma link C++ class std::vector < std::vector < unsigned int>> + ;
 #pragma link C++ class std::vector < std::vector < std::uint32_t>> + ;

ALICE3/Core/CMakeLists.txt

@@ -10,30 +10,30 @@
 # or submit itself to any jurisdiction.
 
 o2physics_add_library(ALICE3Core
-                      SOURCES TOFResoALICE3.cxx
-                              TrackUtilities.cxx
-                              DelphesO2TrackSmearer.cxx
+                      SOURCES TrackUtilities.cxx
+                              FlatLutEntry.cxx
+                              FlatTrackSmearer.cxx
                               GeometryContainer.cxx
                       PUBLIC_LINK_LIBRARIES O2::Framework
                                             O2Physics::AnalysisCore)
 
 o2physics_target_root_dictionary(ALICE3Core
-                      HEADERS TOFResoALICE3.h
-                              TrackUtilities.h
-                              DelphesO2TrackSmearer.h
+                      HEADERS TrackUtilities.h
+                              FlatLutEntry.h
                               GeometryContainer.h
                       LINKDEF ALICE3CoreLinkDef.h)
 
 o2physics_add_library(FastTracker
                       SOURCES FastTracker.cxx
                               DetLayer.cxx
-                              DelphesO2LutWriter.cxx
+                              FlatLutEntry.cxx
+                              FlatLutWriter.cxx
                       PUBLIC_LINK_LIBRARIES O2::Framework
                                             O2Physics::AnalysisCore
                                             O2Physics::ALICE3Core)
 
 o2physics_target_root_dictionary(FastTracker
                       HEADERS FastTracker.h
                               DetLayer.h
-                              DelphesO2LutWriter.h
+                              FlatLutWriter.h
                       LINKDEF FastTrackerLinkDef.h)

ALICE3/Core/Decayer.h

@@ -30,7 +30,6 @@
 #include <TLorentzVector.h>
 #include <TRandom3.h>
 
-#include <array>
 #include <cmath>
 #include <cstddef>
 #include <vector>
@@ -47,46 +46,49 @@ class Decayer
   Decayer() = default;
 
   template <typename TDatabase>
-  std::vector<o2::upgrade::OTFParticle> decayParticle(const TDatabase& pdgDB, const o2::track::TrackParCov& track, const int pdgCode)
+  std::vector<o2::upgrade::OTFParticle> decayParticle(const TDatabase& pdgDB, const OTFParticle& particle)
   {
-    const auto& particleInfo = pdgDB->GetParticle(pdgCode);
+    const auto& particleInfo = pdgDB->GetParticle(particle.pdgCode());
+    if (!particleInfo) {
+      return {};
+    }
+
     const int charge = particleInfo->Charge() / 3;
     const double mass = particleInfo->Mass();
-    std::array<float, 3> mom;
-    std::array<float, 3> pos;
-    track.getPxPyPzGlo(mom);
-    track.getXYZGlo(pos);
 
-    const double u = mRand3.Uniform(0, 1);
+    const double u = mRand3.Uniform(0.001, 0.999);
     const double ctau = o2::constants::physics::LightSpeedCm2S * particleInfo->Lifetime(); // cm
-    const double betaGamma = track.getP() / mass;
+    const double betaGamma = particle.p() / mass;
     const double rxyz = -betaGamma * ctau * std::log(1 - u);
     double vx, vy, vz;
     double px, py, e;
 
     if (!charge) {
-      vx = pos[0] + rxyz * (mom[0] / track.getP());
-      vy = pos[1] + rxyz * (mom[1] / track.getP());
-      vz = pos[2] + rxyz * (mom[2] / track.getP());
-      px = mom[0];
-      py = mom[1];
+      vx = particle.vx() + rxyz * (particle.px() / particle.p());
+      vy = particle.vy() + rxyz * (particle.py() / particle.p());
+      vz = particle.vz() + rxyz * (particle.pz() / particle.p());
+      px = particle.px();
+      py = particle.py();
     } else {
-      float sna, csa;
+      o2::track::TrackParCov track;
       o2::math_utils::CircleXYf_t circle;
+      o2::upgrade::convertOTFParticleToO2Track(particle, track, pdgDB);
+
+      float sna, csa;
       track.getCircleParams(mBz, circle, sna, csa);
       const double rxy = rxyz / std::sqrt(1. + track.getTgl() * track.getTgl());
       const double theta = rxy / circle.rC;
 
-      vx = ((pos[0] - circle.xC) * std::cos(theta) - (pos[1] - circle.yC) * std::sin(theta)) + circle.xC;
-      vy = ((pos[1] - circle.yC) * std::cos(theta) + (pos[0] - circle.xC) * std::sin(theta)) + circle.yC;
-      vz = mom[2] + rxyz * (mom[2] / track.getP());
+      vx = ((particle.vx() - circle.xC) * std::cos(theta) - (particle.vy() - circle.yC) * std::sin(theta)) + circle.xC;
+      vy = ((particle.vy() - circle.yC) * std::cos(theta) + (particle.vx() - circle.xC) * std::sin(theta)) + circle.yC;
+      vz = particle.vz() + rxyz * (particle.pz() / track.getP());
 
-      px = mom[0] * std::cos(theta) - mom[1] * std::sin(theta);
-      py = mom[1] * std::cos(theta) + mom[0] * std::sin(theta);
+      px = particle.px() * std::cos(theta) - particle.py() * std::sin(theta);
+      py = particle.py() * std::cos(theta) + particle.px() * std::sin(theta);
     }
 
     double brTotal = 0.;
-    e = std::sqrt(mass * mass + px * px + py * py + mom[2] * mom[2]);
+    e = std::sqrt(mass * mass + px * px + py * py + particle.pz() * particle.pz());
     for (int ch = 0; ch < particleInfo->NDecayChannels(); ++ch) {
       brTotal += particleInfo->DecayChannel(ch)->BranchingRatio();
     }
@@ -108,7 +110,11 @@ class Decayer
       }
     }
 
-    TLorentzVector tlv(px, py, mom[2], e);
+    if (dauMasses.empty()) {
+      return {};
+    }
+
+    TLorentzVector tlv(px, py, particle.pz(), e);
     TGenPhaseSpace decay;
     decay.SetDecay(tlv, dauMasses.size(), dauMasses.data());
     decay.Generate();

ALICE3/Core/FastTrackerLinkDef.h

@@ -18,6 +18,6 @@
 
 #pragma link C++ class o2::fastsim::GeometryContainer + ;
 #pragma link C++ class o2::fastsim::FastTracker + ;
-#pragma link C++ class o2::fastsim::DelphesO2LutWriter + ;
+#pragma link C++ class o2::fastsim::FlatLutWriter + ;
 
 #endif // ALICE3_CORE_FASTTRACKERLINKDEF_H_