Merge branch 'master' into a3DQdevelopment

Author: njacazio

.github/workflows/labeler.yml

@@ -41,73 +41,73 @@ jobs:
           labels = os.environ['labels']
           tags = {
               "infrastructure": "Infrastructure",
+              "scripts": "Scripts",
+              "tools": "Tools",
               "common": "Common",
+              "trigger": "Trigger",
+              "dpg": "DPG",
+              "tutorial": "Tutorial",
               "alice3": "ALICE3",
               "pwgcf": "PWGCF",
               "pwgdq": "PWGDQ",
               "pwgem": "PWGEM",
               "pwghf": "PWGHF",
               "pwgje": "PWGJE",
               "pwglf": "PWGLF",
+              "pwgmm": "PWGMM",
               "pwgud": "PWGUD",
-              "dpg": "DPG",
-              "trigger": "Trigger",
-              "tutorial": "Tutorial",
           }
           print(f'PR title: "{title}"')
           print(f'PR labels: "{labels}"')
           tags_relevant = [tags[label] for label in tags if label in labels.split(",")]
           print("Relevant title tags:", ",".join(tags_relevant))
-          passed = True
-          prefix_good = ",".join(tags_relevant)
-          prefix_good = f"[{prefix_good}] "
-          print(f"Generated prefix: {prefix_good}")
-          replace_title = 0
-          title_new = title
+          prefix_generated = ",".join(tags_relevant)
+          prefix_generated = f"[{prefix_generated}] "
+          print(f"Generated prefix: {prefix_generated}")
+          found_tags = False
+          title_new = title.strip()
           # If there is a prefix which contains a known tag, check it for correct tags, and reformat it if needed.
           # If there is a prefix which does not contain any known tag, add the tag prefix.
           # If there is no prefix, add the tag prefix.
-          if match := re.match(r"\[?(\w[\w, /\+-]+)[\]:]+ ", title):
+          if match := re.match(r" *\[?(\w[\w,/\+\- ]+)[\]: ]+ ", title):
               prefix_title = match.group(1)
               words_prefix_title = prefix_title.replace(",", " ").replace("/", " ").split()
-              title_stripped = title[len(match.group()) :]
+              title_stripped = title[len(match.group()) :].strip()
               print(f'PR title prefix: "{prefix_title}" -> tags: {words_prefix_title}')
               print(f'Stripped PR title: "{title_stripped}"')
               if any(tag in words_prefix_title for tag in tags.values()):
+                  found_tags = True
+                  passed = True
                   for tag in tags.values():
                       if tag in tags_relevant and tag not in words_prefix_title:
                           print(f'::error::Relevant tag "{tag}" not found in the prefix of the PR title.')
                           passed = False
                       if tag not in tags_relevant and tag in words_prefix_title:
                           print(f'::error::Irrelevant tag "{tag}" found in the prefix of the PR title.')
                           passed = False
-                  # Format a valid prefix.
-                  if passed:
-                      prefix_good = ",".join(w for w in prefix_title.replace(",", " ").split() if w)
-                      prefix_good = f"[{prefix_good}] "
-                      print(f"::notice::Reformatted prefix: {prefix_good}")
-                      if match.group() != prefix_good:
-                          replace_title = 1
-                          title_new = prefix_good + title_stripped
+                  if not passed:
+                      print("::error::Problems were found in the PR title prefix.")
+                      print('::notice::Use the form "tags: title" or "[tags] title".')
+                      sys.exit(1)
+                  # Form a valid title with the existing prefix.
+                  prefix_good = ",".join(w for w in prefix_title.replace(",", " ").split() if w)
+                  prefix_good = f"[{prefix_good}] "
+                  print(f'::notice::Reformatted prefix: "{prefix_good}"')
+                  title_new = prefix_good + title_stripped
               else:
                   print("::warning::No known tags found in the prefix.")
-                  if tags_relevant:
-                      replace_title = 1
-                      title_new = prefix_good + title
+                  title_new = " ".join((*match.group().split(), title_stripped))
           else:
               print("::warning::No valid prefix found in the PR title.")
-              if tags_relevant:
-                  replace_title = 1
-                  title_new = prefix_good + title
-          if not passed:
-              print("::error::Problems were found in the PR title prefix.")
-              print('::notice::Use the form "tags: title" or "[tags] title".')
-              sys.exit(1)
-          if replace_title:
-              print("::warning::The PR title prefix with tags needs to be added or adjusted.")
-              print(f'::warning::New title: "{title_new}".')
+          if not found_tags and tags_relevant:
+              title_new = prefix_generated + title_new.strip()
+          replace_title = 0
+          if title_new == title:
+              print("::notice::The PR title is fine.")
           else:
-              print("::notice::The PR title prefix is fine.")
+              replace_title = 1
+              print("::warning::The PR title needs to be adjusted.")
+              print(f'::warning::New title: "{title_new}".')
           with open(os.environ["GITHUB_OUTPUT"], "a", encoding="utf-8") as fh:
               print(f"replace={replace_title}", file=fh)
               print(f"title={title_new}", file=fh)

.pre-commit-config.yaml

@@ -2,12 +2,12 @@
 # See https://pre-commit.com/hooks.html for more hooks
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.0
+    rev: v6.0.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
   - repo: https://github.com/pre-commit/mirrors-clang-format
-    rev: v20.1.5 # clang-format version
+    rev: v21.1.8 # clang-format version
     hooks:
       - id: clang-format
   - repo: https://github.com/cpplint/cpplint

ALICE3/CMakeLists.txt

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

ALICE3/Core/Decayer.h

@@ -0,0 +1,145 @@
+// 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   Decayer.h
+/// \author Jesper Karlsson Gumprecht
+/// \since  15/12/2025
+/// \brief  Basic class to handle short-lived particle decays in the fast simulation
+///
+
+#ifndef ALICE3_CORE_DECAYER_H_
+#define ALICE3_CORE_DECAYER_H_
+
+#include "ALICE3/Core/TrackUtilities.h"
+
+#include "ReconstructionDataFormats/Track.h"
+
+#include <TDatabasePDG.h>
+#include <TDecayChannel.h>
+#include <TGenPhaseSpace.h>
+#include <TLorentzVector.h>
+#include <TParticlePDG.h>
+#include <TRandom3.h>
+
+#include <array>
+#include <cmath>
+#include <string>
+#include <vector>
+
+namespace o2
+{
+namespace upgrade
+{
+
+class Decayer
+{
+ public:
+  // Default constructor
+  Decayer() = default;
+
+  template <typename TDatabase>
+  std::vector<o2::upgrade::OTFParticle> decayParticle(const TDatabase& pdgDB, const o2::track::TrackParCov& track, const int pdgCode)
+  {
+    const auto& particleInfo = pdgDB->GetParticle(pdgCode);
+    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 ctau = o2::constants::physics::LightSpeedCm2S * particleInfo->Lifetime(); // cm
+    const double betaGamma = track.getP() / 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[2];
+    } else {
+      float sna, csa;
+      o2::math_utils::CircleXYf_t circle;
+      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());
+
+      px = mom[0] * std::cos(theta) - mom[1] * std::sin(theta);
+      py = mom[1] * std::cos(theta) + mom[0] * std::sin(theta);
+    }
+
+    double brTotal = 0.;
+    e = std::sqrt(mass * mass + px * px + py * py + mom[2] * mom[2]);
+    for (int ch = 0; ch < particleInfo->NDecayChannels(); ++ch) {
+      brTotal += particleInfo->DecayChannel(ch)->BranchingRatio();
+    }
+
+    double brSum = 0.;
+    std::vector<double> dauMasses;
+    std::vector<int> pdgCodesDaughters;
+    const double randomChannel = mRand3.Uniform(0., brTotal);
+    for (int ch = 0; ch < particleInfo->NDecayChannels(); ++ch) {
+      brSum += particleInfo->DecayChannel(ch)->BranchingRatio();
+      if (randomChannel < brSum) {
+        for (int dau = 0; dau < particleInfo->DecayChannel(ch)->NDaughters(); ++dau) {
+          const int pdgDau = particleInfo->DecayChannel(ch)->DaughterPdgCode(dau);
+          pdgCodesDaughters.push_back(pdgDau);
+          const auto& dauInfo = pdgDB->GetParticle(pdgDau);
+          dauMasses.push_back(dauInfo->Mass());
+        }
+        break;
+      }
+    }
+
+    TLorentzVector tlv(px, py, mom[2], e);
+    TGenPhaseSpace decay;
+    decay.SetDecay(tlv, dauMasses.size(), dauMasses.data());
+    decay.Generate();
+
+    std::vector<o2::upgrade::OTFParticle> decayProducts;
+    for (size_t i = 0; i < dauMasses.size(); ++i) {
+      o2::upgrade::OTFParticle particle;
+      TLorentzVector dau = *decay.GetDecay(i);
+      particle.setPDG(pdgCodesDaughters[i]);
+      particle.setVxVyVz(vx, vy, vz);
+      particle.setPxPyPzE(dau.Px(), dau.Py(), dau.Pz(), dau.E());
+      decayProducts.push_back(particle);
+    }
+
+    return decayProducts;
+  }
+
+  void setSeed(const int seed)
+  {
+    mRand3.SetSeed(seed);   // For decay length sampling
+    gRandom->SetSeed(seed); // For TGenPhaseSpace
+  }
+
+  void setBField(const double b) { mBz = b; }
+
+ private:
+  TRandom3 mRand3;
+  double mBz;
+};
+
+} // namespace upgrade
+} // namespace o2
+
+#endif // ALICE3_CORE_DECAYER_H_

ALICE3/Core/DelphesO2TrackSmearer.cxx

@@ -66,6 +66,7 @@ bool TrackSmearer::loadTable(int pdg, const char* filename, bool forceReload)
     std::string path = std::string(filename).substr(5); // Remove "ccdb:" prefix
     const std::string outPath = "/tmp/LUTs/";
     filename = Form("%s/%s/snapshot.root", outPath.c_str(), path.c_str());
+    LOG(info) << " --- Local LUT filename will be: " << filename;
     std::ifstream checkFile(filename); // Check if file already exists
     if (!checkFile.is_open()) {        // File does not exist, retrieve from CCDB
       LOG(info) << " --- CCDB source detected for PDG " << pdg << ": " << path;