Skip to content

Commit 21fbabd

Browse files
njacazionjacazio
authored
Merge branch 'master' into nj-ft0plust0feventtime
2 parents 8c2ac0c + d3c2e47 commit 21fbabd

File tree

326 files changed

+16789
-7700
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

326 files changed

+16789
-7700
lines changed

‎.clang-format‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ IncludeCategories:
5151
Priority: 3
5252
CaseSensitive: true
5353
# O2
54-
- Regex: ^(<|")(Algorithm|CCDB|Common[A-Z]|DataFormats|DCAFitter|Detectors|EMCAL|Field|Framework|FT0|FV0|GlobalTracking|ITS|MathUtils|MFT|MCH|MID|PHOS|PID|ReconstructionDataFormats|SimulationDataFormat|TOF|TPC|ZDC).*/.*\.h
54+
- Regex: ^(<|")(Algorithm|CCDB|Common[A-Z]|DataFormats|DCAFitter|Detectors|EMCAL|Field|Framework|FT0|FV0|GlobalTracking|GPU|ITS|MathUtils|MFT|MCH|MID|PHOS|PID|ReconstructionDataFormats|SimulationDataFormat|TOF|TPC|ZDC).*/.*\.h
5555
Priority: 4
5656
CaseSensitive: true
5757
# ROOT

‎.github/workflows/mega-linter.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
steps:
2424
# Git Checkout
2525
- name: Checkout Code
26-
uses: actions/checkout@v4
26+
uses: actions/checkout@v5
2727
with:
2828
# Checkout the HEAD of the PR instead of the merge commit.
2929
ref: ${{ github.event.pull_request.head.sha }}
@@ -38,7 +38,7 @@ jobs:
3838
id: ml
3939
# You can override MegaLinter flavor used to have faster performances
4040
# More info at https://megalinter.io/flavors/
41-
uses: oxsecurity/megalinter@v8.7.0
41+
uses: oxsecurity/megalinter@v8.8.0
4242
env:
4343
# All available variables are described in documentation:
4444
# https://megalinter.io/configuration/

‎.github/workflows/o2-linter.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
echo BRANCH_HEAD="$branch_head" >> "$GITHUB_ENV"
3131
echo BRANCH_BASE="$branch_base" >> "$GITHUB_ENV"
3232
- name: Checkout Code
33-
uses: actions/checkout@v4
33+
uses: actions/checkout@v5
3434
with:
3535
ref: ${{ env.BRANCH_HEAD }}
3636
fetch-depth: 0 # needed to get the full history

‎.github/workflows/stale.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ on:
55
- cron: "0 0 * * *"
66

77
permissions:
8+
actions: write
89
issues: write
910
pull-requests: write
1011

‎CODEOWNERS‎

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -29,40 +29,41 @@
2929
/EventFiltering/PWGCF @alibuild @lauraser @mpuccio @lietava
3030
/EventFiltering/PWGMM @alibuild @aortizve @mpuccio @lietava
3131
/EventFiltering/PWGJE @alibuild @fkrizek @nzardosh @mpuccio @lietava
32-
/PWGCF @alibuild @saganatt @victor-gonzalez @zchochul @lgraczykCern @prchakra @lauraser @ariedel-cern @EmilGorm @otonvd @shouqiye @glromane
33-
/PWGCF/Core @alibuild @jgrosseo @saganatt @victor-gonzalez @zchochul @lgraczykCern @prchakra @lauraser @ariedel-cern @EmilGorm @otonvd @shouqiye @glromane
34-
/PWGCF/DataModel @alibuild @jgrosseo @saganatt @victor-gonzalez @zchochul @lgraczykCern @prchakra @lauraser @ariedel-cern @EmilGorm @otonvd @shouqiye @glromane
35-
/PWGCF/TableProducer @alibuild @jgrosseo @saganatt @victor-gonzalez @zchochul @lgraczykCern @prchakra @lauraser @ariedel-cern @EmilGorm @otonvd @shouqiye @glromane
36-
/PWGCF/Tasks @alibuild @jgrosseo @saganatt @victor-gonzalez @zchochul @lgraczykCern @prchakra @lauraser @ariedel-cern @EmilGorm @otonvd @shouqiye @glromane
37-
/PWGDQ @alibuild @iarsene @mcoquet642 @lucamicheletti93
32+
33+
/PWGCF @alibuild @victor-gonzalez @zchochul @lgraczykCern @prchakra @lauraser @ariedel-cern @EmilGorm @otonvd @shouqiye @glromane
34+
/PWGCF/Core @alibuild @jgrosseo @victor-gonzalez @zchochul @lgraczykCern @prchakra @lauraser @ariedel-cern @EmilGorm @otonvd @shouqiye @glromane
35+
/PWGCF/DataModel @alibuild @jgrosseo @victor-gonzalez @zchochul @lgraczykCern @prchakra @lauraser @ariedel-cern @EmilGorm @otonvd @shouqiye @glromane
36+
/PWGCF/TableProducer @alibuild @jgrosseo @victor-gonzalez @zchochul @lgraczykCern @prchakra @lauraser @ariedel-cern @EmilGorm @otonvd @shouqiye @glromane
37+
/PWGCF/Tasks @alibuild @jgrosseo @victor-gonzalez @zchochul @lgraczykCern @prchakra @lauraser @ariedel-cern @EmilGorm @otonvd @shouqiye @glromane
38+
/PWGDQ @alibuild @iarsene @mcoquet642 @lucamicheletti93 @XiaozhiBai
3839
/PWGEM @alibuild @feisenhu @dsekihat @ivorobye
3940
/PWGEM/Dilepton @alibuild @mikesas @rbailhac @dsekihat @ivorobye @feisenhu @hscheid
4041
/PWGEM/PhotonMeson @alibuild @mikesas @rbailhac @m-c-danisch @novitzky @mhemmer-cern @dsekihat
4142
/PWGHF @alibuild @vkucera @fcolamar @fgrosa @fcatalan92 @mfaggin @mmazzilli @deepathoms @NicoleBastid @hahassan7 @jpxrk @apalasciano @zhangbiao-phy @gluparel @stefanopolitano
4243
# PWG-LF
43-
/PWGLF @alibuild @sustripathy @skundu692
44-
/PWGLF/DataModel @alibuild @sustripathy @skundu692 @gbencedi @abmodak @fmazzasc @maciacco @dmallick2 @smaff92 @ercolessi @romainschotter
45-
/PWGLF/Tasks/GlobalEventProperties @alibuild @sustripathy @skundu692 @gbencedi @abmodak @omvazque
46-
/PWGLF/TableProducer/GlobalEventProperties @alibuild @sustripathy @skundu692 @gbencedi @abmodak @omvazque
47-
/PWGLF/Tasks/Nuspex @alibuild @sustripathy @skundu692 @fmazzasc @maciacco
48-
/PWGLF/TableProducer/Nuspex @alibuild @sustripathy @skundu692 @fmazzasc @maciacco
49-
/PWGLF/Tasks/Resonances @alibuild @sustripathy @skundu692 @dmallick2 @smaff92
50-
/PWGLF/TableProducer/Resonances @alibuild @sustripathy @skundu692 @dmallick2 @smaff92
51-
/PWGLF/Tasks/Strangeness @alibuild @sustripathy @skundu692 @ercolessi @romainschotter
52-
/PWGLF/TableProducer/Strangeness @alibuild @sustripathy @skundu692 @ercolessi @romainschotter
53-
/PWGLF/Utils @alibuild @sustripathy @skundu692 @gbencedi @abmodak @fmazzasc @maciacco @dmallick2 @smaff92 @ercolessi @romainschotter
44+
/PWGLF @alibuild @sustripathy @skundu692 @mpuccio
45+
/PWGLF/DataModel @alibuild @sustripathy @skundu692 @mpuccio @gbencedi @abmodak @fmazzasc @maciacco @dmallick2 @smaff92 @ercolessi @romainschotter
46+
/PWGLF/Tasks/GlobalEventProperties @alibuild @sustripathy @skundu692 @mpuccio @gbencedi @abmodak @omvazque
47+
/PWGLF/TableProducer/GlobalEventProperties @alibuild @sustripathy @skundu692 @mpuccio @gbencedi @abmodak @omvazque
48+
/PWGLF/Tasks/Nuspex @alibuild @sustripathy @skundu692 @mpuccio @fmazzasc @maciacco
49+
/PWGLF/TableProducer/Nuspex @alibuild @sustripathy @skundu692 @mpuccio @fmazzasc @maciacco
50+
/PWGLF/Tasks/Resonances @alibuild @sustripathy @skundu692 @mpuccio @dmallick2 @smaff92
51+
/PWGLF/TableProducer/Resonances @alibuild @sustripathy @skundu692 @mpuccio @dmallick2 @smaff92
52+
/PWGLF/Tasks/Strangeness @alibuild @sustripathy @skundu692 @mpuccio @ercolessi @romainschotter
53+
/PWGLF/TableProducer/Strangeness @alibuild @sustripathy @mpuccio @skundu692 @ercolessi @romainschotter
54+
/PWGLF/Utils @alibuild @sustripathy @skundu692 @mpuccio @gbencedi @abmodak @fmazzasc @maciacco @dmallick2 @smaff92 @ercolessi @romainschotter
5455

55-
# PWG-MM
56+
# PWG-MM (fused with LF, LF conveners included. Directories to be merged in the future)
5657
/PWGMM @alibuild @sustripathy @skundu692 @aalkin @jgcn
5758
/PWGMM/Mult @alibuild @sustripathy @skundu692 @aalkin @aortizve @ddobrigk @gbencedi @jgcn
58-
/PWGMM/Lumi @alibuild @aalkin @jgcn
59-
/PWGMM/UE @alibuild @aalkin @aortizve @jgcn
59+
/PWGMM/Lumi @alibuild @sustripathy @skundu692 @aalkin @jgcn @gbencedi @abmodak
60+
/PWGMM/UE @alibuild @sustripathy @skundu692 @aalkin @aortizve @jgcn
6061

6162
/PWGUD @alibuild @pbuehler @nystrand @rolavick
6263
/PWGJE @alibuild @lhavener @maoyx @nzardosh @fjonasALICE @mfasDa @mhemmer-cern
6364
/Tools/PIDML @alibuild @saganatt
6465
/Tools/ML @alibuild @fcatalan92 @fmazzasc
65-
/Tutorials/PWGCF @alibuild @jgrosseo @saganatt @victor-gonzalez @zchochul
66+
/Tutorials/PWGCF @alibuild @jgrosseo @victor-gonzalez @zchochul
6667
/Tutorials/PWGDQ @alibuild @iarsene @mcoquet @lucamicheletti93
6768
/Tutorials/PWGEM @alibuild @mikesas @rbailhac @dsekihat @ivorobye @feisenhu
6869
/Tutorials/PWGHF @alibuild @vkucera @fcolamar @fgrosa @gluparel

‎Common/CCDB/EventSelectionParams.cxx‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818

1919
#include "EventSelectionParams.h"
2020

21+
#include <cstddef>
22+
#include <cstring>
23+
2124
namespace o2::aod::evsel
2225
{
2326
const char* selectionLabels[kNsel] = {

‎Common/CCDB/RCTSelectionFlags.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@
1818
#define COMMON_CCDB_RCTSELECTIONFLAGS_H_
1919

2020
#include <CommonUtils/EnumFlags.h>
21-
#include <Rtypes.h>
22-
#include <TMath.h>
2321

24-
#include <stdexcept>
2522
#include <algorithm>
23+
#include <concepts>
24+
#include <cstdint>
25+
#include <initializer_list>
26+
#include <stdexcept>
2627
#include <string>
27-
#include <vector>
2828

2929
namespace o2::aod::rctsel
3030
{
@@ -98,7 +98,7 @@ class RCTFlagsChecker : public o2::utils::EnumFlags<RCTSelectionFlags>
9898
// - "CBT"
9999
// - "CBT_hadronPID"
100100
// - "CBT_electronPID"
101-
// - "CCBT_calo"
101+
// - "CBT_calo"
102102
// - "CBT_muon"
103103
// - "CBT_muon_glo"
104104
// The checkZDC boolean flag controls whether to iclude the ZDC quality in all the pre-defined selections (for Pb-Pb data)
@@ -121,7 +121,7 @@ class RCTFlagsChecker : public o2::utils::EnumFlags<RCTSelectionFlags>
121121
// - "CBT"
122122
// - "CBT_hadronPID"
123123
// - "CBT_electronPID"
124-
// - "CCBT_calo"
124+
// - "CBT_calo"
125125
// - "CBT_muon"
126126
// - "CBT_muon_glo"
127127
// The checkZDC boolean flag controls whether to iclude the ZDC quality in all the pre-defined selections (for Pb-Pb data)

‎Common/CCDB/TriggerAliases.cxx‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,11 @@
1010
// or submit itself to any jurisdiction.
1111

1212
#include "Common/CCDB/TriggerAliases.h"
13-
#include "Framework/Logger.h"
13+
14+
#include <Framework/Logger.h>
15+
16+
#include <cstdint>
17+
#include <string>
1418

1519
std::string aliasLabels[kNaliases] = {
1620
"kINT7",

‎Common/CCDB/TriggerAliases.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
#define COMMON_CCDB_TRIGGERALIASES_H_
1414

1515
#include <Rtypes.h>
16+
#include <RtypesCore.h>
1617

1718
#include <cstdint>
1819
#include <map>

‎Common/CCDB/ctpRateFetcher.cxx‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,13 @@
1616
#include <DataFormatsCTP/Configuration.h>
1717
#include <DataFormatsCTP/Scalers.h>
1818
#include <DataFormatsParameters/GRPLHCIFData.h>
19+
#include <Framework/Logger.h>
1920

21+
#include <cmath>
22+
#include <cstddef>
23+
#include <cstdint>
2024
#include <map>
25+
#include <ostream>
2126
#include <string>
2227
#include <vector>
2328

0 commit comments

Comments
 (0)