Skip to content

Commit c1538db

Browse files
ariedel-cernariedel-cern
committed
Feat: add triton and He3 PID to femtodream data model
1 parent 1cba330 commit c1538db

File tree

4 files changed

+40
-18
lines changed

4 files changed

+40
-18
lines changed

‎PWGCF/DataModel/FemtoDerived.h‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -166,11 +166,15 @@ DECLARE_SOA_COLUMN(TPCNSigmaPi, tpcNSigmaPi, float); //! Nsigma separation with
166166
DECLARE_SOA_COLUMN(TPCNSigmaKa, tpcNSigmaKa, float); //! Nsigma separation with the TPC detector for kaon
167167
DECLARE_SOA_COLUMN(TPCNSigmaPr, tpcNSigmaPr, float); //! Nsigma separation with the TPC detector for proton
168168
DECLARE_SOA_COLUMN(TPCNSigmaDe, tpcNSigmaDe, float); //! Nsigma separation with the TPC detector for deuteron
169-
DECLARE_SOA_COLUMN(TOFNSigmaEl, tofNSigmaEl, float); //! Nsigma separation with the TPC detector for electron
170-
DECLARE_SOA_COLUMN(TOFNSigmaPi, tofNSigmaPi, float); //! Nsigma separation with the TPC detector for pion
171-
DECLARE_SOA_COLUMN(TOFNSigmaKa, tofNSigmaKa, float); //! Nsigma separation with the TPC detector for kaon
172-
DECLARE_SOA_COLUMN(TOFNSigmaPr, tofNSigmaPr, float); //! Nsigma separation with the TPC detector for proton
173-
DECLARE_SOA_COLUMN(TOFNSigmaDe, tofNSigmaDe, float); //! Nsigma separation with the TPC detector for deuteron
169+
DECLARE_SOA_COLUMN(TPCNSigmaTr, tpcNSigmaTr, float); //! Nsigma separation with the TPC detector for triton
170+
DECLARE_SOA_COLUMN(TPCNSigmaHe, tpcNSigmaHe, float); //! Nsigma separation with the TPC detector for helium3
171+
DECLARE_SOA_COLUMN(TOFNSigmaEl, tofNSigmaEl, float); //! Nsigma separation with the TOF detector for electron
172+
DECLARE_SOA_COLUMN(TOFNSigmaPi, tofNSigmaPi, float); //! Nsigma separation with the TOF detector for pion
173+
DECLARE_SOA_COLUMN(TOFNSigmaKa, tofNSigmaKa, float); //! Nsigma separation with the TOF detector for kaon
174+
DECLARE_SOA_COLUMN(TOFNSigmaPr, tofNSigmaPr, float); //! Nsigma separation with the TOF detector for proton
175+
DECLARE_SOA_COLUMN(TOFNSigmaDe, tofNSigmaDe, float); //! Nsigma separation with the TOF detector for deuteron
176+
DECLARE_SOA_COLUMN(TOFNSigmaTr, tofNSigmaTr, float); //! Nsigma separation with the TOF detector for triton
177+
DECLARE_SOA_COLUMN(TOFNSigmaHe, tofNSigmaHe, float); //! Nsigma separation with the TOF detector for helium3
174178
DECLARE_SOA_COLUMN(DaughDCA, daughDCA, float); //! DCA between daughters
175179
DECLARE_SOA_COLUMN(TransRadius, transRadius, float); //! Transverse radius of the decay vertex
176180
DECLARE_SOA_COLUMN(DecayVtxX, decayVtxX, float); //! X position of the decay vertex
@@ -346,11 +350,15 @@ DECLARE_SOA_TABLE(FDExtParticles, "AOD", "FDEXTPARTICLE",
346350
femtodreamparticle::TPCNSigmaKa,
347351
femtodreamparticle::TPCNSigmaPr,
348352
femtodreamparticle::TPCNSigmaDe,
353+
femtodreamparticle::TPCNSigmaTr,
354+
femtodreamparticle::TPCNSigmaHe,
349355
femtodreamparticle::TOFNSigmaEl,
350356
femtodreamparticle::TOFNSigmaPi,
351357
femtodreamparticle::TOFNSigmaKa,
352358
femtodreamparticle::TOFNSigmaPr,
353359
femtodreamparticle::TOFNSigmaDe,
360+
femtodreamparticle::TOFNSigmaTr,
361+
femtodreamparticle::TOFNSigmaHe,
354362
femtodreamparticle::DaughDCA,
355363
femtodreamparticle::TransRadius,
356364
femtodreamparticle::DecayVtxX,

‎PWGCF/FemtoDream/TableProducer/femtoDreamProducerReducedTask.cxx‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@ using FemtoFullCollisionMC = soa::Join<aod::Collisions, aod::EvSels, aod::Mults,
5050
using FemtoFullCollision_noCent_MC = soa::Join<aod::Collisions, aod::EvSels, aod::Mults, aod::McCollisionLabels>::iterator;
5151

5252
using FemtoFullTracks = soa::Join<aod::FullTracks, aod::TracksDCA,
53-
aod::pidTPCFullEl, aod::pidTPCFullMu, aod::pidTPCFullPi,
54-
aod::pidTPCFullKa, aod::pidTPCFullPr, aod::pidTPCFullDe,
55-
aod::pidTOFFullEl, aod::pidTOFFullMu, aod::pidTOFFullPi,
56-
aod::pidTOFFullKa, aod::pidTOFFullPr, aod::pidTOFFullDe>;
53+
aod::pidTPCFullEl, aod::pidTPCFullMu, aod::pidTPCFullPi, aod::pidTPCFullKa,
54+
aod::pidTPCFullPr, aod::pidTPCFullDe, aod::pidTPCFullTr,aod::pidTPCFullHe,
55+
aod::pidTOFFullEl, aod::pidTOFFullMu, aod::pidTOFFullPi, aod::pidTOFFullKa,
56+
aod::pidTOFFullPr, aod::pidTOFFullDe, aod::pidTOFFullTr,aod::pidTOFFullHe>;
5757
} // namespace o2::aod
5858

5959
struct femtoDreamProducerReducedTask {
@@ -298,11 +298,15 @@ struct femtoDreamProducerReducedTask {
298298
track.tpcNSigmaKa(),
299299
track.tpcNSigmaPr(),
300300
track.tpcNSigmaDe(),
301+
track.tpcNSigmaTr(),
302+
track.tpcNSigmaHe(),
301303
track.tofNSigmaEl(),
302304
track.tofNSigmaPi(),
303305
track.tofNSigmaKa(),
304306
track.tofNSigmaPr(),
305307
track.tofNSigmaDe(),
308+
track.tofNSigmaTr(),
309+
track.tofNSigmaHe(),
306310
-999., -999., -999., -999., -999., -999.);
307311
}
308312
}

‎PWGCF/FemtoDream/TableProducer/femtoDreamProducerTask.cxx‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,10 @@ using FemtoFullMCgenCollision = FemtoFullMCgenCollisions::iterator;
5656

5757
using FemtoFullTracks =
5858
soa::Join<aod::FullTracks, aod::TracksDCA,
59-
aod::pidTPCFullEl, aod::pidTPCFullPi, aod::pidTPCFullKa, aod::pidTPCFullPr, aod::pidTPCFullDe,
60-
aod::pidTOFFullEl, aod::pidTOFFullPi, aod::pidTOFFullKa, aod::pidTOFFullPr, aod::pidTOFFullDe>;
59+
aod::pidTPCFullEl, aod::pidTPCFullPi, aod::pidTPCFullKa,
60+
aod::pidTPCFullPr, aod::pidTPCFullDe, aod::pidTPCFullTr, aod::pidTPCFullHe,
61+
aod::pidTOFFullEl, aod::pidTOFFullPi, aod::pidTOFFullKa,
62+
aod::pidTOFFullPr, aod::pidTOFFullDe, aod::pidTOFFullTr, aod::pidTOFFullHe>;
6163
} // namespace o2::aod
6264

6365
namespace softwareTriggers
@@ -363,16 +365,21 @@ struct femtoDreamProducerTask {
363365
particle.tpcNSigmaKa(),
364366
particle.tpcNSigmaPr(),
365367
particle.tpcNSigmaDe(),
368+
particle.tpcNSigmaTr(),
369+
particle.tpcNSigmaHe(),
366370
particle.tofNSigmaEl(),
367371
particle.tofNSigmaPi(),
368372
particle.tofNSigmaKa(),
369373
particle.tofNSigmaPr(),
370374
particle.tofNSigmaDe(),
375+
particle.tofNSigmaTr(),
376+
particle.tofNSigmaHe(),
371377
-999., -999., -999., -999., -999., -999.);
372378
} else {
373-
outputDebugParts(-999., -999., -999., -999., -999., -999., -999., -999.,
374-
-999., -999., -999., -999., -999., -999., -999., -999.,
375-
-999., -999., -999., -999., -999.,
379+
outputDebugParts(-999., -999., -999., -999., -999., -999., -999.,
380+
-999., -999., -999., -999., -999., -999., -999.,
381+
-999., -999., -999., -999., -999., -999., -999.,
382+
-999., -999., -999., -999.,
376383
particle.dcaV0daughters(),
377384
particle.v0radius(),
378385
particle.x(),
@@ -647,8 +654,8 @@ struct femtoDreamProducerTask {
647654
}
648655

649656
if (ConfIsActivateReso.value) {
650-
for (auto iDaug1 = 0; iDaug1 < Daughter1.size(); ++iDaug1) {
651-
for (auto iDaug2 = 0; iDaug2 < Daughter2.size(); ++iDaug2) {
657+
for (std::size_t iDaug1 = 0; iDaug1 < Daughter1.size(); ++iDaug1) {
658+
for (std::size_t iDaug2 = 0; iDaug2 < Daughter2.size(); ++iDaug2) {
652659
// MC stuff is still missing, also V0 QA
653660
// ALSO: fix indices and other table entries which are now set to 0 as deflaut as not needed for p-p-phi cf ana
654661

@@ -703,7 +710,7 @@ struct femtoDreamProducerTask {
703710
outputDebugParts(-999., -999., -999., -999., -999., -999., -999., -999.,
704711
-999., -999., -999., -999., -999., -999., -999., -999.,
705712
-999., -999., -999., -999., -999., -999., -999., -999.,
706-
-999., -999., -999.); // QA for Reso
713+
-999., -999. - 999., -999., -999., -999., -999., -999.); // QA for Reso
707714
}
708715
}
709716
}

‎PWGHF/HFC/TableProducer/femtoDreamProducer.cxx‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,10 @@ struct HfFemtoDreamProducer {
203203
particle.tofNSigmaPi(),
204204
particle.tofNSigmaKa(),
205205
particle.tofNSigmaPr(),
206-
-999., -999., -999., -999., -999., -999., -999., -999., -999., -999.);
206+
-999., -999., -999., -999.,
207+
-999., -999., -999., -999.,
208+
-999., -999., -999., -999.,
209+
-999., -999.);
207210
}
208211

209212
template <typename CollisionType, typename ParticleType>

0 commit comments

Comments
 (0)