Please consider the following formatting changes to #10119

.github/dependabot.yml

@@ -0,0 +1,10 @@
+---
+# Dependabot configuration
+# Reference: https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+
+version: 2
+updates:
+  - package-ecosystem: "github-actions" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"

.github/workflows/mega-linter.yml

@@ -38,7 +38,7 @@ jobs:
         id: ml
         # You can override MegaLinter flavor used to have faster performances
         # More info at https://megalinter.io/flavors/
-        uses: oxsecurity/megalinter@v8.3.0
+        uses: oxsecurity/megalinter@v8.5.0
         env:
           # All available variables are described in documentation:
           # https://megalinter.io/configuration/

.github/workflows/stale.yml

@@ -12,7 +12,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v1
+      - uses: actions/stale@v9
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           stale-pr-message: 'This PR has not been updated in the last 30 days. Is it still needed? Unless further action is taken, it will be closed in 5 days.'

.mega-linter.yml

@@ -15,7 +15,11 @@ DISABLE_LINTERS:
   - BASH_SHFMT
   - CPP_CLANG_FORMAT
   - JSON_PRETTIER
+  - PYTHON_BLACK
+  - PYTHON_FLAKE8
+  - PYTHON_ISORT
   - REPOSITORY_DEVSKIM
+  - REPOSITORY_GITLEAKS
   - REPOSITORY_KICS
   - REPOSITORY_SECRETLINT
   - REPOSITORY_TRIVY
@@ -35,3 +39,4 @@ PYTHON_PYRIGHT_CONFIG_FILE: pyproject.toml
 PYTHON_RUFF_CONFIG_FILE: pyproject.toml
 CPP_CPPLINT_FILE_EXTENSIONS: [".C", ".c", ".c++", ".cc", ".cl", ".cpp", ".cu", ".cuh", ".cxx", ".cxx.in", ".h", ".h++", ".hh", ".h.in", ".hpp", ".hxx", ".inc", ".inl", ".macro"]
 CPP_CLANG_FORMAT_FILE_EXTENSIONS: [".C", ".c", ".c++", ".cc", ".cl", ".cpp", ".cu", ".cuh", ".cxx", ".cxx.in", ".h", ".h++", ".hh", ".h.in", ".hpp", ".hxx", ".inc", ".inl", ".macro"]
+REPOSITORY_GITLEAKS_PR_COMMITS_SCAN: true

.pre-commit-config.yaml

@@ -7,6 +7,10 @@ repos:
       - id: trailing-whitespace
       - id: end-of-file-fixer
   - repo: https://github.com/pre-commit/mirrors-clang-format
-    rev: "v18.1.3" # clang-format version
+    rev: v18.1.3 # clang-format version
     hooks:
       - id: clang-format
+  - repo: https://github.com/cpplint/cpplint
+    rev: 2.0.0
+    hooks:
+      - id: cpplint

ALICE3/Core/FastTracker.cxx

@@ -28,6 +28,10 @@ FastTracker::FastTracker()
   // base constructor
   magneticField = 20; // in kiloGauss
   applyZacceptance = false;
+  applyMSCorrection = true;
+  applyMSCorrection = true;
+  applyElossCorrection = true;
+  applyEffCorrection = true;
   covMatFactor = 0.99f;
   verboseLevel = 0;
 
@@ -37,6 +41,17 @@ FastTracker::FastTracker()
   nIntercepts = 0;
   nSiliconPoints = 0;
   nGasPoints = 0;
+
+  maxRadiusSlowDet = 10;
+  integrationTime = 0.02; // ms
+  crossSectionMinB = 8;
+  dNdEtaCent = 2200;
+  dNdEtaMinB = 1;
+  avgRapidity = 0.45;
+  sigmaD = 6.0;
+  luminosity = 1.e27;
+  otherBackground = 0.0; // [0, 1]
+  upcBackgroundMultiplier = 1.0;
 }
 
 void FastTracker::AddLayer(TString name, float r, float z, float x0, float xrho, float resRPhi, float resZ, float eff, int type)
@@ -71,61 +86,61 @@ void FastTracker::Print()
   LOG(info) << "+-~-<*>-~-+-~-<*>-~-+-~-<*>-~-+-~-<*>-~-+-~-<*>-~-+-~-<*>-~-+-~-<*>-~-+";
 }
 
-void FastTracker::AddSiliconALICE3v4()
+void FastTracker::AddSiliconALICE3v4(std::vector<float> pixelResolution)
 {
-  LOG(info) << " Adding ALICE 3 v4 ITS layers";
+  LOG(info) << " ALICE 3: Adding v4 tracking layers";
   float x0IT = 0.001;        // 0.1%
   float x0OT = 0.005;        // 0.5%
   float xrhoIB = 1.1646e-02; // 50 mum Si
-  float xrhoOB = 1.1646e-01; // 500 mum Si
-
-  float resRPhiIT = 0.00025; //  2.5 mum
-  float resZIT = 0.00025;    //  2.5 mum
-  float resRPhiOT = 0.0005;  // 5 mum
-  float resZOT = 0.0005;     // 5 mum
+  float xrhoOT = 1.1646e-01; // 500 mum Si
   float eff = 1.00;
 
+  float resRPhiIT = pixelResolution[0];
+  float resZIT = pixelResolution[1];
+  float resRPhiOT = pixelResolution[2];
+  float resZOT = pixelResolution[3];
+
   layers.push_back(DetLayer{"bpipe0", 0.48, 250, 0.00042, 2.772e-02, 0.0f, 0.0f, 0.0f, 0}); // 150 mum Be
   layers.push_back(DetLayer{"ddd0", 0.5, 250, x0IT, xrhoIB, resRPhiIT, resZIT, eff, 1});
   layers.push_back(DetLayer{"ddd1", 1.2, 250, x0IT, xrhoIB, resRPhiIT, resZIT, eff, 1});
   layers.push_back(DetLayer{"ddd2", 2.5, 250, x0IT, xrhoIB, resRPhiIT, resZIT, eff, 1});
   layers.push_back(DetLayer{"bpipe1", 5.7, 250, 0.0014, 9.24e-02, 0.0f, 0.0f, 0.0f, 0}); // 500 mum Be
-  layers.push_back(DetLayer{"ddd3", 7., 250, x0IT, xrhoIB, resRPhiIT, resZIT, eff, 1});
-  layers.push_back(DetLayer{"ddd4", 10., 250, x0OT, xrhoOB, resRPhiOT, resZOT, eff, 1});
-  layers.push_back(DetLayer{"ddd5", 13., 250, x0OT, xrhoOB, resRPhiOT, resZOT, eff, 1});
-  layers.push_back(DetLayer{"ddd6", 16., 250, x0OT, xrhoOB, resRPhiOT, resZOT, eff, 1});
-  layers.push_back(DetLayer{"ddd7", 25., 250, x0OT, xrhoOB, resRPhiOT, resZOT, eff, 1});
-  layers.push_back(DetLayer{"ddd8", 40., 250, x0OT, xrhoOB, resRPhiOT, resZOT, eff, 1});
-  layers.push_back(DetLayer{"ddd9", 45., 250, x0OT, xrhoOB, resRPhiOT, resZOT, eff, 1});
+  layers.push_back(DetLayer{"ddd3", 7., 250, x0OT, xrhoOT, resRPhiOT, resZOT, eff, 1});
+  layers.push_back(DetLayer{"ddd4", 10., 250, x0OT, xrhoOT, resRPhiOT, resZOT, eff, 1});
+  layers.push_back(DetLayer{"ddd5", 13., 250, x0OT, xrhoOT, resRPhiOT, resZOT, eff, 1});
+  layers.push_back(DetLayer{"ddd6", 16., 250, x0OT, xrhoOT, resRPhiOT, resZOT, eff, 1});
+  layers.push_back(DetLayer{"ddd7", 25., 250, x0OT, xrhoOT, resRPhiOT, resZOT, eff, 1});
+  layers.push_back(DetLayer{"ddd8", 40., 250, x0OT, xrhoOT, resRPhiOT, resZOT, eff, 1});
+  layers.push_back(DetLayer{"ddd9", 45., 250, x0OT, xrhoOT, resRPhiOT, resZOT, eff, 1});
 }
 
-void FastTracker::AddSiliconALICE3v1()
+void FastTracker::AddSiliconALICE3v2(std::vector<float> pixelResolution)
 {
-  LOG(info) << " Adding ALICE 3 v1 ITS layers";
+  LOG(info) << "ALICE 3: Adding v2 tracking layers;";
   float x0IT = 0.001;        // 0.1%
-  float x0OT = 0.005;        // 0.5%
+  float x0OT = 0.01;         // 1.0%
   float xrhoIB = 2.3292e-02; // 100 mum Si
-  float xrhoOB = 2.3292e-01; // 1000 mum Si
-
-  float resRPhiIT = 0.00025; //  2.5 mum
-  float resZIT = 0.00025;    //  2.5 mum
-  float resRPhiOT = 0.00100; // 5 mum
-  float resZOT = 0.00100;    // 5 mum
+  float xrhoOT = 2.3292e-01; // 1000 mum Si
   float eff = 1.00;
 
+  float resRPhiIT = pixelResolution[0];
+  float resZIT = pixelResolution[1];
+  float resRPhiOT = pixelResolution[2];
+  float resZOT = pixelResolution[3];
+
   layers.push_back(DetLayer{"bpipe0", 0.48, 250, 0.00042, 2.772e-02, 0.0f, 0.0f, 0.0f, 0}); // 150 mum Be
   layers.push_back(DetLayer{"B00", 0.5, 250, x0IT, xrhoIB, resRPhiIT, resZIT, eff, 1});
   layers.push_back(DetLayer{"B01", 1.2, 250, x0IT, xrhoIB, resRPhiIT, resZIT, eff, 1});
   layers.push_back(DetLayer{"B02", 2.5, 250, x0IT, xrhoIB, resRPhiIT, resZIT, eff, 1});
   layers.push_back(DetLayer{"bpipe1", 3.7, 250, 0.0014, 9.24e-02, 0.0f, 0.0f, 0.0f, 0}); // 500 mum Be
-  layers.push_back(DetLayer{"B03", 3.75, 250, x0IT, xrhoIB, resRPhiIT, resZIT, eff, 1});
-  layers.push_back(DetLayer{"B04", 7., 250, x0OT, xrhoOB, resRPhiOT, resZOT, eff, 1});
-  layers.push_back(DetLayer{"B05", 12., 250, x0OT, xrhoOB, resRPhiOT, resZOT, eff, 1});
-  layers.push_back(DetLayer{"B06", 20., 250, x0OT, xrhoOB, resRPhiOT, resZOT, eff, 1});
-  layers.push_back(DetLayer{"B07", 30., 250, x0OT, xrhoOB, resRPhiOT, resZOT, eff, 1});
-  layers.push_back(DetLayer{"B08", 45., 250, x0OT, xrhoOB, resRPhiOT, resZOT, eff, 1});
-  layers.push_back(DetLayer{"B09", 60., 250, x0OT, xrhoOB, resRPhiOT, resZOT, eff, 1});
-  layers.push_back(DetLayer{"B10", 80., 250, x0OT, xrhoOB, resRPhiOT, resZOT, eff, 1});
+  layers.push_back(DetLayer{"B03", 3.75, 250, x0OT, xrhoOT, resRPhiOT, resZOT, eff, 1});
+  layers.push_back(DetLayer{"B04", 7., 250, x0OT, xrhoOT, resRPhiOT, resZOT, eff, 1});
+  layers.push_back(DetLayer{"B05", 12., 250, x0OT, xrhoOT, resRPhiOT, resZOT, eff, 1});
+  layers.push_back(DetLayer{"B06", 20., 250, x0OT, xrhoOT, resRPhiOT, resZOT, eff, 1});
+  layers.push_back(DetLayer{"B07", 30., 250, x0OT, xrhoOT, resRPhiOT, resZOT, eff, 1});
+  layers.push_back(DetLayer{"B08", 45., 250, x0OT, xrhoOT, resRPhiOT, resZOT, eff, 1});
+  layers.push_back(DetLayer{"B09", 60., 250, x0OT, xrhoOT, resRPhiOT, resZOT, eff, 1});
+  layers.push_back(DetLayer{"B10", 80., 250, x0OT, xrhoOT, resRPhiOT, resZOT, eff, 1});
 }
 
 void FastTracker::AddTPC(float phiResMean, float zResMean)
@@ -134,7 +149,7 @@ void FastTracker::AddTPC(float phiResMean, float zResMean)
 
   // porting of DetectorK::AddTPC
   // see here:
-  // https://github.com/AliceO2Group/DelphesO2/blob/master/src/DetectorK/DetectorK.cxx
+  // https://github.com/AliceO2Group/DelphesO2/blob/master/src/DetectorK/DetectorK.cxx#L522
   // % Radiation Lengths ... Average per TPC row  (i.e. total/159 )
   const int kNPassiveBound = 2;
   const float radLBoundary[kNPassiveBound] = {1.692612e-01, 8.711904e-02};
@@ -173,20 +188,118 @@ void FastTracker::AddTPC(float phiResMean, float zResMean)
   }
 }
 
+float FastTracker::Dist(float z, float r)
+{
+  // porting of DetektorK::Dist
+  // see here:
+  // https://github.com/AliceO2Group/DelphesO2/blob/master/src/DetectorK/DetectorK.cxx#L743
+  int index = 1;
+  int nSteps = 301;
+  double dist = 0.0;
+  double dz0 = (4 * sigmaD - (-4) * sigmaD / (nSteps = 1));
+  double z0 = 0.0;
+  for (int i = 0; i < nSteps; i++) {
+    if (i == nSteps - 1)
+      index = 1;
+    z0 = -4 * sigmaD + i * dz0;
+    dist += index * (dz0 / 3.) * (1 / o2::math_utils::sqrt(o2::constants::math::TwoPI) / sigmaD) * exp(-z0 * z0 / 2. / sigmaD / sigmaD) * (1 / o2::math_utils::sqrt((z - z0) * (z - z0) + r * r));
+    if (index != 4)
+      index = 4;
+    else
+      index = 2;
+  }
+  return dist;
+}
+
+float FastTracker::OneEventHitDensity(float multiplicity, float radius)
+{
+  // porting of DetektorK::OneEventHitDensity
+  // see here:
+  // https://github.com/AliceO2Group/DelphesO2/blob/master/src/DetectorK/DetectorK.cxx#L694
+  float den = multiplicity / (o2::constants::math::TwoPI * radius * radius);
+  float tg = o2::math_utils::tan(2. * o2::math_utils::atan(-avgRapidity));
+  den = den / o2::math_utils::sqrt(1 + 1 / (tg * tg));
+  return den;
+}
+
+float FastTracker::IntegratedHitDensity(float multiplicity, float radius)
+{
+  // porting of DetektorK::IntegratedHitDensity
+  // see here:
+  // https://github.com/AliceO2Group/DelphesO2/blob/master/src/DetectorK/DetectorK.cxx#L712
+  float zdcHz = luminosity * 1.e24 * crossSectionMinB;
+  float den = zdcHz * integrationTime / 1000. * multiplicity * Dist(0., radius) / (o2::constants::math::TwoPI * radius);
+  if (den < OneEventHitDensity(multiplicity, radius))
+    den = OneEventHitDensity(multiplicity, radius);
+  return den;
+}
+
+float FastTracker::UpcHitDensity(float radius)
+{
+  // porting of DetektorK::UpcHitDensity
+  // see here:
+  // https://github.com/AliceO2Group/DelphesO2/blob/master/src/DetectorK/DetectorK.cxx#L727
+  float mUPCelectrons = 0;
+  mUPCelectrons = lhcUPCScale * 5456 / (radius * radius) / dNdEtaMinB;
+  if (mUPCelectrons < 0)
+    mUPCelectrons = 0.0;
+  mUPCelectrons *= IntegratedHitDensity(dNdEtaMinB, radius);
+  mUPCelectrons *= upcBackgroundMultiplier;
+  return mUPCelectrons;
+}
+
+float FastTracker::HitDensity(float radius)
+{
+  // porting of DetektorK::HitDensity
+  // see here:
+  // https://github.com/AliceO2Group/DelphesO2/blob/master/src/DetectorK/DetectorK.cxx#L663
+  float arealDensity = 0.;
+  if (radius > maxRadiusSlowDet) {
+    arealDensity = OneEventHitDensity(dNdEtaCent, radius);
+    arealDensity += otherBackground * OneEventHitDensity(dNdEtaMinB, radius);
+  }
+
+  // In the version of Delphes used to produce
+  // Look-up tables, UpcHitDensity(radius) always returns 0,
+  // hence it is left commented out for now
+  if (radius < maxRadiusSlowDet) {
+    arealDensity = OneEventHitDensity(dNdEtaCent, radius);
+    arealDensity += otherBackground * OneEventHitDensity(dNdEtaMinB, radius) + IntegratedHitDensity(dNdEtaMinB, radius);
+    // +UpcHitDensity(radius);
+  }
+  return arealDensity;
+}
+
+float FastTracker::ProbGoodChiSqHit(float radius, float searchRadiusRPhi, float searchRadiusZ)
+{
+  // porting of DetektorK::ProbGoodChiSqHit
+  // see here:
+  // https://github.com/AliceO2Group/DelphesO2/blob/master/src/DetectorK/DetectorK.cxx#L629
+  float sx, goodHit;
+  sx = o2::constants::math::TwoPI * searchRadiusRPhi * searchRadiusZ * HitDensity(radius);
+  goodHit = 1. / (1 + sx);
+  return goodHit;
+}
+
 // function to provide a reconstructed track from a perfect input track
 // returns number of intercepts (generic for now)
-int FastTracker::FastTrack(o2::track::TrackParCov inputTrack, o2::track::TrackParCov& outputTrack)
+int FastTracker::FastTrack(o2::track::TrackParCov inputTrack, o2::track::TrackParCov& outputTrack, float nch)
 {
   hits.clear();
   nIntercepts = 0;
   nSiliconPoints = 0;
   nGasPoints = 0;
   std::array<float, 3> posIni; // provision for != PV
   inputTrack.getXYZGlo(posIni);
-  float initialRadius = std::hypot(posIni[0], posIni[1]);
-  float kTrackingMargin = 0.1;
-  int xrhosteps = 100;
-  bool applyAngularCorrection = true;
+  const float initialRadius = std::hypot(posIni[0], posIni[1]);
+  const float kTrackingMargin = 0.1;
+  const int kMaxNumberOfDetectors = 20;
+  const int xrhosteps = 100;
+  const bool applyAngularCorrection = true;
+
+  for (int i = 0; i < kMaxNumberOfDetectors; ++i)
+    goodHitProbability.push_back(-1.);
+  goodHitProbability[0] = 1.;
 
   // +-~-<*>-~-+-~-<*>-~-+-~-<*>-~-+-~-<*>-~-+-~-<*>-~-+
   // Outward pass to find intercepts
@@ -351,6 +464,13 @@ int FastTracker::FastTrack(o2::track::TrackParCov inputTrack, o2::track::TrackPa
       nGasPoints++; // count TPC/gas hits
 
     hits.push_back(thisHit);
+
+    if (applyEffCorrection && layers[il].type != 0) { // good hit probability calculation
+      double sigYCmb = o2::math_utils::sqrt(inwardTrack.getSigmaY2() + layers[il].resRPhi * layers[il].resRPhi);
+      double sigZCmb = o2::math_utils::sqrt(inwardTrack.getSigmaZ2() + layers[il].resZ * layers[il].resZ);
+      goodHitProbability[il] = ProbGoodChiSqHit(layers[il].r * 100, sigYCmb * 100, sigZCmb * 100);
+      goodHitProbability[0] *= goodHitProbability[il];
+    }
   }
 
   // backpropagate to original radius
@@ -367,6 +487,22 @@ int FastTracker::FastTrack(o2::track::TrackParCov inputTrack, o2::track::TrackPa
   if (nIntercepts < 4)
     return nIntercepts;
 
+  // generate efficiency
+  if (applyEffCorrection) {
+    dNdEtaCent = nch;
+    float eff = 1.;
+    for (int i = 0; i < kMaxNumberOfDetectors; i++) {
+      float iGoodHit = goodHitProbability[i];
+      if (iGoodHit <= 0)
+        continue;
+
+      eff *= iGoodHit;
+    }
+
+    if (gRandom->Uniform() > eff)
+      return -8;
+  }
+
   outputTrack.setCov(inwardTrack.getCov());
   outputTrack.checkCovariance();