Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 11 additions & 17 deletions PWGLF/DataModel/Reduced3BodyTables.h
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,10 @@
DECLARE_SOA_INDEX_COLUMN_FULL(Collision, collision, int, RedCollisions, ""); //! Collision index

// track PID definition
DECLARE_SOA_COLUMN(TPCNSigmaPr, tpcNSigmaPr, float); //! Nsigma separation with the TPC detector for proton

Check failure on line 51 in PWGLF/DataModel/Reduced3BodyTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column]

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(TPCNSigmaDe, tpcNSigmaDe, float); //! Nsigma separation with the TPC detector for deuteron

Check failure on line 52 in PWGLF/DataModel/Reduced3BodyTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column]

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(TPCNSigmaPi, tpcNSigmaPi, float); //! Nsigma separation with the TPC detector for pion

Check failure on line 53 in PWGLF/DataModel/Reduced3BodyTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column]

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(TOFNSigmaDe, tofNSigmaDe, float); //! Nsigma separation with the TOF detector for deuteron (recalculated)

Check failure on line 54 in PWGLF/DataModel/Reduced3BodyTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column]

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.

} // namespace reducedtracks3body

Expand Down Expand Up @@ -83,6 +83,7 @@
// tracks extra
track::PIDForTracking<track::Flags>,
track::IsPVContributor<track::Flags>,
track::HasITS<track::v001::DetectorMap>,
track::HasTPC<track::v001::DetectorMap>,
track::HasTOF<track::v001::DetectorMap>,
track::TPCNClsFound<track::TPCNClsFindable, track::TPCNClsFindableMinusFound>,
Expand Down Expand Up @@ -120,29 +121,22 @@
DECLARE_SOA_INDEX_COLUMN_FULL(Track1, track1, int, RedIUTracks, "_1"); //! Track 1 index
DECLARE_SOA_INDEX_COLUMN_FULL(Track2, track2, int, RedIUTracks, "_2"); //! Track 2 index
DECLARE_SOA_INDEX_COLUMN_FULL(Collision, collision, int, RedCollisions, ""); //! Collision index
DECLARE_SOA_COLUMN(Phi, phi, float); //! decay3body radius
DECLARE_SOA_COLUMN(Radius, radius, float); //! decay3body phi
DECLARE_SOA_COLUMN(PosZ, posz, float); //! decay3body z position
DECLARE_SOA_COLUMN(RadiusKF, radiusKF, float); //! phi of momentum of mother particle calculated by KF
DECLARE_SOA_COLUMN(PhiKF, phiKF, float); //! SV radius in x-y plane calculated by KF
DECLARE_SOA_COLUMN(PosZKF, poszKF, float); //! z position of SV calculated by KF

Check failure on line 126 in PWGLF/DataModel/Reduced3BodyTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column]

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(RadiusDCA, radiusDCA, float); //! phi of momentum of mother particle calculated by dcaFitter
DECLARE_SOA_COLUMN(PhiDCA, phiDCA, float); //! SV radius in x-y plane calculated by dcaFitter
DECLARE_SOA_COLUMN(PosZDCA, poszDCA, float); //! z position of SV calculated by dcaFitter

Check failure on line 129 in PWGLF/DataModel/Reduced3BodyTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column]

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(TrackedClSize, trackedClSize, float); //! average ITS cluster size (if tracked)
} // namespace reduceddecay3body

DECLARE_SOA_TABLE(RedDecay3Bodys, "AOD", "REDDECAY3BODY", //! reduced 3-body decay table
o2::soa::Index<>, reduceddecay3body::CollisionId, reduceddecay3body::Track0Id, reduceddecay3body::Track1Id, reduceddecay3body::Track2Id);

using ReducedDecay3BodysLinked = soa::Join<RedDecay3Bodys, Decay3BodyDataLink>;
using ReducedDecay3BodyLinked = ReducedDecay3BodysLinked::iterator;

DECLARE_SOA_TABLE(Red3BodyInfo, "AOD", "RED3BODYINFO", //! joinable with RedDecay3Bodys
reduceddecay3body::Radius, reduceddecay3body::Phi, reduceddecay3body::PosZ);

namespace dcafittersvinfo
{
DECLARE_SOA_COLUMN(SVRadius, svRadius, float); //! SV radius in x-y plane calculated by dcaFitter
DECLARE_SOA_COLUMN(MomPhi, momPhi, float); //! phi of momentum of mother particle calculated from dcaFitter
DECLARE_SOA_COLUMN(SVPosZ, svPosZ, float); //! z position of SV calculated by dcaFitter
} // namespace dcafittersvinfo

DECLARE_SOA_TABLE_FULL(DCAFitterSVInfo, "FitSVInfo", "AOD", "FITSVINFO", //! joinable with RedDecay3Bodys
dcafittersvinfo::SVRadius, dcafittersvinfo::MomPhi, dcafittersvinfo::SVPosZ);
reduceddecay3body::RadiusKF, reduceddecay3body::PhiKF, reduceddecay3body::PosZKF,
reduceddecay3body::RadiusDCA, reduceddecay3body::PhiDCA, reduceddecay3body::PosZDCA,
reduceddecay3body::TrackedClSize);

} // namespace o2::aod

Expand Down
783 changes: 236 additions & 547 deletions PWGLF/DataModel/Vtx3BodyTables.h

Large diffs are not rendered by default.

17 changes: 1 addition & 16 deletions PWGLF/TableProducer/Nuspex/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

o2physics_add_dpl_workflow(decay3bodybuilder
SOURCES decay3bodybuilder.cxx
PUBLIC_LINK_LIBRARIES O2::DCAFitter KFParticle::KFParticle O2Physics::AnalysisCore O2::TOFBase O2Physics::EventFilteringUtils O2::DetectorsVertexing
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2::DCAFitter KFParticle::KFParticle O2::TOFBase O2Physics::EventFilteringUtils O2::DetectorsVertexing
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(hyhefour-builder
Expand All @@ -29,11 +29,6 @@ o2physics_add_dpl_workflow(lnn-reco-task
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2::DCAFitter
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(hypertriton3bodyfinder
SOURCES hypertriton3bodyfinder.cxx
PUBLIC_LINK_LIBRARIES O2::DCAFitter O2Physics::AnalysisCore
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(nucleustreecreator
SOURCES LFTreeCreatorNuclei.cxx
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
Expand All @@ -59,11 +54,6 @@ o2physics_add_dpl_workflow(threebodymcfinder
PUBLIC_LINK_LIBRARIES O2::DCAFitter O2Physics::AnalysisCore
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(threebody-reco-task
SOURCES threebodyRecoTask.cxx
PUBLIC_LINK_LIBRARIES O2::DCAFitter O2Physics::AnalysisCore O2Physics::EventFilteringUtils
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(ebye-maker
SOURCES ebyeMaker.cxx
PUBLIC_LINK_LIBRARIES O2::DCAFitter O2Physics::AnalysisCore
Expand All @@ -79,11 +69,6 @@ o2physics_add_dpl_workflow(pidtof-generic
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2::TOFBase
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(threebody-kf-task
SOURCES threebodyKFTask.cxx
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(hypernuclei-kf-reco-task
SOURCES hypKfRecoTask.cxx
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore KFParticle::KFParticle
Expand Down
Loading
Loading