Skip to content

Commit e157dd3

Browse files
romainschotterromainschotter
committed
Add ITS chi2/Ncls info in derived data + add extra event selections to analysis task
1 parent 131aa37 commit e157dd3

4 files changed

Lines changed: 86 additions & 5 deletions

File tree

‎PWGLF/DataModel/LFStrangenessTables.h‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ namespace dautrack
8989
{
9090
//______________________________________________________
9191
// Daughter track declarations for derived data analysis
92+
DECLARE_SOA_COLUMN(ITSChi2PerNcl, itsChi2PerNcl, float); //! ITS chi2 per N cluster
9293
DECLARE_SOA_COLUMN(DetectorMap, detectorMap, uint8_t); //! detector map for reference (see DetectorMapEnum)
9394
DECLARE_SOA_COLUMN(ITSClusterSizes, itsClusterSizes, uint32_t); //! ITS cluster sizes per layer
9495
DECLARE_SOA_COLUMN(TPCClusters, tpcClusters, uint8_t); //! N TPC clusters
@@ -130,7 +131,20 @@ DECLARE_SOA_DYNAMIC_COLUMN(HasTOF, hasTOF, //! Flag to check if track has a TOF
130131
[](uint8_t detectorMap) -> bool { return detectorMap & o2::aod::track::TOF; });
131132
} // namespace dautrack
132133

133-
DECLARE_SOA_TABLE(DauTrackExtras, "AOD", "DAUTRACKEXTRA", //! detector properties of decay daughters
134+
DECLARE_SOA_TABLE(DauTrackExtras_000, "AOD", "DAUTRACKEXTRA", //! detector properties of decay daughters
135+
dautrack::DetectorMap, dautrack::ITSClusterSizes,
136+
dautrack::TPCClusters, dautrack::TPCCrossedRows,
137+
138+
// Dynamic columns for manipulating information
139+
dautrack::ITSClusterMap<dautrack::ITSClusterSizes>,
140+
dautrack::ITSNCls<dautrack::ITSClusterSizes>,
141+
dautrack::HasITS<dautrack::DetectorMap>,
142+
dautrack::HasTPC<dautrack::DetectorMap>,
143+
dautrack::HasTRD<dautrack::DetectorMap>,
144+
dautrack::HasTOF<dautrack::DetectorMap>);
145+
146+
DECLARE_SOA_TABLE_VERSIONED(DauTrackExtras_001, "AOD", "DAUTRACKEXTRA", 1, //! detector properties of decay daughters
147+
dautrack::ITSChi2PerNcl,
134148
dautrack::DetectorMap, dautrack::ITSClusterSizes,
135149
dautrack::TPCClusters, dautrack::TPCCrossedRows,
136150

@@ -145,6 +159,7 @@ DECLARE_SOA_TABLE(DauTrackExtras, "AOD", "DAUTRACKEXTRA", //! detector propertie
145159
DECLARE_SOA_TABLE(DauTrackMCIds, "AOD", "DAUTRACKMCID", // index table when using AO2Ds
146160
dautrack::ParticleMCId);
147161

162+
using DauTrackExtras = DauTrackExtras_001;
148163
using DauTrackExtra = DauTrackExtras::iterator;
149164

150165
namespace motherParticle

‎PWGLF/TableProducer/Strangeness/strangederivedbuilder.cxx‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,8 @@ struct strangederivedbuilder {
450450
// circle back and populate actual DauTrackExtra table
451451
for (auto const& tr : tracksExtra) {
452452
if (trackMap[tr.globalIndex()] >= 0) {
453-
dauTrackExtras(tr.detectorMap(), tr.itsClusterSizes(),
453+
dauTrackExtras(tr.itsChi2NCl(),
454+
tr.detectorMap(), tr.itsClusterSizes(),
454455
tr.tpcNClsFound(), tr.tpcNClsCrossedRows());
455456
}
456457
}
@@ -540,7 +541,8 @@ struct strangederivedbuilder {
540541
// circle back and populate actual DauTrackExtra table
541542
for (auto const& tr : tracksExtra) {
542543
if (trackMap[tr.globalIndex()] >= 0) {
543-
dauTrackExtras(tr.detectorMap(), tr.itsClusterSizes(),
544+
dauTrackExtras(tr.itsChi2NCl(),
545+
tr.detectorMap(), tr.itsClusterSizes(),
544546
tr.tpcNClsFound(), tr.tpcNClsCrossedRows());
545547

546548
// if the table has MC info

‎PWGLF/TableProducer/converters/strarawcentsconverter.cxx‎

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,29 @@ using namespace o2::framework;
1818

1919
// Converts V0 version 001 to 002
2020
struct strarawcentsconverter {
21+
Produces<aod::DauTrackExtras_001> dauTrackExtras_001;
2122
Produces<aod::V0MCCores_001> v0MCCores_001;
2223
Produces<aod::StraRawCents_001> straRawCents_001;
2324
Produces<aod::StraRawCents_003> straRawCents_003;
2425

25-
void process000to001(aod::StraRawCents_000 const& straRawCents_000, aod::V0MCCores_000 const& v0MCCores_000)
26+
void process000to001(aod::StraRawCents_000 const& straRawCents_000, aod::DauTrackExtras_000 const& dauTrackExtras_000, aod::V0MCCores_000 const& v0MCCores_000)
2627
{
2728
for (auto& values : straRawCents_000) {
2829
straRawCents_001(values.multFT0A(), values.multFT0C(), values.multFV0A(), values.multNTracksPVeta1(), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f);
2930
}
31+
for (auto& values : dauTrackExtras_000) {
32+
dauTrackExtras_001(0,
33+
values.detectorMap(),
34+
values.itsClusterSizes(),
35+
values.tpcNClsFound(),
36+
values.tpcNClsCrossedRows(),
37+
values.tpcSignal(),
38+
values.tpcNSigmaEl(),
39+
values.tpcNSigmaPi(),
40+
values.tpcNSigmaKa(),
41+
values.tpcNSigmaPr(),
42+
values.tpcNSigmaHe());
43+
}
3044
for (auto& values : v0MCCores_000) {
3145
v0MCCores_001(0,
3246
values.pdgCode(),
@@ -45,7 +59,7 @@ struct strarawcentsconverter {
4559
values.pzNegMC());
4660
}
4761
}
48-
void process002to003(aod::StraRawCents_002 const& straRawCents_002, aod::V0MCCores_000 const& v0MCCores_000)
62+
void process002to003(aod::StraRawCents_002 const& straRawCents_002, aod::DauTrackExtras_000 const& dauTrackExtras_000, aod::V0MCCores_000 const& v0MCCores_000)
4963
{
5064
for (auto& values : straRawCents_002) {
5165
straRawCents_003(values.multFT0A(),
@@ -63,6 +77,19 @@ struct strarawcentsconverter {
6377
values.multZPA(),
6478
values.multZPC());
6579
}
80+
for (auto& values : dauTrackExtras_000) {
81+
dauTrackExtras_001(0,
82+
values.detectorMap(),
83+
values.itsClusterSizes(),
84+
values.tpcNClsFound(),
85+
values.tpcNClsCrossedRows(),
86+
values.tpcSignal(),
87+
values.tpcNSigmaEl(),
88+
values.tpcNSigmaPi(),
89+
values.tpcNSigmaKa(),
90+
values.tpcNSigmaPr(),
91+
values.tpcNSigmaHe());
92+
}
6693
for (auto& values : v0MCCores_000) {
6794
v0MCCores_001(0,
6895
values.pdgCode(),

‎PWGLF/Tasks/Strangeness/derivedlambdakzeroanalysis.cxx‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ using namespace o2::framework::expressions;
5656
using std::array;
5757

5858
using dauTracks = soa::Join<aod::DauTrackExtras, aod::DauTrackTPCPIDs>;
59+
using dauMCTracks = soa::Join<aod::DauTrackExtras, aod::DauTrackMCIds, aod::DauTrackTPCPIDs>;
5960
using v0Candidates = soa::Join<aod::V0CollRefs, aod::V0Cores, aod::V0Extras, aod::V0TOFPIDs, aod::V0TOFNSigmas>;
6061
using v0MCCandidates = soa::Join<aod::V0CollRefs, aod::V0Cores, aod::V0MCCores, aod::V0Extras, aod::V0TOFPIDs, aod::V0TOFNSigmas, aod::V0MCMothers, aod::V0MCCollRefs>;
6162

@@ -74,6 +75,12 @@ struct derivedlambdakzeroanalysis {
7475
Configurable<bool> rejectITSROFBorder{"rejectITSROFBorder", true, "reject events at ITS ROF border"};
7576
Configurable<bool> rejectTFBorder{"rejectTFBorder", true, "reject events at TF border"};
7677

78+
Configurable<bool> requireIsVertexITSTPC{"requireIsVertexITSTPC", true, "require events with at least one ITS-TPC track"};
79+
Configurable<bool> requireIsGoodZvtxFT0VsPV{"requireIsGoodZvtxFT0VsPV", true, "require events with PV position along z consistent (within 1 cm) between PV reconstructed using tracks and PV using FT0 A-C time difference"};
80+
Configurable<bool> requireIsVertexTOFmatched{"requireIsVertexTOFmatched", true, "require events with at least one of vertex contributors matched to TOF"};
81+
Configurable<bool> requireIsVertexTRDmatched{"requireIsVertexTRDmatched", true, "require events with at least one of vertex contributors matched to TRD"};
82+
Configurable<bool> rejectSameBunchPileup{"rejectSameBunchPileup", true, "reject collisions in case of pileup with another collision in the same foundBC"};
83+
7784
// Selection criteria: acceptance
7885
Configurable<float> rapidityCut{"rapidityCut", 0.5, "rapidity"};
7986
Configurable<float> daughterEtaCut{"daughterEtaCut", 0.8, "max eta for daughters"};
@@ -294,6 +301,11 @@ struct derivedlambdakzeroanalysis {
294301
histos.get<TH1>(HIST("hEventSelection"))->GetXaxis()->SetBinLabel(3, "posZ cut");
295302
histos.get<TH1>(HIST("hEventSelection"))->GetXaxis()->SetBinLabel(4, "kNoITSROFrameBorder");
296303
histos.get<TH1>(HIST("hEventSelection"))->GetXaxis()->SetBinLabel(5, "kNoTimeFrameBorder");
304+
histos.get<TH1>(HIST("hEventSelection"))->GetXaxis()->SetBinLabel(6, "kIsVertexITSTPC");
305+
histos.get<TH1>(HIST("hEventSelection"))->GetXaxis()->SetBinLabel(7, "kIsGoodZvtxFT0vsPV");
306+
histos.get<TH1>(HIST("hEventSelection"))->GetXaxis()->SetBinLabel(8, "kIsVertexTOFmatched");
307+
histos.get<TH1>(HIST("hEventSelection"))->GetXaxis()->SetBinLabel(9, "kIsVertexTRDmatched");
308+
histos.get<TH1>(HIST("hEventSelection"))->GetXaxis()->SetBinLabel(10, "kNoSameBunchPileup");
297309

298310
histos.add("hEventCentrality", "hEventCentrality", kTH1F, {{100, 0.0f, +100.0f}});
299311
histos.add("hCentralityVsNch", "hCentralityVsNch", kTH2F, {axisCentrality, {500, 0.0f, +2000.0f}});
@@ -1029,6 +1041,31 @@ struct derivedlambdakzeroanalysis {
10291041
}
10301042
histos.fill(HIST("hEventSelection"), 4 /* Not at TF border */);
10311043

1044+
if (requireIsVertexITSTPC && !collision.selection_bit(o2::aod::evsel::kIsVertexITSTPC)) {
1045+
return;
1046+
}
1047+
histos.fill(HIST("hEventSelection"), 5 /* Contains at least one ITS-TPC track */);
1048+
1049+
if (requireIsGoodZvtxFT0VsPV && !collision.selection_bit(o2::aod::evsel::kIsGoodZvtxFT0vsPV)) {
1050+
return;
1051+
}
1052+
histos.fill(HIST("hEventSelection"), 6 /* PV position consistency check */);
1053+
1054+
if (requireIsVertexTOFmatched && !collision.selection_bit(o2::aod::evsel::kIsVertexTOFmatched)) {
1055+
return;
1056+
}
1057+
histos.fill(HIST("hEventSelection"), 7 /* PV with at least one contributor matched with TOF */);
1058+
1059+
if (requireIsVertexTRDmatched && !collision.selection_bit(o2::aod::evsel::kIsVertexTRDmatched)) {
1060+
return;
1061+
}
1062+
histos.fill(HIST("hEventSelection"), 8 /* PV with at least one contributor matched with TRD */);
1063+
1064+
if (rejectSameBunchPileup && !collision.selection_bit(o2::aod::evsel::kNoSameBunchPileup)) {
1065+
return;
1066+
}
1067+
histos.fill(HIST("hEventSelection"), 9 /* Not at same bunch pile-up */);
1068+
10321069
float centrality = collision.centFT0C();
10331070
if (qaCentrality) {
10341071
auto hRawCentrality = histos.get<TH1>(HIST("hRawCentrality"));

0 commit comments

Comments
 (0)