Skip to content

Commit 0bb2c34

Browse files
sashingosashingo
authored
Merge branch 'AliceO2Group:master' into master
2 parents 25dd365 + 7720f30 commit 0bb2c34

File tree

207 files changed

+28387
-12127
lines changed

Some content is hidden

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

207 files changed

+28387
-12127
lines changed

‎ALICE3/TableProducer/alice3-decayfinder.cxx‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -80,14 +80,14 @@ struct alice3decayFinder {
8080
Configurable<float> kaFromD_dcaXYconstant{"kaFromD_dcaXYconstant", -1.0f, "[0] in |DCAxy| > [0]+[1]/pT"};
8181
Configurable<float> kaFromD_dcaXYpTdep{"kaFromD_dcaXYpTdep", 0.0, "[1] in |DCAxy| > [0]+[1]/pT"};
8282

83-
Configurable<float> DCosPA{"Cos of pointing angle", 0.99, " Cos of pointing angle: pt < 3 GeV"};
84-
Configurable<float> DCosPAHighPt{"Cos of pointing angle high pt", 0.995, " Cos of pointing angle: 3 GeV < pt"};
85-
Configurable<float> DCosPAxy{"Cos of pointing angle xy", 0.99, " Cos of pointing angle xy: pt < 3 GeV"};
86-
Configurable<float> DCosPAxyHighPt{"Cos of pointing angle xy high pt", 0.995, " Cos of pointing angle xy: 3 GeV < pt"};
87-
Configurable<float> DCosThetaStarLowPt{"Cos theta low pt", 0.8, "Cos theta; pt < 9"};
88-
Configurable<float> DCosThetaStarHighPt{"Cos theta high pt", 0.9, "Cos theta; 9 < pt < 16"};
89-
Configurable<float> DCosThetaStarVHighPt{"Cos theta vhigh", 1.0, "Cos theta; 16 < pt"};
90-
Configurable<float> DDauDecayLength{"Normalized dau decay length", 3, "|Normalized dau decay length| > [0]"};
83+
Configurable<float> DCosPA{"DCosPA", 0.99, " Cos of pointing angle: pt < 3 GeV"};
84+
Configurable<float> DCosPAHighPt{"DCosPAHighPt", 0.995, " Cos of pointing angle: 3 GeV < pt"};
85+
Configurable<float> DCosPAxy{"DCosPAxy", 0.99, " Cos of pointing angle xy: pt < 3 GeV"};
86+
Configurable<float> DCosPAxyHighPt{"DCosPAxyHighPt", 0.995, " Cos of pointing angle xy: 3 GeV < pt"};
87+
Configurable<float> DCosThetaStarLowPt{"DCosThetaStarLowPt", 0.8, "Cos theta; pt < 9"};
88+
Configurable<float> DCosThetaStarHighPt{"DCosThetaStarHighPt", 0.9, "Cos theta; 9 < pt < 16"};
89+
Configurable<float> DCosThetaStarVHighPt{"DCosThetaStarVHighPt", 1.0, "Cos theta; 16 < pt"};
90+
Configurable<float> DDauDecayLength{"DDauDecayLength", 3, "|Normalized dau decay length| > [0]"};
9191

9292
Configurable<float> piFromLc_dcaXYconstant{"piFromLc_dcaXYconstant", -1.0f, "[0] in |DCAxy| > [0]+[1]/pT"};
9393
Configurable<float> piFromLc_dcaXYpTdep{"piFromLc_dcaXYpTdep", 0.0, "[1] in |DCAxy| > [0]+[1]/pT"};
@@ -427,7 +427,7 @@ struct alice3decayFinder {
427427
else if (dmeson.pt > 16 && std::fabs(dmeson.cosThetaStar) > DCosThetaStarVHighPt)
428428
continue;
429429

430-
if (dmeson.normalizedDecayLength < DDauDecayLength)
430+
if (dmeson.normalizedDecayLength > DDauDecayLength)
431431
continue;
432432

433433
histos.fill(HIST("hDCADDaughters"), dmeson.dcaDau * 1e+4);
@@ -474,7 +474,7 @@ struct alice3decayFinder {
474474
else if (dmeson.pt > 16 && std::fabs(dmeson.cosThetaStar) > DCosThetaStarVHighPt)
475475
continue;
476476

477-
if (dmeson.normalizedDecayLength < DDauDecayLength)
477+
if (dmeson.normalizedDecayLength > DDauDecayLength)
478478
continue;
479479

480480
histos.fill(HIST("hDCADbarDaughters"), dmeson.dcaDau * 1e+4);

‎ALICE3/TableProducer/alice3-decaypreselector.cxx‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#include <cstdlib>
2323
#include <map>
2424
#include <iterator>
25+
#include <vector>
2526
#include <utility>
2627

2728
#include "Framework/runDataProcessing.h"
@@ -44,7 +45,7 @@
4445
#include "CCDB/BasicCCDBManager.h"
4546
#include "DataFormatsCalibration/MeanVertexObject.h"
4647
#include "ALICE3/DataModel/OTFTOF.h"
47-
#include "ALICE3/DataModel/RICH.h"
48+
#include "ALICE3/DataModel/OTFRICH.h"
4849
#include "ALICE3/DataModel/A3DecayFinderTables.h"
4950

5051
using namespace o2;
@@ -62,7 +63,7 @@ using FullTracksExt = soa::Join<aod::Tracks, aod::TracksCov>;
6263
// For MC association in pre-selection
6364
using labeledTracks = soa::Join<aod::Tracks, aod::McTrackLabels>;
6465
using tofTracks = soa::Join<aod::Tracks, aod::UpgradeTofs>;
65-
using richTracks = soa::Join<aod::Tracks, aod::RICHs>;
66+
using richTracks = soa::Join<aod::Tracks, aod::UpgradeRichs>;
6667

6768
struct alice3decaypreselector {
6869
Produces<aod::Alice3DecayMaps> a3decayMaps;
@@ -111,9 +112,9 @@ struct alice3decaypreselector {
111112
Partition<tofTracks> pOuterTOFPi = nabs(aod::upgrade_tof::nSigmaPionOuterTOF) > nSigmaTOF;
112113
Partition<tofTracks> pOuterTOFKa = nabs(aod::upgrade_tof::nSigmaKaonOuterTOF) > nSigmaTOF;
113114
Partition<tofTracks> pOuterTOFPr = nabs(aod::upgrade_tof::nSigmaProtonOuterTOF) > nSigmaTOF;
114-
Partition<richTracks> pRICHPi = nabs(aod::alice3rich::richNsigmaPi) > nSigmaRICH;
115-
Partition<richTracks> pRICHKa = nabs(aod::alice3rich::richNsigmaKa) > nSigmaRICH;
116-
Partition<richTracks> pRICHPr = nabs(aod::alice3rich::richNsigmaPr) > nSigmaRICH;
115+
Partition<richTracks> pRICHPi = nabs(aod::upgrade_rich::nSigmaPionRich) > nSigmaRICH;
116+
Partition<richTracks> pRICHKa = nabs(aod::upgrade_rich::nSigmaKaonRich) > nSigmaRICH;
117+
Partition<richTracks> pRICHPr = nabs(aod::upgrade_rich::nSigmaProtonRich) > nSigmaRICH;
117118

118119
//*+-+*+-+*+-+*+-+*+-+*+-+*+-+*+-+*+-+*+-+*
119120
/// Initialization of mask vectors if uninitialized

‎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];

0 commit comments

Comments
 (0)