Merge branch 'AliceO2Group:master' into master

Author: PaolaVT

.clang-tidy

@@ -1,21 +1,144 @@
+---
+Checks:
+  # - clang-analyzer-* # enabled by default
+  # - clang-diagnostic-* # enabled by default
+  - -clang-diagnostic-unknown-pragmas
+  - bugprone-*
+  - -bugprone-assert-side-effect
+  - -bugprone-bad-signal-to-kill-thread
+  - -bugprone-bitwise-pointer-cast
+  - -bugprone-bool-pointer-implicit-conversion
+  - -bugprone-compare-pointer-to-member-virtual-function
+  - -bugprone-crtp-constructor-accessibility
+  - -bugprone-easily-swappable-parameters # Too sensitive
+  - -bugprone-forwarding-reference-overload
+  - -bugprone-implicit-widening-of-multiplication-result # Specific cases irrelevant in this repo
+  - -bugprone-lambda-function-name
+  - -bugprone-no-escape
+  - -bugprone-posix-return
+  - -bugprone-signal-handler
+  - -bugprone-signed-char-misuse # Specific use cases. Probably very rare.
+  - -bugprone-spuriously-wake-up-functions
+  - -bugprone-suspicious-stringview-data-usage # Probably harmless in this repo
+  - -bugprone-unused-raii
+  - cppcoreguidelines-avoid-const-or-ref-data-members
+  - cppcoreguidelines-avoid-goto
+  - cppcoreguidelines-avoid-non-const-global-variables
+  - cppcoreguidelines-init-variables
+  - cppcoreguidelines-macro-usage
+  - cppcoreguidelines-misleading-capture-default-by-value
+  - cppcoreguidelines-missing-std-forward
+  - cppcoreguidelines-prefer-member-initializer
+  - cppcoreguidelines-pro-bounds-array-to-pointer-decay
+  - cppcoreguidelines-pro-type-const-cast
+  - cppcoreguidelines-pro-type-cstyle-cast
+  - cppcoreguidelines-pro-type-member-init
+  - cppcoreguidelines-pro-type-reinterpret-cast
+  - cppcoreguidelines-pro-type-static-cast-downcast
+  - cppcoreguidelines-pro-type-union-access
+  - cppcoreguidelines-rvalue-reference-param-not-moved
+  - cppcoreguidelines-slicing
+  - cppcoreguidelines-virtual-class-destructor
+  - google-default-arguments
+  # - google-explicit-constructor # triggered for O2 columns
+  - google-global-names-in-headers
+  # - misc-const-correctness # to be checked
+  - misc-header-include-cycle
+  - misc-include-cleaner
+  - misc-misplaced-const
+  - misc-redundant-expression
+  - misc-unconventional-assign-operator
+  - misc-unused-alias-decls
+  - misc-unused-parameters
+  - misc-unused-using-decls
+  - modernize-avoid-bind
+  - modernize-avoid-c-arrays
+  - modernize-concat-nested-namespaces
+  - modernize-deprecated-headers
+  - modernize-make-shared
+  - modernize-make-unique
+  - modernize-redundant-void-arg
+  - modernize-return-braced-init-list
+  - modernize-use-auto
+  - modernize-use-default-member-init
+  - modernize-use-designated-initializers
+  - modernize-use-equals-default
+  - modernize-use-equals-delete
+  - modernize-use-nodiscard
+  - modernize-use-nullptr
+  - modernize-use-override
+  - modernize-use-starts-ends-with
+  - performance-for-range-copy
+  - performance-implicit-conversion-in-loop
+  - performance-inefficient-algorithm
+  - performance-inefficient-string-concatenation
+  - performance-inefficient-vector-operation
+  - performance-move-const-arg
+  - performance-no-automatic-move
+  - performance-trivially-destructible
+  - performance-type-promotion-in-math-fn
+  - performance-unnecessary-copy-initialization
+  - performance-unnecessary-value-param # slow
+  - readability-avoid-unconditional-preprocessor-if
+  - readability-braces-around-statements
+  - readability-const-return-type
+  - readability-container-contains
+  - readability-container-data-pointer
+  - readability-container-size-empty
+  - readability-delete-null-pointer
+  - readability-duplicate-include
+  - readability-else-after-return
+  - readability-enum-initial-value
+  - readability-implicit-bool-conversion
+  - readability-inconsistent-declaration-parameter-name
+  - readability-misplaced-array-index
+  - readability-non-const-parameter
+  - readability-redundant-access-specifiers
+  - readability-redundant-casting
+  - readability-redundant-control-flow
+  - readability-redundant-declaration
+  - readability-redundant-member-init
+  - readability-redundant-preprocessor
+  - readability-redundant-string-cstr
+  - readability-redundant-string-init
+  - readability-reference-to-constructed-temporary
+  - readability-simplify-boolean-expr
+  - readability-static-definition-in-anonymous-namespace
+  - readability-string-compare
+  - readability-suspicious-call-argument
+# Select which of the enabled checks should be reported as errors instead of warnings.
+WarningsAsErrors: >-
+  *,
+  -readability-braces-around-statements,
+  -readability-suspicious-call-argument,
 CheckOptions:
+  modernize-avoid-c-arrays.AllowStringArrays: true
+  # Common tolerated conversions
+  bugprone-narrowing-conversions.WarnOnFloatingPointNarrowingConversion: false
+  bugprone-narrowing-conversions.WarnOnIntegerNarrowingConversion: false
+  bugprone-narrowing-conversions.WarnOnIntegerToFloatingPointNarrowingConversion: false
+  readability-implicit-bool-conversion.AllowLogicalOperatorConversion: true
+  readability-implicit-bool-conversion.AllowPointerConditions: true
+  # Some data model structs are missing some special functions by design.
+  cppcoreguidelines-special-member-functions.AllowMissingMoveFunctions: true
   # Naming conventions
-  - { key: readability-identifier-naming.ClassCase, value: CamelCase }
-  - { key: readability-identifier-naming.ClassMemberPrefix, value: m }
-  - { key: readability-identifier-naming.ConceptCase, value: CamelCase }
-  - { key: readability-identifier-naming.ConstexprVariableCase, value: CamelCase }
-  - { key: readability-identifier-naming.EnumCase, value: CamelCase }
-  - { key: readability-identifier-naming.EnumConstantCase, value: CamelCase }
-  - { key: readability-identifier-naming.EnumConstantIgnoredRegexp, value: "^k?[A-Z][a-zA-Z0-9_]*$" }  # Allow "k" prefix and non-trailing underscores in PDG names.
-  - { key: readability-identifier-naming.FunctionCase, value: camelBack }
-  - { key: readability-identifier-naming.MacroDefinitionCase, value: UPPER_CASE }
-  - { key: readability-identifier-naming.MacroDefinitionIgnoredRegexp, value: "^[A-Z][A-Z0-9_]*_$" }  # Allow the trailing underscore in header guards.
-  - { key: readability-identifier-naming.MemberCase, value: camelBack }
-  - { key: readability-identifier-naming.NamespaceCase, value: lower_case }
-  - { key: readability-identifier-naming.ParameterCase, value: camelBack }
-  - { key: readability-identifier-naming.StructCase, value: CamelCase }
-  - { key: readability-identifier-naming.TemplateParameterCase, value: CamelCase }
-  - { key: readability-identifier-naming.TypeAliasCase, value: CamelCase }
-  - { key: readability-identifier-naming.TypedefCase, value: CamelCase }
-  - { key: readability-identifier-naming.TypeTemplateParameterCase, value: CamelCase }
-  - { key: readability-identifier-naming.VariableCase, value: camelBack }
+  readability-identifier-naming.ClassCase: CamelCase
+  readability-identifier-naming.ClassMemberPrefix: m
+  readability-identifier-naming.ConceptCase: CamelCase
+  readability-identifier-naming.ConstexprVariableCase: CamelCase
+  readability-identifier-naming.EnumCase: CamelCase
+  readability-identifier-naming.EnumConstantCase: CamelCase
+  readability-identifier-naming.EnumConstantIgnoredRegexp: "^k?[A-Z][a-zA-Z0-9_]*$" # Allow "k" prefix and non-trailing underscores in PDG names.
+  readability-identifier-naming.FunctionCase: camelBack
+  readability-identifier-naming.MacroDefinitionCase: UPPER_CASE
+  readability-identifier-naming.MacroDefinitionIgnoredRegexp: "^[A-Z][A-Z0-9_]*_$" # Allow the trailing underscore in header guards.
+  readability-identifier-naming.MemberCase: camelBack
+  readability-identifier-naming.NamespaceCase: lower_case
+  readability-identifier-naming.ParameterCase: camelBack
+  readability-identifier-naming.StructCase: CamelCase
+  readability-identifier-naming.TemplateParameterCase: CamelCase
+  readability-identifier-naming.TypeAliasCase: CamelCase
+  readability-identifier-naming.TypedefCase: CamelCase
+  readability-identifier-naming.TypeTemplateParameterCase: CamelCase
+  readability-identifier-naming.VariableCase: camelBack
+...

.github/workflows/mega-linter.yml

@@ -23,7 +23,7 @@ jobs:
     steps:
       # Git Checkout
       - name: Checkout Code
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
         with:
           # Checkout the HEAD of the PR instead of the merge commit.
           ref: ${{ github.event.pull_request.head.sha }}
@@ -32,13 +32,14 @@ jobs:
           fetch-depth: 0
           # So we can use secrets.ALIBUILD_GITHUB_TOKEN to push later.
           persist-credentials: false
+          allow-unsafe-pr-checkout: true # needed for pull_request_target
 
       # MegaLinter
       - name: MegaLinter
         id: ml
         # You can override MegaLinter flavor used to have faster performances
         # More info at https://megalinter.io/flavors/
-        uses: oxsecurity/megalinter@v9.5.0
+        uses: oxsecurity/megalinter@v9.6.0
         env:
           # All available variables are described in documentation:
           # https://megalinter.io/configuration/

.github/workflows/o2-linter.yml

@@ -30,10 +30,11 @@ jobs:
           echo BRANCH_HEAD="$branch_head" >> "$GITHUB_ENV"
           echo BRANCH_BASE="$branch_base" >> "$GITHUB_ENV"
       - name: Checkout Code
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
         with:
           ref: ${{ env.BRANCH_HEAD }}
           fetch-depth: 0 # needed to get the full history
+          allow-unsafe-pr-checkout: true # needed for pull_request_target
       - name: Run tests
         id: linter
         run: |

.mega-linter.yml

@@ -42,6 +42,6 @@ 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"]
 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
+CPP_CPPCHECK_ARGUMENTS: --language=c++ --std=c++20 --enable=style --check-level=exhaustive --suppressions-list=cppcheck_suppressions --inline-suppr --force
 REPOSITORY_GITLEAKS_PR_COMMITS_SCAN: true
 ACTION_ZIZMOR_UNSECURED_ENV_VARIABLES: [GITHUB_TOKEN]

ALICE3/TableProducer/alice3MulticharmFinder.cxx

@@ -216,10 +216,6 @@ struct Alice3MulticharmFinder {
     std::array<float, 3> prong0mom;
     std::array<float, 3> prong1mom;
     std::array<float, o2::track::kLabCovMatSize> parentTrackCovMatrix;
-
-    // charm daughters
-    int nSiliconHitsPiCC;
-    int nTPCHitsPiCC;
   } thisXiccCandidate;
 
   struct ProngInfo {
@@ -714,7 +710,7 @@ struct Alice3MulticharmFinder {
 
           o2::track::TrackParCov xicTrack(thisXicCandidate.xyz, momentumC, thisXicCandidate.parentTrackCovMatrix, +1);
           float xicDecayRadius2D = std::hypot(thisXicCandidate.xyz[0], thisXicCandidate.xyz[1]);
-          if (xicDecayRadius2D < xiccMinDecayRadius) {
+          if (xicDecayRadius2D < xicMinDecayRadius) {
             continue; // do not take if radius too small, likely a primary combination
           }
 

Common/Core/fwdtrackUtilities.h

@@ -18,7 +18,6 @@
 #ifndef COMMON_CORE_FWDTRACKUTILITIES_H_
 #define COMMON_CORE_FWDTRACKUTILITIES_H_
 
-#include <Framework/AnalysisDataModel.h>
 #include <Framework/DataTypes.h>
 #include <GlobalTracking/MatchGlobalFwd.h>
 #include <MCHTracking/TrackExtrap.h>
@@ -48,22 +47,32 @@ using SMatrix55 = ROOT::Math::SMatrix<double, 5, 5, ROOT::Math::MatRepSym<double
 using SMatrix55Std = ROOT::Math::SMatrix<double, 5>;
 using SMatrix5 = ROOT::Math::SVector<double, 5>;
 
+template <typename T>
+concept is_fwd_track = requires(T t) {
+  { t.rAtAbsorberEnd() } -> std::same_as<float>;
+};
+
+template <typename T>
+concept is_fwd_cov = requires(T t) {
+  { t.sigmaX() } -> std::same_as<float>;
+};
+
 /// Produce TrackParCovFwds for MFT and FwdTracks, w/ or w/o cov, with z shift
 template <typename TFwdTrack, typename... TCovariance>
 o2::track::TrackParCovFwd getTrackParCovFwdShift(TFwdTrack const& track, float zshift, TCovariance const&... covOpt)
 {
   double chi2 = track.chi2();
   if constexpr (sizeof...(covOpt) == 0) {
     // No covariance passed
-    if constexpr (std::is_same_v<std::decay_t<TFwdTrack>, aod::FwdTracks::iterator>) {
+    if constexpr (is_fwd_track<TFwdTrack>) {
       if (track.trackType() == o2::aod::fwdtrack::ForwardTrackTypeEnum::MuonStandaloneTrack) {
         chi2 = track.chi2() * (2.f * track.nClusters() - 5.f);
       }
     }
   } else {
     // Covariance passed
     using TCov = std::decay_t<decltype((covOpt, ...))>;
-    if constexpr (std::is_same_v<TCov, aod::FwdTracksCov::iterator>) {
+    if constexpr (is_fwd_cov<TCov>) {
       if (track.trackType() == o2::aod::fwdtrack::ForwardTrackTypeEnum::MuonStandaloneTrack) {
         chi2 = track.chi2() * (2.f * track.nClusters() - 5.f);
       }

Common/TableProducer/match-mft-ft0.cxx

@@ -124,11 +124,11 @@ T getCompatibleBCs(aod::AmbiguousMFTTrack const& atrack, aod::Collision const& c
   }
 
   if (bcIt != bcs.end() && maxBCId >= minBCId) {
-    T slice{{bcs.asArrowTable()->Slice(minBCId, maxBCId - minBCId + 1)}, (uint64_t)minBCId};
+    auto slice = bcs.rawSlice(minBCId, maxBCId - minBCId + 1);
     bcs.copyIndexBindings(slice);
     return slice;
   } else {
-    T slice{{bcs.asArrowTable()->Slice(minBCId, maxBCId - minBCId)}, (uint64_t)minBCId};
+    auto slice = bcs.rawSlice(minBCId, maxBCId - minBCId);
     bcs.copyIndexBindings(slice);
     return slice;
   }
@@ -141,18 +141,10 @@ T getCompatibleBCs(aod::MFTTracks::iterator const& track, aod::Collision const&
   // define firstBC and lastBC (globalBC of beginning and end of the range, when no shift is applied)
 
   auto bcIt = collOrig.bc_as<T>();
-  // auto timstp = bcIt.timestamp();
 
   int64_t firstBC = bcIt.globalBC() + (track.trackTime() - track.trackTimeRes()) / o2::constants::lhc::LHCBunchSpacingNS;
   int64_t lastBC = firstBC + 2 * track.trackTimeRes() / o2::constants::lhc::LHCBunchSpacingNS + 1; // to have a delta = 198 BC
 
-  // printf(">>>>>>>>>>>>>>>>>>>>>>>>>>> last-first %lld\n", lastBC-firstBC);
-
-  // int collTimeResInBC = collOrig.collisionTimeRes()/o2::constants::lhc::LHCBunchSpacingNS;
-
-  // int64_t collFirstBC = bcIt.globalBC() + (collOrig.collisionTime() - collOrig.collisionTimeRes())/o2::constants::lhc::LHCBunchSpacingNS;
-  // int64_t collLastBC = collFirstBC + 2*collOrig.collisionTimeRes()/o2::constants::lhc::LHCBunchSpacingNS +1;
-
   int64_t minBCId = bcIt.globalIndex();
 
   if ((int64_t)bcIt.globalBC() < firstBC + deltaBC) {
@@ -195,9 +187,7 @@ T getCompatibleBCs(aod::MFTTracks::iterator const& track, aod::Collision const&
       {
         // means that the slice of compatible BCs is empty
 
-        T slice{{bcs.asArrowTable()->Slice(0, 0)}, (uint64_t)0};
-        // bcs.copyIndexBindings(slice); REMOVED IT BECAUSE I DON'T KNOW WHAT IT DOES HERE
-        return slice; // returns an empty slice
+        return bcs.emptySlice();
       }
     }
   }
@@ -209,9 +199,7 @@ T getCompatibleBCs(aod::MFTTracks::iterator const& track, aod::Collision const&
     if (bcIt != bcs.end() && ((int64_t)bcIt.globalBC() > (int64_t)lastBC + deltaBC)) {
       // check the following element
 
-      T slice{{bcs.asArrowTable()->Slice(0, 0)}, (uint64_t)0};
-      // bcs.copyIndexBindings(slice); REMOVED IT BECAUSE I DON'T KNOW WHAT IT DOES HERE
-      return slice; // returns an empty slice
+      return bcs.emptySlice();
     }
   }
 
@@ -222,15 +210,10 @@ T getCompatibleBCs(aod::MFTTracks::iterator const& track, aod::Collision const&
   }
 
   if (maxBCId < minBCId) {
-    if (bcIt == bcs.end()) {
-      printf("at the end of the bcs iterator %d\n", 1);
-    }
-    T slice{{bcs.asArrowTable()->Slice(0, 0)}, (uint64_t)0};
-    // bcs.copyIndexBindings(slice); REMOVED IT BECAUSE I DON'T KNOW WHAT IT DOES HERE
-    return slice; // returns an empty slice
+    return bcs.emptySlice();
   }
 
-  T slice{{bcs.asArrowTable()->Slice(minBCId, maxBCId - minBCId + 1)}, (uint64_t)minBCId};
+  auto slice = bcs.rawSlice(minBCId, maxBCId - minBCId + 1);
   bcs.copyIndexBindings(slice);
   return slice;
 }