Merge branch 'master' into master

Author: nidamalikk

.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/DataModel/OTFStrangeness.h

@@ -37,6 +37,8 @@ DECLARE_SOA_INDEX_COLUMN_FULL(PosTrack, posTrack, int, Tracks, "_Pos");
 DECLARE_SOA_INDEX_COLUMN_FULL(NegTrack, negTrack, int, Tracks, "_Neg");             //!
 DECLARE_SOA_INDEX_COLUMN_FULL(BachTrack, bachTrack, int, Tracks, "_Bach");          //!
 
+DECLARE_SOA_INDEX_COLUMN(McParticle, mcParticle);
+
 // topo vars
 DECLARE_SOA_COLUMN(DcaV0Daughters, dcaV0Daughters, float);
 DECLARE_SOA_COLUMN(DcaCascadeDaughters, dcaCascadeDaughters, float);
@@ -70,6 +72,9 @@ DECLARE_SOA_TABLE(UpgradeCascades, "AOD", "UPGRADECASCADES",
 
 using UpgradeCascade = UpgradeCascades::iterator;
 
+DECLARE_SOA_TABLE(A3CascadeMcLabels, "AOD", "A3CASCADEMCLABELS",
+                  o2::soa::Index<>, otfcascade::McParticleId);
+
 namespace otfv0
 {
 DECLARE_SOA_INDEX_COLUMN(Collision, collision);                         //!

ALICE3/DataModel/prefilterDilepton.h

@@ -0,0 +1,41 @@
+// 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   collisionExtra.h
+/// \author David Dobrigkeit Chinellato
+/// \since  11/05/2023
+/// \brief  Table for ALICE 3 collision-related info
+///
+
+#ifndef ALICE3_DATAMODEL_PREFILTERDILEPTON_H_
+#define ALICE3_DATAMODEL_PREFILTERDILEPTON_H_
+
+// O2 includes
+#include <Framework/AnalysisDataModel.h>
+
+namespace o2::aod
+{
+
+namespace dileptonanalysisflags
+{
+// DECLARE_SOA_COLUMN(IsMCEventSelected, isMCEventSelected, int);
+DECLARE_SOA_COLUMN(IsEventCentSelected, isEventCentSelected, int);
+DECLARE_SOA_COLUMN(IsTrackPrefilter, isTrackPrefilter, int);
+} // namespace dileptonanalysisflags
+
+// DECLARE_SOA_TABLE(EventMCCuts, "AOD", "EVENTMCCUTS", emanalysisflags::IsMCEventSelected);
+DECLARE_SOA_TABLE(DiEventCentCuts, "AOD", "DIEVENTCENTCUTS", dileptonanalysisflags::IsEventCentSelected);
+DECLARE_SOA_TABLE(DiTrackPrefilter, "AOD", "DITRACKPREFILTER", dileptonanalysisflags::IsTrackPrefilter);
+
+} // namespace o2::aod
+
+#endif // ALICE3_DATAMODEL_PREFILTERDILEPTON_H_

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
           }