Merge branch 'AliceO2Group:master' into feature-pwgje-jetXsecEff-cascade

Author: joonsukbae

.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@v9.4.0
+        uses: oxsecurity/megalinter@v9.5.0
         env:
           # All available variables are described in documentation:
           # https://megalinter.io/configuration/

.mega-linter.yml

@@ -21,11 +21,13 @@ DISABLE_LINTERS:
   - REPOSITORY_DEVSKIM
   - REPOSITORY_GITLEAKS
   - REPOSITORY_KICS
+  - REPOSITORY_OSV_SCANNER
   - REPOSITORY_SECRETLINT
   - REPOSITORY_TRIVY
   - YAML_PRETTIER
   - YAML_V8R
 DISABLE_ERRORS_LINTERS: # If errors are found by these linters, they will be considered as non blocking.
+  - ACTION_ZIZMOR
   - PYTHON_BANDIT # The bandit check is overly broad and complains about subprocess usage.
 SHOW_ELAPSED_TIME: true
 FILEIO_REPORTER: false
@@ -42,3 +44,4 @@ CPP_CLANG_FORMAT_FILE_EXTENSIONS: [".C", ".c", ".c++", ".cc", ".cl", ".cpp", ".c
 CPP_CPPCHECK_FILE_EXTENSIONS: [".C", ".c", ".c++", ".cc", ".cl", ".cpp", ".cu", ".cuh", ".cxx", ".cxx.in", ".h", ".h++", ".hh", ".h.in", ".hpp", ".hxx", ".inc", ".inl", ".macro"]
 CPP_CPPCHECK_ARGUMENTS: --language=c++ --std=c++20 --check-level=exhaustive --suppressions-list=cppcheck_config
 REPOSITORY_GITLEAKS_PR_COMMITS_SCAN: true
+ACTION_ZIZMOR_UNSECURED_ENV_VARIABLES: [GITHUB_TOKEN]

Common/Core/PID/TPCPIDResponse.h

@@ -90,12 +90,17 @@ class Response
   /// Gets the deviation to the expected signal
   template <typename TrackType>
   float GetSignalDelta(const TrackType& trk, const o2::track::PID::ID id) const;
+
   /// Gets relative dEdx resolution contribution due to relative pt resolution
   float GetRelativeResolutiondEdx(const float p, const float mass, const float charge, const float resol) const;
 
   void PrintAll() const;
 
  private:
+  /// Compute expected sigma given a pre-computed expected signal, avoiding a redundant Bethe-Bloch call.
+  template <typename TrackType>
+  float sigmaFromSignal(float expectedSignal, const long multTPC, const TrackType& track, const o2::track::PID::ID id) const;
+
   std::array<float, 5> mBetheBlochParams = {0.03209809958934784, 19.9768009185791, 2.5266601063857674e-16, 2.7212300300598145, 6.080920219421387};
   std::array<float, 2> mResolutionParamsDefault = {0.07, 0.0};
   std::vector<double> mResolutionParams = {5.43799e-7, 0.053044, 0.667584, 0.0142667, 0.00235175, 1.22482, 2.3501e-7, 0.031585};
@@ -135,13 +140,18 @@ inline float Response::GetExpectedSigmaAtMultiplicity(const long multTPC, const
   if (!track.hasTPC()) {
     return -999.f;
   }
-  float resolution = 0.;
+  return sigmaFromSignal(GetExpectedSignal(track, id), multTPC, track, id);
+}
+
+template <typename TrackType>
+inline float Response::sigmaFromSignal(float expectedSignal, const long multTPC, const TrackType& track, const o2::track::PID::ID id) const
+{
+  float resolution = 0.f;
   if (mUseDefaultResolutionParam) {
-    const float reso = GetExpectedSignal(track, id) * mResolutionParamsDefault[0] * (static_cast<float>(track.tpcNClsFound()) > 0 ? std::sqrt(1. + mResolutionParamsDefault[1] / static_cast<float>(track.tpcNClsFound())) : 1.f);
+    const float reso = expectedSignal * mResolutionParamsDefault[0] * (static_cast<float>(track.tpcNClsFound()) > 0 ? std::sqrt(1. + mResolutionParamsDefault[1] / static_cast<float>(track.tpcNClsFound())) : 1.f);
     reso >= 0.f ? resolution = reso : resolution = -999.f;
   } else {
-
-    const double ncl = nClNorm / track.tpcNClsFound(); //
+    const double ncl = nClNorm / track.tpcNClsFound();
     const double p = track.tpcInnerParam();
     const double mass = o2::track::pid_constants::sMasses[id];
     const double bg = p / mass;
@@ -160,16 +170,15 @@ inline float Response::GetExpectedSigmaAtMultiplicity(const long multTPC, const
 template <typename CollisionType, typename TrackType>
 inline float Response::GetNumberOfSigma(const CollisionType& collision, const TrackType& trk, const o2::track::PID::ID id) const
 {
-  if (GetExpectedSigma(collision, trk, id) < 0.) {
-    return -999.f;
-  }
-  if (GetExpectedSignal(trk, id) < 0.) {
+  const float signal = GetExpectedSignal(trk, id);
+  if (signal < 0.f) {
     return -999.f;
   }
-  if (!trk.hasTPC()) {
+  const float sigma = sigmaFromSignal(signal, collision.multTPC(), trk, id);
+  if (sigma < 0.f) {
     return -999.f;
   }
-  return ((trk.tpcSignal() - GetExpectedSignal(trk, id)) / GetExpectedSigma(collision, trk, id));
+  return (trk.tpcSignal() - signal) / sigma;
 }
 
 template <typename CollisionType, typename TrackType>
@@ -181,29 +190,26 @@ inline float Response::GetNumberOfSigmaMCTuned(const CollisionType& collision, c
 template <typename TrackType>
 inline float Response::GetNumberOfSigmaMCTunedAtMultiplicity(const long multTPC, const TrackType& trk, const o2::track::PID::ID id, float mcTunedTPCSignal) const
 {
-  if (GetExpectedSigmaAtMultiplicity(multTPC, trk, id) < 0.) {
+  const float signal = GetExpectedSignal(trk, id);
+  if (signal < 0.f) {
     return -999.f;
   }
-  if (GetExpectedSignal(trk, id) < 0.) {
+  const float sigma = sigmaFromSignal(signal, multTPC, trk, id);
+  if (sigma < 0.f) {
     return -999.f;
   }
-  if (!trk.hasTPC()) {
-    return -999.f;
-  }
-  return ((mcTunedTPCSignal - GetExpectedSignal(trk, id)) / GetExpectedSigmaAtMultiplicity(multTPC, trk, id));
+  return (mcTunedTPCSignal - signal) / sigma;
 }
 
 /// Gets the deviation between the actual signal and the expected signal
 template <typename TrackType>
 inline float Response::GetSignalDelta(const TrackType& trk, const o2::track::PID::ID id) const
 {
-  if (GetExpectedSignal(trk, id) < 0.) {
-    return -999.f;
-  }
-  if (!trk.hasTPC()) {
+  const float signal = GetExpectedSignal(trk, id);
+  if (signal < 0.f) {
     return -999.f;
   }
-  return (trk.tpcSignal() - GetExpectedSignal(trk, id));
+  return trk.tpcSignal() - signal;
 }
 
 //// Gets relative dEdx resolution contribution due relative pt resolution

Common/TableProducer/Converters/bcConverter.cxx

@@ -24,6 +24,7 @@ struct bcConverter {
 
   void process(aod::BCs_000 const& bcTable)
   {
+    bc_001.reserve(bcTable.size());
     for (auto& bc : bcTable) {
       constexpr uint64_t lEmptyTriggerInputs = 0;
       bc_001(bc.runNumber(), bc.globalBC(), bc.triggerMask(), lEmptyTriggerInputs);

Common/TableProducer/Converters/bcFlagsCreator.cxx

@@ -25,6 +25,7 @@ struct bcFlagsCreator {
 
   void process(aod::BCs const& bcTable)
   {
+    bcFlags.reserve(bcTable.size());
     for (int64_t i = 0; i < bcTable.size(); ++i) {
       bcFlags(0);
     }

Common/TableProducer/Converters/caloLabelConverter.cxx

@@ -27,6 +27,7 @@ struct caloLabelConverter {
   {
     std::vector<float> amplitude = {0};
     std::vector<int32_t> particleId = {0};
+    McCaloLabels_001.reserve(mccalolabelTable.size());
     for (auto& mccalolabel : mccalolabelTable) {
       particleId[0] = mccalolabel.mcParticleId();
       // Repopulate new table

Common/TableProducer/Converters/collisionConverter.cxx

@@ -41,6 +41,7 @@ struct collisionConverter {
   void process(aod::Collisions_000 const& collisionTable)
   {
     float negtolerance = -1.0f * tolerance;
+    Collisions_001.reserve(collisionTable.size());
     for (auto& collision : collisionTable) {
       float lYY = collision.covXZ();
       float lXZ = collision.covYY();

Common/TableProducer/Converters/fddConverter.cxx

@@ -25,6 +25,7 @@ struct FddConverter {
 
   void process(aod::FDDs_000 const& fdd_000)
   {
+    fdd_001.reserve(fdd_000.size());
     for (auto& p : fdd_000) {
       int16_t chargeA[8] = {0u};
       int16_t chargeC[8] = {0u};

Common/TableProducer/Converters/hmpConverter.cxx

@@ -25,6 +25,7 @@ struct hmpConverter {
 
   void process(aod::HMPID_000 const& hmpLegacy, aod::Tracks const&)
   {
+    HMPID_001.reserve(hmpLegacy.size());
     for (auto& hmpData : hmpLegacy) {
 
       float phots[] = {0., 0., 0., 0., 0., 0., 0., 0., 0., 0.};

Common/TableProducer/Converters/mcCollisionConverter.cxx

@@ -21,6 +21,7 @@ struct mcCollisionConverter {
 
   void process(aod::McCollisions_000 const& mcCollisionTable)
   {
+    mcCollisions_001.reserve(mcCollisionTable.size());
     for (auto& mcCollision : mcCollisionTable) {
 
       // Repopulate new table