Skip to content

Commit

Permalink
Merge 137f10c into c6a0b1f
Browse files Browse the repository at this point in the history
  • Loading branch information
@ddobrigk
ddobrigk authored Jan 5, 2024
2 parents c6a0b1f + 137f10c commit 034f94a
Show file tree
Hide file tree
Showing 5 changed files with 216 additions and 127 deletions.
71 changes: 38 additions & 33 deletions PWGLF/DataModel/LFStrangenessPIDTables.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,16 @@ namespace v0data
{
// ==== TOF INFORMATION ===
// lengths as stored in the AO2D for TOF calculations
DECLARE_SOA_COLUMN(PosTOFLength, posTOFLength, float); //! positive track length
DECLARE_SOA_COLUMN(NegTOFLength, negTOFLength, float); //! negative track length
DECLARE_SOA_COLUMN(PosTOFSignal, posTOFSignal, float); //! positive track signal
DECLARE_SOA_COLUMN(NegTOFSignal, negTOFSignal, float); //! negative track signal
DECLARE_SOA_COLUMN(PosTOFEventTime, posTOFEventTime, float); //! positive track event time
DECLARE_SOA_COLUMN(NegTOFEventTime, negTOFEventTime, float); //! negative track event time
DECLARE_SOA_COLUMN(PosTOFLengthToPV, posTOFLengthToPV, float); //! positive track length to PV
DECLARE_SOA_COLUMN(NegTOFLengthToPV, negTOFLengthToPV, float); //! negative track length to PV
DECLARE_SOA_COLUMN(PosTOFSignal, posTOFSignal, float); //! positive track signal
DECLARE_SOA_COLUMN(NegTOFSignal, negTOFSignal, float); //! negative track signal
DECLARE_SOA_COLUMN(PosTOFEventTime, posTOFEventTime, float); //! positive track event time
DECLARE_SOA_COLUMN(NegTOFEventTime, negTOFEventTime, float); //! negative track event time

// recalculated lengths
DECLARE_SOA_COLUMN(PosTOFLength, posTOFLength, float); //! positive track length, recalculated
DECLARE_SOA_COLUMN(NegTOFLength, negTOFLength, float); //! negative track length, recalculated

// delta-times
DECLARE_SOA_COLUMN(PosTOFDeltaTLaPi, posTOFDeltaTLaPi, float); //! positive track TOFDeltaT from pion <- lambda expectation
Expand All @@ -68,13 +72,14 @@ DECLARE_SOA_COLUMN(NegNSigmaK0Pi, negNSigmaK0Pi, float); //! positive track NSig
} // namespace v0data

DECLARE_SOA_TABLE(V0TOFs, "AOD", "V0TOF", // raw information table (for debug, etc)
v0data::PosTOFLength, v0data::NegTOFLength,
v0data::PosTOFLengthToPV, v0data::NegTOFLengthToPV,
v0data::PosTOFSignal, v0data::NegTOFSignal,
v0data::PosTOFEventTime, v0data::NegTOFEventTime,
v0data::PosTOFEventTime, v0data::NegTOFEventTime);
DECLARE_SOA_TABLE(V0TOFPIDs, "AOD", "V0TOFPID", // processed info table (for analysis)
v0data::PosTOFLength, v0data::NegTOFLength,
v0data::PosTOFDeltaTLaPi, v0data::PosTOFDeltaTLaPr,
v0data::NegTOFDeltaTLaPi, v0data::NegTOFDeltaTLaPr,
v0data::PosTOFDeltaTK0Pi, v0data::NegTOFDeltaTK0Pi);
DECLARE_SOA_TABLE(V0TOFPIDs, "AOD", "V0TOFPID", // nsigma table (for analysis)
v0data::PosTOFDeltaTK0Pi, v0data::NegTOFDeltaTK0Pi,
v0data::PosNSigmaLaPi, v0data::PosNSigmaLaPr,
v0data::NegNSigmaLaPi, v0data::NegNSigmaLaPr,
v0data::PosNSigmaK0Pi, v0data::NegNSigmaK0Pi);
Expand All @@ -83,15 +88,15 @@ namespace cascdata
{
// ==== TOF INFORMATION ===
// lengths as stored in the AO2D for TOF calculations
DECLARE_SOA_COLUMN(PosTOFLength, posTOFLength, float); //! positive track length
DECLARE_SOA_COLUMN(NegTOFLength, negTOFLength, float); //! negative track length
DECLARE_SOA_COLUMN(BachTOFLength, bachTOFLength, float); //! bachelor track length
DECLARE_SOA_COLUMN(PosTOFSignal, posTOFSignal, float); //! positive track signal
DECLARE_SOA_COLUMN(NegTOFSignal, negTOFSignal, float); //! negative track signal
DECLARE_SOA_COLUMN(BachTOFSignal, bachTOFSignal, float); //! bachelor track signal
DECLARE_SOA_COLUMN(PosTOFEventTime, posTOFEventTime, float); //! positive track event time
DECLARE_SOA_COLUMN(NegTOFEventTime, negTOFEventTime, float); //! negative track event time
DECLARE_SOA_COLUMN(BachTOFEventTime, bachTOFEventTime, float); //! bachelor track event time
DECLARE_SOA_COLUMN(PosTOFLengthToPV, posTOFLengthToPV, float); //! positive track length
DECLARE_SOA_COLUMN(NegTOFLengthToPV, negTOFLengthToPV, float); //! negative track length
DECLARE_SOA_COLUMN(BachTOFLengthToPV, bachTOFLengthToPV, float); //! bachelor track length
DECLARE_SOA_COLUMN(PosTOFSignal, posTOFSignal, float); //! positive track signal
DECLARE_SOA_COLUMN(NegTOFSignal, negTOFSignal, float); //! negative track signal
DECLARE_SOA_COLUMN(BachTOFSignal, bachTOFSignal, float); //! bachelor track signal
DECLARE_SOA_COLUMN(PosTOFEventTime, posTOFEventTime, float); //! positive track event time
DECLARE_SOA_COLUMN(NegTOFEventTime, negTOFEventTime, float); //! negative track event time
DECLARE_SOA_COLUMN(BachTOFEventTime, bachTOFEventTime, float); //! bachelor track event time

// delta-times
DECLARE_SOA_COLUMN(PosTOFDeltaTXiPi, posTOFDeltaTXiPi, float); //! positive track TOFDeltaT from pion <- lambda <- xi expectation
Expand All @@ -106,29 +111,29 @@ DECLARE_SOA_COLUMN(NegTOFDeltaTOmPr, negTOFDeltaTOmPr, float); //! negative tr
DECLARE_SOA_COLUMN(BachTOFDeltaTOmPi, bachTOFDeltaTOmPi, float); //! bachelor track TOFDeltaT from pion <- omega expectation

// n-sigmas
DECLARE_SOA_COLUMN(PosNSigmaXiPi, posNSigmaXiPi, float); //! positive track NSigma from pion <- lambda <- xi expectation
DECLARE_SOA_COLUMN(PosNSigmaXiPr, posNSigmaXiPr, float); //! positive track NSigma from proton <- lambda <- xi expectation
DECLARE_SOA_COLUMN(NegNSigmaXiPi, negNSigmaXiPi, float); //! negative track NSigma from pion <- lambda <- xi expectation
DECLARE_SOA_COLUMN(NegNSigmaXiPr, negNSigmaXiPr, float); //! negative track NSigma from proton <- lambda <- xi expectation
DECLARE_SOA_COLUMN(BachNSigmaXiPi, bachNSigmaXiPi, float); //! bachelor track NSigma from pion <- xi expectation
DECLARE_SOA_COLUMN(PosNSigmaOmPi, posNSigmaOmPi, float); //! positive track NSigma from pion <- lambda <- omega expectation
DECLARE_SOA_COLUMN(PosNSigmaOmPr, posNSigmaOmPr, float); //! positive track NSigma from proton <- lambda <- omega expectation
DECLARE_SOA_COLUMN(NegNSigmaOmPi, negNSigmaOmPi, float); //! negative track NSigma from pion <- lambda <- omega expectation
DECLARE_SOA_COLUMN(NegNSigmaOmPr, negNSigmaOmPr, float); //! negative track NSigma from proton <- lambda <- omega expectation
DECLARE_SOA_COLUMN(BachNSigmaOmKa, bachNSigmaOmKa, float); //! bachelor track NSigma from kaon <- omega expectation
DECLARE_SOA_COLUMN(PosNSigmaXiPi, posNSigmaXiPi, float); //! positive track NSigma from pion <- lambda <- xi expectation
DECLARE_SOA_COLUMN(PosNSigmaXiPr, posNSigmaXiPr, float); //! positive track NSigma from proton <- lambda <- xi expectation
DECLARE_SOA_COLUMN(NegNSigmaXiPi, negNSigmaXiPi, float); //! negative track NSigma from pion <- lambda <- xi expectation
DECLARE_SOA_COLUMN(NegNSigmaXiPr, negNSigmaXiPr, float); //! negative track NSigma from proton <- lambda <- xi expectation
DECLARE_SOA_COLUMN(BachNSigmaXiPi, bachNSigmaXiPi, float); //! bachelor track NSigma from pion <- xi expectation
DECLARE_SOA_COLUMN(PosNSigmaOmPi, posNSigmaOmPi, float); //! positive track NSigma from pion <- lambda <- omega expectation
DECLARE_SOA_COLUMN(PosNSigmaOmPr, posNSigmaOmPr, float); //! positive track NSigma from proton <- lambda <- omega expectation
DECLARE_SOA_COLUMN(NegNSigmaOmPi, negNSigmaOmPi, float); //! negative track NSigma from pion <- lambda <- omega expectation
DECLARE_SOA_COLUMN(NegNSigmaOmPr, negNSigmaOmPr, float); //! negative track NSigma from proton <- lambda <- omega expectation
DECLARE_SOA_COLUMN(BachNSigmaOmKa, bachNSigmaOmKa, float); //! bachelor track NSigma from kaon <- omega expectation
} // namespace cascdata

DECLARE_SOA_TABLE(CascTOFs, "AOD", "CascTOF", // raw information table (for debug, etc)
cascdata::PosTOFLength, cascdata::NegTOFLength, cascdata::BachTOFLength,
cascdata::PosTOFLengthToPV, cascdata::NegTOFLengthToPV, cascdata::BachTOFLengthToPV,
cascdata::PosTOFSignal, cascdata::NegTOFSignal, cascdata::BachTOFSignal,
cascdata::PosTOFEventTime, cascdata::NegTOFEventTime, cascdata::BachTOFEventTime,
cascdata::PosTOFEventTime, cascdata::NegTOFEventTime, cascdata::BachTOFEventTime);
DECLARE_SOA_TABLE(CascTOFPIDs, "AOD", "CASCTOFPID", // processed information for analysis
cascdata::PosTOFDeltaTXiPi, cascdata::PosTOFDeltaTXiPr,
cascdata::NegTOFDeltaTXiPi, cascdata::NegTOFDeltaTXiPr,
cascdata::BachTOFDeltaTXiPi,
cascdata::PosTOFDeltaTOmPi, cascdata::PosTOFDeltaTOmPr,
cascdata::NegTOFDeltaTOmPi, cascdata::NegTOFDeltaTOmPr,
cascdata::BachTOFDeltaTOmPi);
DECLARE_SOA_TABLE(CascTOFPIDs, "AOD", "CASCTOFPID", // nsigma table (for analysis)
cascdata::BachTOFDeltaTOmPi,
cascdata::PosNSigmaXiPi, cascdata::PosNSigmaXiPr,
cascdata::NegNSigmaXiPi, cascdata::NegNSigmaXiPr,
cascdata::BachNSigmaXiPi,
Expand Down
2 changes: 2 additions & 0 deletions PWGLF/DataModel/LFStrangenessTables.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ DECLARE_SOA_TABLE(StraEPs, "AOD", "STRAEPS", //! centrality percentiles
qvec::QvecFT0CRe, qvec::QvecFT0CIm, qvec::SumAmplFT0C,
qvec::QvecFT0MRe, qvec::QvecFT0MIm, qvec::SumAmplFT0M,
qvec::QvecFV0ARe, qvec::QvecFV0AIm, qvec::SumAmplFV0A);
DECLARE_SOA_TABLE(StraStamps, "AOD", "STRASTAMPS", //! information for ID-ing mag field if needed
bc::RunNumber, timestamp::Timestamp);

using StraCollision = StraCollisions::iterator;
using StraCent = StraCents::iterator;
Expand Down
16 changes: 6 additions & 10 deletions PWGLF/TableProducer/cascadepid.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,7 @@ using LabeledTracksExtra = soa::Join<aod::TracksExtra, aod::McTrackLabels>;

struct cascadepid {
// TOF pid for strangeness (recalculated with topology)
Produces<aod::CascTOFs> casctof; // raw table for checks
Produces<aod::CascTOFPIDs> casctofpid; // table with Nsigmas
Produces<aod::CascTOFPIDs> casctofpids; // table with Nsigmas

Service<o2::ccdb::BasicCCDBManager> ccdb;

Expand Down Expand Up @@ -246,14 +245,11 @@ struct cascadepid {
auto negTrack = cascade.negTrack_as<FullTracksExtIU>();

// FIXME: TOF calculation: under construction, to follow

if (fillRawPID) {
casctof(posTrack.length(), negTrack.length(), bachTrack.length(),
posTrack.tofSignal(), negTrack.tofSignal(), bachTrack.tofSignal(),
posTrack.tofEvTime(), negTrack.tofEvTime(), bachTrack.tofEvTime(),
0.0f, 0.0f, 0.0f, 0.0f, 0.0f,
0.0f, 0.0f, 0.0f, 0.0f, 0.0f);
}
casctofpids(0.0f, 0.0f,
posTrack.length(), negTrack.length(), bachTrack.length(),
0.0f, 0.0f, 0.0f, 0.0f, 0.0f,
0.0f, 0.0f, 0.0f, 0.0f, 0.0f,
0.0f, 0.0f, 0.0f, 0.0f, 0.0f);
}
}
}
Expand Down
Loading

0 comments on commit 034f94a

Please sign in to comment.