Skip to content

Commit 66f069c

Browse files
Shunsuke-KuritaShunsuke-Kurita
authored
Merge branch 'AliceO2Group:master' into master
2 parents 607f2f6 + 1e1faca commit 66f069c

202 files changed

Lines changed: 11859 additions & 5692 deletions

File tree

Some content is hidden

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

‎.github/workflows/clean-test.yml‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
---
2+
name: Clean PR checks
3+
4+
'on':
5+
workflow_dispatch:
6+
inputs:
7+
pr:
8+
description: PR number in this repo to be cleaned
9+
type: string # can't use number here
10+
required: true
11+
message:
12+
description: Human-readable message displayed on the new pending status
13+
type: string
14+
required: false
15+
default: ''
16+
17+
# Warning: GitHub limits the total number of inputs to 10, so a maximum of
18+
# 8 checks is allowed here!
19+
# Warning: the check_* keys are magic and must consist of the string
20+
# "check_" followed by the applicable check name exactly. The
21+
# "description" field is only the human-readable label for the input.
22+
'check_build/O2Physics/o2/macOS-arm':
23+
description: build/O2Physics/o2/macOS-arm
24+
type: boolean
25+
default: true
26+
27+
'check_build/O2Physics/o2/macOS':
28+
description: build/O2Physics/o2/macOS
29+
type: boolean
30+
default: true
31+
32+
'check_build/O2Physics/o2':
33+
description: build/O2Physics/o2
34+
type: boolean
35+
default: true
36+
37+
permissions: {}
38+
39+
jobs:
40+
clean:
41+
name: Clean PR checks
42+
uses: alisw/ali-bot/.github/workflows/clean-pr-checks.yml@master
43+
with:
44+
owner: ${{ github.event.repository.owner.login }}
45+
repo: ${{ github.event.repository.name }}
46+
pr: ${{ github.event.inputs.pr }}
47+
message: ${{ github.event.inputs.message }}
48+
checks: ${{ toJSON(github.event.inputs) }}
49+
permissions:
50+
pull-requests: read # to get last commit for pr (octokit/graphql-action)
51+
statuses: write # for set-github-status

‎.github/workflows/labeler.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,4 @@ jobs:
1414
- uses: actions/labeler@v5
1515
with:
1616
repo-token: ${{ secrets.GITHUB_TOKEN }}
17+
sync-labels: true

‎CODEOWNERS‎

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,21 +27,33 @@
2727
/EventFiltering/PWGCF @alibuild @lauraser @mpuccio @lietava
2828
/EventFiltering/PWGMM @alibuild @aortizve @mpuccio @lietava
2929
/EventFiltering/PWGJE @alibuild @fkrizek @nzardosh @mpuccio @lietava
30-
/PWGCF @alibuild @saganatt @victor-gonzalez @zchochul
31-
/PWGCF/Core @alibuild @jgrosseo @saganatt @victor-gonzalez @zchochul
32-
/PWGCF/DataModel @alibuild @jgrosseo @saganatt @victor-gonzalez @zchochul
33-
/PWGCF/TableProducer @alibuild @jgrosseo @saganatt @victor-gonzalez @zchochul
34-
/PWGCF/Tasks @alibuild @jgrosseo @saganatt @victor-gonzalez @zchochul
30+
/PWGCF @alibuild @saganatt @victor-gonzalez @zchochul @lgraczykCern @prchakra @lauraser @ariedel-cern @EmilGorm @otonvd @shouqiye
31+
/PWGCF/Core @alibuild @jgrosseo @saganatt @victor-gonzalez @zchochul @lgraczykCern @prchakra @lauraser @ariedel-cern @EmilGorm @otonvd @shouqiye
32+
/PWGCF/DataModel @alibuild @jgrosseo @saganatt @victor-gonzalez @zchochul @lgraczykCern @prchakra @lauraser @ariedel-cern @EmilGorm @otonvd @shouqiye
33+
/PWGCF/TableProducer @alibuild @jgrosseo @saganatt @victor-gonzalez @zchochul @lgraczykCern @prchakra @lauraser @ariedel-cern @EmilGorm @otonvd @shouqiye
34+
/PWGCF/Tasks @alibuild @jgrosseo @saganatt @victor-gonzalez @zchochul @lgraczykCern @prchakra @lauraser @ariedel-cern @EmilGorm @otonvd @shouqiye
3535
/PWGDQ @alibuild @iarsene @dsekihat @feisenhu @lucamicheletti93
3636
/PWGEM @alibuild @mikesas @rbailhac @feisenhu
3737
/PWGEM/Dilepton @alibuild @mikesas @rbailhac @dsekihat @ivorobye @feisenhu
3838
/PWGEM/PhotonMeson @alibuild @mikesas @rbailhac @m-c-danisch @novitzky @mhemmer-cern @dsekihat
3939
/PWGHF @alibuild @vkucera @fcolamar @fgrosa @fcatalan92 @mfaggin @mmazzilli @deepathoms @NicoleBastid @hahassan7 @jpxrk @apalasciano
40-
/PWGLF @alibuild @ercolessi @fmazzasc @chiarapinto @maciacco @BongHwi @smaff92 @ChiaraDeMartin95 @njacazio @skundu692
41-
/PWGMM @alibuild @aalkin @njacazio @skundu692
40+
# PWG-LF
41+
/PWGLF @alibuild @njacazio @skundu692
42+
/PWGLF/Tasks/GlobalEventProperties @alibuild @njacazio @skundu692 @gbencedi @omvazque
43+
/PWGLF/TableProducer/GlobalEventProperties @alibuild @njacazio @skundu692 @gbencedi @omvazque
44+
/PWGLF/Tasks/Nuspex @alibuild @njacazio @skundu692 @fmazzasc @chiarapinto @maciacco
45+
/PWGLF/TableProducer/Nuspex @alibuild @njacazio @skundu692 @fmazzasc @chiarapinto @maciacco
46+
/PWGLF/Tasks/Resonances @alibuild @njacazio @skundu692 @BongHwi @smaff92
47+
/PWGLF/TableProducer/Resonances @alibuild @njacazio @skundu692 @BongHwi @smaff92
48+
/PWGLF/Tasks/Strangeness @alibuild @njacazio @skundu692 @ercolessi @ChiaraDeMartin95
49+
/PWGLF/TableProducer/Strangeness @alibuild @njacazio @skundu692 @ercolessi @ChiaraDeMartin95
50+
51+
# PWG-MM
52+
/PWGMM @alibuild @njacazio @skundu692 @aalkin
53+
/PWGMM/Mult @alibuild @njacazio @skundu692 @aalkin @aortizve @ddobrigk
4254
/PWGMM/Lumi @alibuild @aalkin
43-
/PWGMM/Mult @alibuild @aalkin @aortizve @ddobrigk
44-
/PWGMM/UE @alibuild @aalkin @aortizve
55+
/PWGMM/UE @alibuild @aalkin @aortizve
56+
4557
/PWGUD @alibuild @pbuehler @abylinkin @rolavick
4658
/PWGJE @alibuild @lhavener @maoyx @nzardosh @ddobrigk @mfasDa
4759
/Tools/PIDML @alibuild @saganatt

‎Common/CCDB/EventSelectionParams.cxx‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,12 @@ const char* selectionLabels[kNsel] = {
5555
"kIsVertexITSTPC",
5656
"kIsVertexTOFmatched",
5757
"kIsVertexTRDmatched",
58-
"kNoHighOccupancyAgressive",
59-
"kNoHighOccupancyStrict",
60-
"kNoHighOccupancyMedium",
61-
"kNoHighOccupancyRelaxed",
62-
"kNoHighOccupancyGentle",
58+
"kNoCollInTimeRangeNarrow",
59+
"kNoCollInTimeRangeStrict",
6360
"kNoCollInTimeRangeStandard",
64-
"kNoCollInTimeRangeNarrow"};
61+
"kNoCollInTimeRangeVzDependent",
62+
"kNoCollInRofStrict",
63+
"kNoCollInRofStandard"};
6564
} // namespace o2::aod::evsel
6665

6766
using namespace o2::aod::evsel;

‎Common/CCDB/EventSelectionParams.h‎

Lines changed: 48 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -19,55 +19,54 @@ namespace o2::aod::evsel
1919
{
2020
// Event selection criteria
2121
enum EventSelectionFlags {
22-
kIsBBV0A = 0, // cell-averaged time in V0A in beam-beam window
23-
kIsBBV0C, // cell-averaged time in V0C in beam-beam window (for Run 2 only)
24-
kIsBBFDA, // cell-averaged time in FDA (or AD in Run2) in beam-beam window
25-
kIsBBFDC, // cell-averaged time in FDC (or AD in Run2) in beam-beam window
26-
kIsBBT0A, // cell-averaged time in T0A in beam-beam window
27-
kIsBBT0C, // cell-averaged time in T0C in beam-beam window
28-
kNoBGV0A, // cell-averaged time in V0A in beam-gas window
29-
kNoBGV0C, // cell-averaged time in V0C in beam-gas window (for Run 2 only)
30-
kNoBGFDA, // cell-averaged time in FDA (AD in Run2) in beam-gas window
31-
kNoBGFDC, // cell-averaged time in FDC (AD in Run2) in beam-gas window
32-
kNoBGT0A, // cell-averaged time in T0A in beam-gas window
33-
kNoBGT0C, // cell-averaged time in T0C in beam-gas window
34-
kIsBBZNA, // time in common ZNA channel in beam-beam window
35-
kIsBBZNC, // time in common ZNC channel in beam-beam window
36-
kIsBBZAC, // time in ZNA and ZNC in beam-beam window - circular cut in ZNA-ZNC plane
37-
kNoBGZNA, // time in common ZNA channel is outside of beam-gas window
38-
kNoBGZNC, // time in common ZNC channel is outside of beam-gas window
39-
kNoV0MOnVsOfPileup, // no out-of-bunch pileup according to online-vs-offline VOM correlation
40-
kNoSPDOnVsOfPileup, // no out-of-bunch pileup according to online-vs-offline SPD correlation
41-
kNoV0Casymmetry, // no beam-gas according to correlation of V0C multiplicities in V0C3 and V0C012
42-
kIsGoodTimeRange, // good time range
43-
kNoIncompleteDAQ, // complete event according to DAQ flags
44-
kNoTPCLaserWarmUp, // no TPC laser warm-up event (used in Run 1)
45-
kNoTPCHVdip, // no TPC HV dip
46-
kNoPileupFromSPD, // no pileup according to SPD vertexer
47-
kNoV0PFPileup, // no out-of-bunch pileup according to V0 past-future info
48-
kNoSPDClsVsTklBG, // no beam-gas according to cluster-vs-tracklet correlation
49-
kNoV0C012vsTklBG, // no beam-gas according to V0C012-vs-tracklet correlation
50-
kNoInconsistentVtx, // no inconsistency in SPD and Track vertices
51-
kNoPileupInMultBins, // no pileup according to multiplicity-differential pileup checks
52-
kNoPileupMV, // no pileup according to multi-vertexer
53-
kNoPileupTPC, // no pileup in TPC
54-
kIsTriggerTVX, // FT0 vertex (acceptable FT0C-FT0A time difference) at trigger level
55-
kIsINT1, // SPDGFO >= 1 || V0A || V0C
56-
kNoITSROFrameBorder, // bunch crossing is far from ITS RO Frame border
57-
kNoTimeFrameBorder, // bunch crossing is far from Time Frame borders
58-
kNoSameBunchPileup, // reject collisions in case of pileup with another collision in the same foundBC
59-
kIsGoodZvtxFT0vsPV, // small difference between z-vertex from PV and from FT0
60-
kIsVertexITSTPC, // at least one ITS-TPC track (reject vertices built from ITS-only tracks)
61-
kIsVertexTOFmatched, // at least one of vertex contributors is matched to TOF
62-
kIsVertexTRDmatched, // at least one of vertex contributors is matched to TRD
63-
kNoHighOccupancyAgressive, // no occupancy according to the agressive cuts
64-
kNoHighOccupancyStrict, // no occupancy according to the strict cuts
65-
kNoHighOccupancyMedium, // no occupancy according to the medium cuts
66-
kNoHighOccupancyRelaxed, // no occupancy according to the relaxed cuts
67-
kNoHighOccupancyGentle, // no occupancy according to the gentle cuts
68-
kNoCollInTimeRangeStandard, // no collisions in specified time range
69-
kNoCollInTimeRangeNarrow, // no collisions in specified time range (narrower than Standard)
70-
kNsel // counter
22+
kIsBBV0A = 0, // cell-averaged time in V0A in beam-beam window
23+
kIsBBV0C, // cell-averaged time in V0C in beam-beam window (for Run 2 only)
24+
kIsBBFDA, // cell-averaged time in FDA (or AD in Run2) in beam-beam window
25+
kIsBBFDC, // cell-averaged time in FDC (or AD in Run2) in beam-beam window
26+
kIsBBT0A, // cell-averaged time in T0A in beam-beam window
27+
kIsBBT0C, // cell-averaged time in T0C in beam-beam window
28+
kNoBGV0A, // cell-averaged time in V0A in beam-gas window
29+
kNoBGV0C, // cell-averaged time in V0C in beam-gas window (for Run 2 only)
30+
kNoBGFDA, // cell-averaged time in FDA (AD in Run2) in beam-gas window
31+
kNoBGFDC, // cell-averaged time in FDC (AD in Run2) in beam-gas window
32+
kNoBGT0A, // cell-averaged time in T0A in beam-gas window
33+
kNoBGT0C, // cell-averaged time in T0C in beam-gas window
34+
kIsBBZNA, // time in common ZNA channel in beam-beam window
35+
kIsBBZNC, // time in common ZNC channel in beam-beam window
36+
kIsBBZAC, // time in ZNA and ZNC in beam-beam window - circular cut in ZNA-ZNC plane
37+
kNoBGZNA, // time in common ZNA channel is outside of beam-gas window
38+
kNoBGZNC, // time in common ZNC channel is outside of beam-gas window
39+
kNoV0MOnVsOfPileup, // no out-of-bunch pileup according to online-vs-offline VOM correlation
40+
kNoSPDOnVsOfPileup, // no out-of-bunch pileup according to online-vs-offline SPD correlation
41+
kNoV0Casymmetry, // no beam-gas according to correlation of V0C multiplicities in V0C3 and V0C012
42+
kIsGoodTimeRange, // good time range
43+
kNoIncompleteDAQ, // complete event according to DAQ flags
44+
kNoTPCLaserWarmUp, // no TPC laser warm-up event (used in Run 1)
45+
kNoTPCHVdip, // no TPC HV dip
46+
kNoPileupFromSPD, // no pileup according to SPD vertexer
47+
kNoV0PFPileup, // no out-of-bunch pileup according to V0 past-future info
48+
kNoSPDClsVsTklBG, // no beam-gas according to cluster-vs-tracklet correlation
49+
kNoV0C012vsTklBG, // no beam-gas according to V0C012-vs-tracklet correlation
50+
kNoInconsistentVtx, // no inconsistency in SPD and Track vertices
51+
kNoPileupInMultBins, // no pileup according to multiplicity-differential pileup checks
52+
kNoPileupMV, // no pileup according to multi-vertexer
53+
kNoPileupTPC, // no pileup in TPC
54+
kIsTriggerTVX, // FT0 vertex (acceptable FT0C-FT0A time difference) at trigger level
55+
kIsINT1, // SPDGFO >= 1 || V0A || V0C
56+
kNoITSROFrameBorder, // bunch crossing is far from ITS RO Frame border
57+
kNoTimeFrameBorder, // bunch crossing is far from Time Frame borders
58+
kNoSameBunchPileup, // reject collisions in case of pileup with another collision in the same foundBC
59+
kIsGoodZvtxFT0vsPV, // small difference between z-vertex from PV and from FT0
60+
kIsVertexITSTPC, // at least one ITS-TPC track (reject vertices built from ITS-only tracks)
61+
kIsVertexTOFmatched, // at least one of vertex contributors is matched to TOF
62+
kIsVertexTRDmatched, // at least one of vertex contributors is matched to TRD
63+
kNoCollInTimeRangeNarrow, // no other collisions in specified time range (narrower than Strict)
64+
kNoCollInTimeRangeStrict, // no other collisions in specified time range
65+
kNoCollInTimeRangeStandard, // no other collisions in specified time range with per-collision multiplicity above threshold
66+
kNoCollInTimeRangeVzDependent, // no other collisions in vZ-dependent time range near a given collision
67+
kNoCollInRofStrict, // no other collisions in this Readout Frame
68+
kNoCollInRofStandard, // no other collisions in this Readout Frame with per-collision multiplicity above threshold
69+
kNsel // counter
7170
};
7271

7372
extern const char* selectionLabels[kNsel];

0 commit comments

Comments
 (0)