Skip to content

Commit d38d1cb

Browse files
ayankrmannaayankrmanna
authored
Merge branch 'AliceO2Group:master' into add-centrality-in-d0-hadron-correlation
2 parents 5e387af + 06f56b2 commit d38d1cb

File tree

374 files changed

+10441
-5511
lines changed

Some content is hidden

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

374 files changed

+10441
-5511
lines changed

‎CODEOWNERS‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@
5656
/PWGLF/Utils @alibuild @sustripathy @skundu692 @mpuccio @gbencedi @abmodak @fmazzasc @maciacco @dmallick2 @smaff92 @ercolessi @romainschotter
5757

5858
# PWG-MM (fused with LF, LF conveners included. Directories to be merged in the future)
59-
/PWGMM @alibuild @sustripathy @skundu692 @aalkin @jgcn
60-
/PWGMM/Mult @alibuild @sustripathy @skundu692 @aalkin @aortizve @ddobrigk @gbencedi @jgcn
61-
/PWGMM/Lumi @alibuild @sustripathy @skundu692 @aalkin @jgcn @gbencedi @abmodak
62-
/PWGMM/UE @alibuild @sustripathy @skundu692 @aalkin @aortizve @jgcn
59+
/PWGMM @alibuild @mpuccio @skundu692 @aalkin @jgcn
60+
/PWGMM/Mult @alibuild @mpuccio @skundu692 @aalkin @aortizve @ddobrigk @gbencedi @jgcn
61+
/PWGMM/Lumi @alibuild @mpuccio @skundu692 @aalkin @jgcn @gbencedi @abmodak
62+
/PWGMM/UE @alibuild @mpuccio @skundu692 @aalkin @aortizve @jgcn
6363

6464
/PWGUD @alibuild @amatyja @rolavick
6565
/PWGJE @alibuild @lhavener @maoyx @nzardosh @fjonasALICE @mfasDa @mhemmer-cern

‎Common/DataModel/PIDResponseTOF.h‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#define COMMON_DATAMODEL_PIDRESPONSETOF_H_
2222

2323
#include "Common/Core/PID/PIDTOF.h"
24+
#include "Common/Core/PID/PIDTOFParamService.h"
2425

2526
#include <Framework/ASoA.h>
2627
#include <Framework/AnalysisDataModel.h>
@@ -331,8 +332,83 @@ DECLARE_SOA_COLUMN(TOFNSigmaTr, tofNSigmaTr, float); //! Nsigma separation with
331332
DECLARE_SOA_COLUMN(TOFNSigmaHe, tofNSigmaHe, float); //! Nsigma separation with the TOF detector for helium3
332333
DECLARE_SOA_COLUMN(TOFNSigmaAl, tofNSigmaAl, float); //! Nsigma separation with the TOF detector for alpha
333334

335+
//! Expected resolution with the TOF detector for electron (computed on the fly)
336+
#define PERSPECIES_TOF_SIGMA_COLUMN(name, id) \
337+
DECLARE_SOA_DYNAMIC_COLUMN(TOFExpSigma##name##Imp, tofExpSigmaDyn##name, \
338+
[](float tofSignal, \
339+
float tofExpMom, \
340+
float momentum, \
341+
float eta, \
342+
float tofEvTimeErr) -> float { \
343+
return o2::pid::tof::TOFResponseImpl::expectedSigma<id>(tofSignal, \
344+
tofExpMom, \
345+
momentum, \
346+
eta, \
347+
tofEvTimeErr); \
348+
});
349+
350+
PERSPECIES_TOF_SIGMA_COLUMN(El, o2::track::PID::Electron);
351+
PERSPECIES_TOF_SIGMA_COLUMN(Mu, o2::track::PID::Muon);
352+
PERSPECIES_TOF_SIGMA_COLUMN(Pi, o2::track::PID::Pion);
353+
PERSPECIES_TOF_SIGMA_COLUMN(Ka, o2::track::PID::Kaon);
354+
PERSPECIES_TOF_SIGMA_COLUMN(Pr, o2::track::PID::Proton);
355+
PERSPECIES_TOF_SIGMA_COLUMN(De, o2::track::PID::Deuteron);
356+
PERSPECIES_TOF_SIGMA_COLUMN(Tr, o2::track::PID::Triton);
357+
PERSPECIES_TOF_SIGMA_COLUMN(He, o2::track::PID::Helium3);
358+
PERSPECIES_TOF_SIGMA_COLUMN(Al, o2::track::PID::Alpha);
359+
#undef PERSPECIES_TOF_SIGMA_COLUMN
360+
361+
#define PERSPECIES_TOF_SEPARATION_COLUMN(name, id) \
362+
DECLARE_SOA_DYNAMIC_COLUMN(TOFNSigma##name##Imp, tofNSigmaDyn##name, \
363+
[](const float tofSignal, \
364+
const float tofExpMom, \
365+
const float length, \
366+
const float momentum, \
367+
const float eta, \
368+
const float tofEvTime, \
369+
const float tofEvTimeErr) -> float { \
370+
return o2::pid::tof::TOFResponseImpl::nSigma<id>(tofSignal, \
371+
tofExpMom, \
372+
length, \
373+
momentum, \
374+
eta, \
375+
tofEvTime, \
376+
tofEvTimeErr); \
377+
});
378+
379+
PERSPECIES_TOF_SEPARATION_COLUMN(El, o2::track::PID::Electron);
380+
PERSPECIES_TOF_SEPARATION_COLUMN(Mu, o2::track::PID::Muon);
381+
PERSPECIES_TOF_SEPARATION_COLUMN(Pi, o2::track::PID::Pion);
382+
PERSPECIES_TOF_SEPARATION_COLUMN(Ka, o2::track::PID::Kaon);
383+
PERSPECIES_TOF_SEPARATION_COLUMN(Pr, o2::track::PID::Proton);
384+
PERSPECIES_TOF_SEPARATION_COLUMN(De, o2::track::PID::Deuteron);
385+
PERSPECIES_TOF_SEPARATION_COLUMN(Tr, o2::track::PID::Triton);
386+
PERSPECIES_TOF_SEPARATION_COLUMN(He, o2::track::PID::Helium3);
387+
PERSPECIES_TOF_SEPARATION_COLUMN(Al, o2::track::PID::Alpha);
388+
#undef PERSPECIES_TOF_SEPARATION_COLUMN
389+
334390
} // namespace pidtof
335391

392+
using TOFExpSigmaDynEl = pidtof::TOFExpSigmaElImp<pidtofsignal::TOFSignal, track::TOFExpMom, track::P, track::Eta, pidtofevtime::TOFEvTimeErr>;
393+
using TOFExpSigmaDynMu = pidtof::TOFExpSigmaMuImp<pidtofsignal::TOFSignal, track::TOFExpMom, track::P, track::Eta, pidtofevtime::TOFEvTimeErr>;
394+
using TOFExpSigmaDynPi = pidtof::TOFExpSigmaPiImp<pidtofsignal::TOFSignal, track::TOFExpMom, track::P, track::Eta, pidtofevtime::TOFEvTimeErr>;
395+
using TOFExpSigmaDynKa = pidtof::TOFExpSigmaKaImp<pidtofsignal::TOFSignal, track::TOFExpMom, track::P, track::Eta, pidtofevtime::TOFEvTimeErr>;
396+
using TOFExpSigmaDynPr = pidtof::TOFExpSigmaPrImp<pidtofsignal::TOFSignal, track::TOFExpMom, track::P, track::Eta, pidtofevtime::TOFEvTimeErr>;
397+
using TOFExpSigmaDynDe = pidtof::TOFExpSigmaDeImp<pidtofsignal::TOFSignal, track::TOFExpMom, track::P, track::Eta, pidtofevtime::TOFEvTimeErr>;
398+
using TOFExpSigmaDynTr = pidtof::TOFExpSigmaTrImp<pidtofsignal::TOFSignal, track::TOFExpMom, track::P, track::Eta, pidtofevtime::TOFEvTimeErr>;
399+
using TOFExpSigmaDynHe = pidtof::TOFExpSigmaHeImp<pidtofsignal::TOFSignal, track::TOFExpMom, track::P, track::Eta, pidtofevtime::TOFEvTimeErr>;
400+
using TOFExpSigmaDynAl = pidtof::TOFExpSigmaAlImp<pidtofsignal::TOFSignal, track::TOFExpMom, track::P, track::Eta, pidtofevtime::TOFEvTimeErr>;
401+
402+
using TOFNSigmaDynEl = pidtof::TOFNSigmaElImp<pidtofsignal::TOFSignal, track::TOFExpMom, track::Length, track::P, track::Eta, pidtofevtime::TOFEvTime, pidtofevtime::TOFEvTimeErr>;
403+
using TOFNSigmaDynMu = pidtof::TOFNSigmaMuImp<pidtofsignal::TOFSignal, track::TOFExpMom, track::Length, track::P, track::Eta, pidtofevtime::TOFEvTime, pidtofevtime::TOFEvTimeErr>;
404+
using TOFNSigmaDynPi = pidtof::TOFNSigmaPiImp<pidtofsignal::TOFSignal, track::TOFExpMom, track::Length, track::P, track::Eta, pidtofevtime::TOFEvTime, pidtofevtime::TOFEvTimeErr>;
405+
using TOFNSigmaDynKa = pidtof::TOFNSigmaKaImp<pidtofsignal::TOFSignal, track::TOFExpMom, track::Length, track::P, track::Eta, pidtofevtime::TOFEvTime, pidtofevtime::TOFEvTimeErr>;
406+
using TOFNSigmaDynPr = pidtof::TOFNSigmaPrImp<pidtofsignal::TOFSignal, track::TOFExpMom, track::Length, track::P, track::Eta, pidtofevtime::TOFEvTime, pidtofevtime::TOFEvTimeErr>;
407+
using TOFNSigmaDynDe = pidtof::TOFNSigmaDeImp<pidtofsignal::TOFSignal, track::TOFExpMom, track::Length, track::P, track::Eta, pidtofevtime::TOFEvTime, pidtofevtime::TOFEvTimeErr>;
408+
using TOFNSigmaDynTr = pidtof::TOFNSigmaTrImp<pidtofsignal::TOFSignal, track::TOFExpMom, track::Length, track::P, track::Eta, pidtofevtime::TOFEvTime, pidtofevtime::TOFEvTimeErr>;
409+
using TOFNSigmaDynHe = pidtof::TOFNSigmaHeImp<pidtofsignal::TOFSignal, track::TOFExpMom, track::Length, track::P, track::Eta, pidtofevtime::TOFEvTime, pidtofevtime::TOFEvTimeErr>;
410+
using TOFNSigmaDynAl = pidtof::TOFNSigmaAlImp<pidtofsignal::TOFSignal, track::TOFExpMom, track::Length, track::P, track::Eta, pidtofevtime::TOFEvTime, pidtofevtime::TOFEvTimeErr>;
411+
336412
namespace pidtof_tiny
337413
{
338414
struct binning {

‎Common/DataModel/ZDCExtra.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ DECLARE_SOA_COLUMN(Vx, vx, float); //! Vertex X
4646
DECLARE_SOA_COLUMN(Vy, vy, float); //! Vertex Y
4747
DECLARE_SOA_COLUMN(Vz, vz, float); //! Vertex Z
4848
DECLARE_SOA_COLUMN(Timestamp, timestamp, uint64_t); //! Timestamp
49+
DECLARE_SOA_COLUMN(RunNumber, runNumber, uint32_t); //! Run Number
4950
DECLARE_SOA_COLUMN(SelectionBits, selectionBits, uint8_t); //! Selection Flags
5051
} // namespace zdcextra
5152

@@ -71,6 +72,7 @@ DECLARE_SOA_TABLE(ZdcExtras, "AOD", "ZDCEXTRA", o2::soa::Index<>,
7172
zdcextra::Vy,
7273
zdcextra::Vz,
7374
zdcextra::Timestamp,
75+
zdcextra::RunNumber,
7476
zdcextra::SelectionBits);
7577
} // namespace o2::aod
7678

‎Common/DataModel/ZDCLightIons.h‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
/// \brief ZDC data model for O-O Ne-Ne and p-O collisions
1414
/// \author Chiara Oppedisano <chiara.oppedisano@cern.ch>
1515

16-
#ifndef PWGMM_DATAMODEL_ZDCLIGHTIONS_H_
17-
#define PWGMM_DATAMODEL_ZDCLIGHTIONS_H_
16+
#ifndef COMMON_DATAMODEL_ZDCLIGHTIONS_H_
17+
#define COMMON_DATAMODEL_ZDCLIGHTIONS_H_
1818

1919
#include "Common/DataModel/Centrality.h"
2020

@@ -77,8 +77,10 @@ DECLARE_SOA_TABLE(ZDCLightIons, "AOD", "ZDCTABLELIGHTIONS",
7777
zdclightions::ZncPm4,
7878
zdclightions::ZpaTdc,
7979
zdclightions::ZpaAmpl,
80+
zdclightions::ZpaPmc,
8081
zdclightions::ZpcTdc,
8182
zdclightions::ZpcAmpl,
83+
zdclightions::ZpcPmc,
8284
zdclightions::Zem1Tdc,
8385
zdclightions::Zem1Ampl,
8486
zdclightions::Zem2Tdc,

‎Common/TableProducer/zdcExtraTableProducer.cxx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@ struct ZdcExtraTableProducer {
9595
registry.add("ZNAsumq", "ZNAsumq; ZNA uncalib. sum PMQ; Entries", {HistType::kTH1F, {{nBins, -0.5, maxZN}}});
9696
registry.add("ZNCsumq", "ZNCsumq; ZNC uncalib. sum PMQ; Entries", {HistType::kTH1F, {{nBins, -0.5, maxZN}}});
9797

98-
registry.add("ZNACentroid", "ZNACentroid; ZNA Centroid; X; Y", {HistType::kTH2F, {{50, -1.5, 1.5}, {50, -1.5, 1.5}}});
99-
registry.add("ZNCCentroid", "ZNCCentroid; ZNC Centroid; X; Y", {HistType::kTH2F, {{50, -1.5, 1.5}, {50, -1.5, 1.5}}});
98+
registry.add("ZNACentroid", "ZNA Centroid; X; Y", {HistType::kTH2F, {{50, -1.5, 1.5}, {50, -1.5, 1.5}}});
99+
registry.add("ZNCCentroid", "ZNC Centroid; X; Y", {HistType::kTH2F, {{50, -1.5, 1.5}, {50, -1.5, 1.5}}});
100100

101101
registry.add("hEventCount", "Number of Event; Cut; #Events Passed Cut", {HistType::kTH1D, {{nEventSelections, 0, nEventSelections}}});
102102
registry.get<TH1>(HIST("hEventCount"))->GetXaxis()->SetBinLabel(evSel_allEvents + 1, "All events");
@@ -312,7 +312,7 @@ struct ZdcExtraTableProducer {
312312
auto vy = collision.posY();
313313

314314
if (isZNAhit || isZNChit) {
315-
zdcextras(pmcZNA, pmqZNA[0], pmqZNA[1], pmqZNA[2], pmqZNA[3], tdcZNA, centroidZNA[0], centroidZNA[1], pmcZNC, pmqZNC[0], pmqZNC[1], pmqZNC[2], pmqZNC[3], tdcZNC, centroidZNC[0], centroidZNC[1], centrality, vx, vy, vz, foundBC.timestamp(), evSelection);
315+
zdcextras(pmcZNA, pmqZNA[0], pmqZNA[1], pmqZNA[2], pmqZNA[3], tdcZNA, centroidZNA[0], centroidZNA[1], pmcZNC, pmqZNC[0], pmqZNC[1], pmqZNC[2], pmqZNC[3], tdcZNC, centroidZNC[0], centroidZNC[1], centrality, vx, vy, vz, foundBC.timestamp(), foundBC.runNumber(), evSelection);
316316
}
317317
}
318318
}

‎Common/TableProducer/zdcTaskLightIons.cxx‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,8 @@ struct ZdcTaskLightIons {
173173
//
174174
double pmcZNA = bc.zdc().energyCommonZNA();
175175
double pmcZNC = bc.zdc().energyCommonZNC();
176+
double pmcZPA = bc.zdc().energyCommonZPA();
177+
double pmcZPC = bc.zdc().energyCommonZPC();
176178
double pmqZNC[4] = {
177179
0,
178180
0,
@@ -213,7 +215,9 @@ struct ZdcTaskLightIons {
213215

214216
zdcTableLI(tdcZNA, zna, pmcZNA, pmqZNA[0], pmqZNA[1], pmqZNA[2], pmqZNA[3],
215217
tdcZNC, znc, pmcZNC, pmqZNC[0], pmqZNC[1], pmqZNC[2], pmqZNC[3],
216-
tdcZPA, zpa, tdcZPC, zpc, tdcZEM1, zem1, tdcZEM2, zem2,
218+
tdcZPA, zpa, pmcZPA,
219+
tdcZPC, zpc, pmcZPC,
220+
tdcZEM1, zem1, tdcZEM2, zem2,
217221
-1, -1, -1,
218222
-1.,
219223
-1, -1, -1,
@@ -226,7 +230,7 @@ struct ZdcTaskLightIons {
226230
/// note that it has to be declared after the function, so that the pointer is known
227231
PROCESS_SWITCH(ZdcTaskLightIons, processZDCBC, "Processing ZDC 4 auto-triggered events", true);
228232

229-
void processALICEcoll(ColEvSels const& cols, BCsRun3 const& /*bcs*/, aod::Zdcs const& /*zdcs*/)
233+
void processALICEcoll(ColEvSels const& cols, BCsRun3 const& /*bcs*/, aod::Zdcs const& /*zdcs*/, aod::FT0s const& /*ft0s*/, aod::FV0As const& /*fv0*/)
230234
{
231235
// collision-based event selection
232236
for (auto const& collision : cols) {
@@ -276,6 +280,8 @@ struct ZdcTaskLightIons {
276280
//
277281
double pmcZNA = zdc.energyCommonZNA();
278282
double pmcZNC = zdc.energyCommonZNC();
283+
double pmcZPA = zdc.energyCommonZPA();
284+
double pmcZPC = zdc.energyCommonZPC();
279285
double pmqZNC[4] = {
280286
0,
281287
0,
@@ -316,7 +322,9 @@ struct ZdcTaskLightIons {
316322

317323
zdcTableLI(tdcZNA, zna, pmcZNA, pmqZNA[0], pmqZNA[1], pmqZNA[2], pmqZNA[3],
318324
tdcZNC, znc, pmcZNC, pmqZNC[0], pmqZNC[1], pmqZNC[2], pmqZNC[3],
319-
tdcZPA, zpa, tdcZPC, zpc, tdcZEM1, zem1, tdcZEM2, zem2,
325+
tdcZPA, zpa, pmcZPA,
326+
tdcZPC, zpc, pmcZPC,
327+
tdcZEM1, zem1, tdcZEM2, zem2,
320328
multFT0A, multFT0C, multV0A,
321329
zv,
322330
centralityFT0C, centralityFT0A, centralityFT0M,

‎Common/Tasks/qVectorsCorrection.cxx‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -760,6 +760,8 @@ struct qVectorsCorrection {
760760
{
761761
histosQA.fill(HIST("histCentFull"), qVec.cent());
762762
if (cfgAddEvtSel) {
763+
if (std::abs(qVec.posZ()) > 10.)
764+
return;
763765
switch (cfgEvtSel) {
764766
case 0: // Sel8
765767
if (!qVec.sel8())

0 commit comments

Comments
 (0)