Skip to content

Commit 7565e16

Browse files
author
Emil Gorm Nielsen
committed
Merge branch 'master' into NUAweight
2 parents 1303b68 + 4892216 commit 7565e16

File tree

114 files changed

+13266
-5396
lines changed

Some content is hidden

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

114 files changed

+13266
-5396
lines changed

‎CODEOWNERS‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@
1919
/DPG/Tasks/AOTEvent @alibuild @ekryshen @strogolo @altsybee
2020
/DPG/Tasks/AOTTrack @alibuild @mfaggin @iouribelikov @njacazio @lbariogl @f3sch
2121
/DPG/Tasks/TOF @alibuild @noferini @njacazio
22-
/DPG/Tasks/FT0 @alibuild @afurs
22+
/DPG/Tasks/FT0 @alibuild @jotwinow @sahilupadhyaya92 @andreasmolander @afurs
23+
/DPG/Tasks/FV0 @alibuild @jotwinow @sahilupadhyaya92 @andreasmolander @afurs
24+
/DPG/Tasks/FDD @alibuild @jotwinow @sahilupadhyaya92 @andreasmolander @afurs
2325
/EventFiltering @alibuild @mpuccio @lietava
2426
/EventFiltering/PWGHF @alibuild @fgrosa @zhangbiao-phy @mpuccio @lietava
2527
/EventFiltering/PWGUD @alibuild @pbuehler @mpuccio @lietava
@@ -50,7 +52,7 @@
5052

5153
# PWG-MM
5254
/PWGMM @alibuild @njacazio @skundu692 @aalkin
53-
/PWGMM/Mult @alibuild @njacazio @skundu692 @aalkin @aortizve @ddobrigk
55+
/PWGMM/Mult @alibuild @njacazio @skundu692 @aalkin @aortizve @ddobrigk @gbencedi
5456
/PWGMM/Lumi @alibuild @aalkin
5557
/PWGMM/UE @alibuild @aalkin @aortizve
5658

‎Common/CCDB/EventSelectionParams.cxx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ const char* selectionLabels[kNsel] = {
6565
"kNoCollInTimeRangeNarrow",
6666
"kNoCollInTimeRangeStrict",
6767
"kNoCollInTimeRangeStandard",
68-
"kNoCollInTimeRangeVzDependent",
6968
"kNoCollInRofStrict",
7069
"kNoCollInRofStandard",
7170
"kNoHighMultCollInPrevRof",

‎Common/CCDB/EventSelectionParams.h‎

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

8180
extern const char* selectionLabels[kNsel];

‎Common/DataModel/EventSelection.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ DECLARE_SOA_INDEX_COLUMN_FULL(FoundFT0, foundFT0, int, FT0s, "_foundFT0"); //!
6161
DECLARE_SOA_INDEX_COLUMN_FULL(FoundFV0, foundFV0, int, FV0As, "_foundFV0"); //! FV0 entry index in FV0As table (-1 if doesn't exist)
6262
DECLARE_SOA_INDEX_COLUMN_FULL(FoundFDD, foundFDD, int, FDDs, "_foundFDD"); //! FDD entry index in FDDs table (-1 if doesn't exist)
6363
DECLARE_SOA_INDEX_COLUMN_FULL(FoundZDC, foundZDC, int, Zdcs, "_foundZDC"); //! ZDC entry index in ZDCs table (-1 if doesn't exist)
64-
DECLARE_SOA_COLUMN(BcInTF, bcInTF, int); //! Position of a (found) bunch crossing inside a given timeframe
6564
DECLARE_SOA_COLUMN(NumTracksInTimeRange, trackOccupancyInTimeRange, int); //! Occupancy in specified time interval by a number of tracks from nearby collisions // o2-linter: disable=name/o2-column
6665
DECLARE_SOA_COLUMN(SumAmpFT0CInTimeRange, ft0cOccupancyInTimeRange, float); //! Occupancy in specified time interval by a sum of FT0C amplitudes from nearby collisions // o2-linter: disable=name/o2-column
6766
} // namespace evsel
@@ -83,7 +82,6 @@ DECLARE_SOA_TABLE(EvSels, "AOD", "EVSEL", //!
8382
evsel::FoundFV0Id,
8483
evsel::FoundFDDId,
8584
evsel::FoundZDCId,
86-
evsel::BcInTF,
8785
evsel::NumTracksInTimeRange,
8886
evsel::SumAmpFT0CInTimeRange);
8987
using EvSel = EvSels::iterator;

0 commit comments

Comments
 (0)