Skip to content

Commit dda1c16

Browse files
sofiatomassinialibuildnjacazio
authored
[PWGCF] STS: fix to add triton information (#9612)
Co-authored-by: ALICE Action Bot <alibuild@cern.ch> Co-authored-by: Nicolò Jacazio <njacazio@users.noreply.github.com>
1 parent 2017a12 commit dda1c16

File tree

7 files changed

+66
-7
lines changed

7 files changed

+66
-7
lines changed

‎PWGCF/Femto3D/DataModel/singletrackselector.h‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,15 @@ DECLARE_SOA_COLUMN(StoredTPCNSigmaDe, storedTpcNSigmaDe, binning::nsigma::binned
254254
DECLARE_SOA_DYNAMIC_COLUMN(TPCNSigmaDe, tpcNSigmaDe,
255255
[](binning::nsigma::binned_t nsigma_binned) -> float { return singletrackselector::unPackSymmetric<binning::nsigma>(nsigma_binned); });
256256

257+
//------------------------------------ Triton ------------------------------------
258+
DECLARE_SOA_COLUMN(StoredTOFNSigmaTr, storedTofNSigmaTr, binning::nsigma::binned_t); // (v1) TOF
259+
DECLARE_SOA_DYNAMIC_COLUMN(TOFNSigmaTr, tofNSigmaTr,
260+
[](binning::nsigma::binned_t nsigma_binned) -> float { return singletrackselector::unPackSymmetric<binning::nsigma>(nsigma_binned); });
261+
262+
DECLARE_SOA_COLUMN(StoredTPCNSigmaTr, storedTpcNSigmaTr, binning::nsigma::binned_t); // (v1) TPC
263+
DECLARE_SOA_DYNAMIC_COLUMN(TPCNSigmaTr, tpcNSigmaTr,
264+
[](binning::nsigma::binned_t nsigma_binned) -> float { return singletrackselector::unPackSymmetric<binning::nsigma>(nsigma_binned); });
265+
257266
//------------------------------------ Helium3 ------------------------------------
258267
DECLARE_SOA_COLUMN(StoredTOFNSigmaHe, storedTofNSigmaHe, binning::nsigma::binned_t); // (v1) TOF
259268
DECLARE_SOA_DYNAMIC_COLUMN(TOFNSigmaHe, tofNSigmaHe,
@@ -348,6 +357,7 @@ DECLARE_SOA_TABLE(SingleTrackSels_v3, "AOD", "SINGLETRACKSEL", // Table of the v
348357
o2::aod::pidits::ITSNSigmaKaImp<singletrackselector::ITSclusterSizes, singletrackselector::P, singletrackselector::Eta>,
349358
o2::aod::pidits::ITSNSigmaPrImp<singletrackselector::ITSclusterSizes, singletrackselector::P, singletrackselector::Eta>,
350359
o2::aod::pidits::ITSNSigmaDeImp<singletrackselector::ITSclusterSizes, singletrackselector::P, singletrackselector::Eta>,
360+
o2::aod::pidits::ITSNSigmaTrImp<singletrackselector::ITSclusterSizes, singletrackselector::P, singletrackselector::Eta>,
351361
o2::aod::pidits::ITSNSigmaHeImp<singletrackselector::ITSclusterSizes, singletrackselector::P, singletrackselector::Eta>);
352362

353363
DECLARE_SOA_TABLE_VERSIONED(SingleTrackSels_v2, "AOD", "SINGLETRACKSEL2", 2, // Table of the variables for single track selection.
@@ -447,6 +457,13 @@ DECLARE_SOA_TABLE(SinglePIDDes, "AOD", "SINGLEPIDDE",
447457
singletrackselector::TOFNSigmaDe<singletrackselector::StoredTOFNSigmaDe>,
448458
singletrackselector::TPCNSigmaDe<singletrackselector::StoredTPCNSigmaDe>);
449459

460+
DECLARE_SOA_TABLE(SinglePIDTrs, "AOD", "SINGLEPIDTR",
461+
singletrackselector::StoredTOFNSigmaTr,
462+
singletrackselector::StoredTPCNSigmaTr,
463+
464+
singletrackselector::TOFNSigmaTr<singletrackselector::StoredTOFNSigmaTr>,
465+
singletrackselector::TPCNSigmaTr<singletrackselector::StoredTPCNSigmaTr>);
466+
450467
DECLARE_SOA_TABLE(SinglePIDHes, "AOD", "SINGLEPIDHE",
451468
singletrackselector::StoredTOFNSigmaHe,
452469
singletrackselector::StoredTPCNSigmaHe,
@@ -516,6 +533,9 @@ inline bool TPCselection(TrackType const& track, std::pair<int, std::vector<floa
516533
case 1000020030:
517534
Nsigma = track.tpcNSigmaHe();
518535
break;
536+
case 1000010030:
537+
Nsigma = track.tpcNSigmaTr();
538+
break;
519539
case 211:
520540
Nsigma = track.tpcNSigmaPi();
521541
break;
@@ -552,6 +572,9 @@ inline bool TOFselection(TrackType const& track, std::pair<int, std::vector<floa
552572
case 1000020030:
553573
Nsigma = track.tofNSigmaHe();
554574
break;
575+
case 1000010030:
576+
Nsigma = track.tofNSigmaTr();
577+
break;
555578
case 211:
556579
Nsigma = track.tofNSigmaPi();
557580
break;

‎PWGCF/Femto3D/TableProducer/singleTrackSelector.cxx‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,9 @@ struct singleTrackSelector {
8787

8888
using Trks = soa::Join<aod::Tracks, aod::TracksExtra, aod::pidEvTimeFlags, aod::TracksDCA,
8989
aod::pidTPCFullEl, aod::pidTPCFullPi, aod::pidTPCFullKa,
90-
aod::pidTPCFullPr, aod::pidTPCFullDe, aod::pidTPCFullHe,
90+
aod::pidTPCFullPr, aod::pidTPCFullDe, aod::pidTPCFullTr, aod::pidTPCFullHe,
9191
aod::pidTOFFullEl, aod::pidTOFFullMu, aod::pidTOFFullPi, aod::pidTOFFullKa,
92-
aod::pidTOFFullPr, aod::pidTOFFullDe, aod::pidTOFFullHe,
92+
aod::pidTOFFullPr, aod::pidTOFFullDe, aod::pidTOFFullTr, aod::pidTOFFullHe,
9393
aod::TrackSelection, aod::pidTOFbeta>;
9494

9595
using CollRun2 = soa::Join<aod::Collisions, aod::Mults, aod::EvSels, aod::CentRun2V0Ms>;
@@ -106,6 +106,7 @@ struct singleTrackSelector {
106106
Produces<o2::aod::SinglePIDKas> tableRowPIDKa;
107107
Produces<o2::aod::SinglePIDPrs> tableRowPIDPr;
108108
Produces<o2::aod::SinglePIDDes> tableRowPIDDe;
109+
Produces<o2::aod::SinglePIDTrs> tableRowPIDTr;
109110
Produces<o2::aod::SinglePIDHes> tableRowPIDHe;
110111

111112
Produces<o2::aod::SingleTrkMCs> tableRowMC;
@@ -267,6 +268,9 @@ struct singleTrackSelector {
267268
tableRowPIDDe(singletrackselector::packSymmetric<singletrackselector::binning::nsigma>(track.tofNSigmaDe()),
268269
singletrackselector::packSymmetric<singletrackselector::binning::nsigma>(track.tpcNSigmaDe()));
269270

271+
tableRowPIDTr(singletrackselector::packSymmetric<singletrackselector::binning::nsigma>(track.tofNSigmaTr()),
272+
singletrackselector::packSymmetric<singletrackselector::binning::nsigma>(track.tpcNSigmaTr()));
273+
270274
tableRowPIDHe(singletrackselector::packSymmetric<singletrackselector::binning::nsigma>(track.tofNSigmaHe()),
271275
singletrackselector::packSymmetric<singletrackselector::binning::nsigma>(track.tpcNSigmaHe()));
272276

‎PWGCF/Femto3D/TableProducer/singleTrackSelectorPIDMaker.cxx‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,17 @@ struct StPidDe {
8888
}
8989
}
9090
};
91+
struct StPidTr {
92+
Produces<o2::aod::SinglePIDTrs> table;
93+
void process(o2::aod::SingleTrackSels const& tracks)
94+
{
95+
table.reserve(tracks.size());
96+
for (int i = 0; i < tracks.size(); i++) {
97+
table(singletrackselector::binning::nsigma::underflowBin,
98+
singletrackselector::binning::nsigma::underflowBin);
99+
}
100+
}
101+
};
91102
struct StPidHe {
92103
Produces<o2::aod::SinglePIDHes> table;
93104
void process(o2::aod::SingleTrackSels const& tracks)
@@ -115,6 +126,7 @@ WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
115126
{"O2singlepidka", {[&]() { workflow.push_back(adaptAnalysisTask<StPidKa>(cfgc)); }}},
116127
{"O2singlepidpr", {[&]() { workflow.push_back(adaptAnalysisTask<StPidPr>(cfgc)); }}},
117128
{"O2singlepidde", {[&]() { workflow.push_back(adaptAnalysisTask<StPidDe>(cfgc)); }}},
129+
{"O2singlepidtr", {[&]() { workflow.push_back(adaptAnalysisTask<StPidTr>(cfgc)); }}},
118130
{"O2singlepidhe", {[&]() { workflow.push_back(adaptAnalysisTask<StPidHe>(cfgc)); }}}
119131

120132
};

‎PWGCF/Femto3D/Tasks/femto3dPairTask.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ struct FemtoCorrelations {
121121
std::pair<int, std::vector<float>> TOFcuts_2;
122122

123123
using FilteredCollisions = soa::Join<aod::SingleCollSels, aod::SingleCollExtras>;
124-
using FilteredTracks = soa::Join<aod::SingleTrackSels, aod::SinglePIDPis, aod::SinglePIDKas, aod::SinglePIDPrs, aod::SinglePIDDes, aod::SinglePIDHes>;
124+
using FilteredTracks = soa::Join<aod::SingleTrackSels, aod::SinglePIDPis, aod::SinglePIDKas, aod::SinglePIDPrs, aod::SinglePIDDes, aod::SinglePIDTrs, aod::SinglePIDHes>;
125125

126126
typedef std::shared_ptr<soa::Filtered<FilteredTracks>::iterator> trkType;
127127
typedef std::shared_ptr<soa::Filtered<FilteredCollisions>::iterator> colType;

‎PWGCF/Femto3D/Tasks/femto3dPairTaskMC.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ struct FemtoCorrelationsMC {
103103
std::pair<int, std::vector<float>> TOFcuts_2;
104104

105105
using FilteredCollisions = soa::Join<aod::SingleCollSels, aod::SingleCollExtras>;
106-
using FilteredTracks = soa::Join<aod::SingleTrackSels, aod::SingleTrkMCs, aod::SinglePIDPis, aod::SinglePIDKas, aod::SinglePIDPrs, aod::SinglePIDDes, aod::SinglePIDHes>;
106+
using FilteredTracks = soa::Join<aod::SingleTrackSels, aod::SingleTrkMCs, aod::SinglePIDPis, aod::SinglePIDKas, aod::SinglePIDPrs, aod::SinglePIDDes, aod::SinglePIDTrs, aod::SinglePIDHes>;
107107

108108
typedef std::shared_ptr<soa::Filtered<FilteredTracks>::iterator> trkType;
109109
typedef std::shared_ptr<soa::Filtered<FilteredCollisions>::iterator> colType;

‎PWGCF/Femto3D/Tasks/femto3dQA.cxx‎

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,16 @@ struct QAHistograms {
165165
registry.add("nsigmaTPCDe", "nsigmaTPCDe", kTH2F, {{100, 0., 5.}, {100, -10., 10.}});
166166
registry.add("nsigmaITSDe", "nsigmaITSDe", kTH2F, {{100, 0., 5.}, {100, -10., 10.}});
167167
break;
168+
case 1000010030:
169+
registry.add("nsigmaTOFTr", "nsigmaTOFTr", kTH2F, {{100, 0., 5.}, {100, -10., 10.}});
170+
registry.add("nsigmaTPCTr", "nsigmaTPCTr", kTH2F, {{100, 0., 5.}, {100, -10., 10.}});
171+
registry.add("nsigmaITSTr", "nsigmaITSTr", kTH2F, {{100, 0., 5.}, {100, -10., 10.}});
172+
break;
173+
case 1000020030:
174+
registry.add("nsigmaTOFHe", "nsigmaTOFHe", kTH2F, {{100, 0., 5.}, {100, -10., 10.}});
175+
registry.add("nsigmaTPCHe", "nsigmaTPCHe", kTH2F, {{100, 0., 5.}, {100, -10., 10.}});
176+
registry.add("nsigmaITSHe", "nsigmaITSHe", kTH2F, {{100, 0., 5.}, {100, -10., 10.}});
177+
break;
168178
default:
169179
break;
170180
}
@@ -276,6 +286,16 @@ struct QAHistograms {
276286
registry.fill(HIST("nsigmaTPCDe"), track.p(), track.tpcNSigmaDe());
277287
registry.fill(HIST("nsigmaITSDe"), track.p(), track.itsNSigmaDe());
278288
break;
289+
case 1000010030:
290+
registry.fill(HIST("nsigmaTOFTr"), track.p(), track.tofNSigmaTr());
291+
registry.fill(HIST("nsigmaTPCTr"), track.p(), track.tpcNSigmaTr());
292+
registry.fill(HIST("nsigmaITSTr"), track.p(), track.itsNSigmaTr());
293+
break;
294+
case 1000020030:
295+
registry.fill(HIST("nsigmaTOFHe"), track.p(), track.tofNSigmaHe());
296+
registry.fill(HIST("nsigmaTPCHe"), track.p(), track.tpcNSigmaHe());
297+
registry.fill(HIST("nsigmaITSHe"), track.p(), track.itsNSigmaHe());
298+
break;
279299
default:
280300
break;
281301
}
@@ -288,13 +308,13 @@ struct QAHistograms {
288308
}
289309
}
290310

291-
void processDefault(soa::Filtered<soa::Join<aod::SingleCollSels, aod::SingleCollExtras>> const& collisions, soa::Filtered<soa::Join<aod::SingleTrackSels, aod::SinglePIDPis, aod::SinglePIDKas, aod::SinglePIDPrs, aod::SinglePIDDes, aod::SinglePIDHes>> const& tracks)
311+
void processDefault(soa::Filtered<soa::Join<aod::SingleCollSels, aod::SingleCollExtras>> const& collisions, soa::Filtered<soa::Join<aod::SingleTrackSels, aod::SinglePIDPis, aod::SinglePIDKas, aod::SinglePIDPrs, aod::SinglePIDDes, aod::SinglePIDTrs, aod::SinglePIDHes>> const& tracks)
292312
{
293313
fillHistograms<false>(collisions, tracks);
294314
}
295315
PROCESS_SWITCH(QAHistograms, processDefault, "process default", true);
296316

297-
void processExtra(soa::Filtered<soa::Join<aod::SingleCollSels, aod::SingleCollExtras>> const& collisions, soa::Filtered<soa::Join<aod::SingleTrackSels, aod::SingleTrkExtras, aod::SinglePIDPis, aod::SinglePIDKas, aod::SinglePIDPrs, aod::SinglePIDDes, aod::SinglePIDHes>> const& tracks)
317+
void processExtra(soa::Filtered<soa::Join<aod::SingleCollSels, aod::SingleCollExtras>> const& collisions, soa::Filtered<soa::Join<aod::SingleTrackSels, aod::SingleTrkExtras, aod::SinglePIDPis, aod::SinglePIDKas, aod::SinglePIDPrs, aod::SinglePIDDes, aod::SinglePIDTrs, aod::SinglePIDHes>> const& tracks)
298318
{
299319
fillHistograms<true>(collisions, tracks);
300320
}

‎PWGLF/Tasks/Strangeness/k0_mixed_events.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ using namespace o2::framework;
4545
using namespace o2::framework::expressions;
4646

4747
using FilteredCollisions = soa::Filtered<aod::SingleCollSels>;
48-
using FilteredTracks = soa::Filtered<soa::Join<aod::SingleTrackSels, aod::SinglePIDEls, aod::SinglePIDPis, aod::SinglePIDKas, aod::SinglePIDPrs, aod::SinglePIDDes, aod::SinglePIDHes>>;
48+
using FilteredTracks = soa::Filtered<soa::Join<aod::SingleTrackSels, aod::SinglePIDEls, aod::SinglePIDPis, aod::SinglePIDKas, aod::SinglePIDPrs, aod::SinglePIDDes, aod::SinglePIDTrs, aod::SinglePIDHes>>;
4949

5050
typedef std::shared_ptr<FilteredTracks::iterator> trkType;
5151
typedef std::shared_ptr<FilteredCollisions::iterator> colType;

0 commit comments

Comments
 (0)