Skip to content

[ALICE3] Modularise multi-charm task #11441

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hscheid merged 8 commits into from
Jun 2, 2025
Merged

[ALICE3] Modularise multi-charm task #11441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0b84850
Modularise multi-charm task
jesgum Jun 2, 2025
f4a8954
formatting
jesgum Jun 2, 2025
583b828
Update cmakelist.txt
jesgum Jun 2, 2025
0546a9d
Update
jesgum Jun 2, 2025
7013f83
Update
jesgum Jun 2, 2025
a3412e9
Update
jesgum Jun 2, 2025
bfcc37a
Merge branch 'master' into master
jesgum Jun 2, 2025
d64a847
Formatting
jesgum Jun 2, 2025
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
190 changes: 127 additions & 63 deletions ALICE3/DataModel/OTFMulticharm.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,11 @@
// or submit itself to any jurisdiction.

///
/// \file OTFStrangeness.h
/// \file OTFMulticharm.h
/// \author David Dobrigkeit Chinellato
/// \author Jesper Karlsson Gumprecht
/// \since 05/08/2024
/// \brief Set of tables for the ALICE3 strangeness information
/// \brief Set of tables for the ALICE3 multi-charm information
///

#ifndef ALICE3_DATAMODEL_OTFMULTICHARM_H_
Expand All @@ -31,45 +32,72 @@ DECLARE_SOA_INDEX_COLUMN_FULL(XiCPion1, xiCPion1, int, Tracks, "_Pi1XiC");
DECLARE_SOA_INDEX_COLUMN_FULL(XiCPion2, xiCPion2, int, Tracks, "_Pi2XiC");
DECLARE_SOA_INDEX_COLUMN_FULL(XiCCPion, xiCCPion, int, Tracks, "_PiXiCC");

// topo vars
DECLARE_SOA_COLUMN(DCAXiCDaughters, dcaXiCDaughters, float);
DECLARE_SOA_COLUMN(DCAXiCCDaughters, dcaXiCCDaughters, float);

DECLARE_SOA_COLUMN(MXiC, mXiC, float);
DECLARE_SOA_COLUMN(MXiCC, mXiCC, float);
DECLARE_SOA_COLUMN(XicMass, xicMass, float);
DECLARE_SOA_COLUMN(XiccMass, xiccMass, float);

// kine vars
DECLARE_SOA_COLUMN(Pt, pt, float);
DECLARE_SOA_COLUMN(Eta, eta, float);

// tracking counters
DECLARE_SOA_COLUMN(NSiliconHitsXi, nSiliconHitsXi, int);
DECLARE_SOA_COLUMN(NSiliconHitsPiFromXi, nSiliconHitsPiFromXi, int);
DECLARE_SOA_COLUMN(NSiliconHitsPiFromLa, nSiliconHitsPiFromLa, int);
DECLARE_SOA_COLUMN(NSiliconHitsPrFromLa, nSiliconHitsPrFromLa, int);
DECLARE_SOA_COLUMN(NSiliconHitsPiC1, nSiliconHitsPiC1, int);
DECLARE_SOA_COLUMN(NSiliconHitsPiC2, nSiliconHitsPiC2, int);
DECLARE_SOA_COLUMN(NSiliconHitsPiCC, nSiliconHitsPiCC, int);

DECLARE_SOA_COLUMN(NTPCHitsPiFromXi, nTPCHitsPiFromXi, int);
DECLARE_SOA_COLUMN(NTPCHitsPiFromLa, nTPCHitsPiFromLa, int);
DECLARE_SOA_COLUMN(NTPCHitsPrFromLa, nTPCHitsPrFromLa, int);
DECLARE_SOA_COLUMN(NTPCHitsPiC1, nTPCHitsPiC1, int);
DECLARE_SOA_COLUMN(NTPCHitsPiC2, nTPCHitsPiC2, int);
DECLARE_SOA_COLUMN(NTPCHitsPiCC, nTPCHitsPiCC, int);

// DCA to PV variables
DECLARE_SOA_COLUMN(DCAToPVXi, dcaToPVXi, float);
DECLARE_SOA_COLUMN(DCAToPVXiC, dcaToPVXiC, float);
DECLARE_SOA_COLUMN(DCAToPVXiCC, dcaToPVXiCC, float);

DECLARE_SOA_COLUMN(DCAToPVPiFromXi, dcaToPVPiFromXi, float);
DECLARE_SOA_COLUMN(DCAToPVPiFromLa, dcaToPVPiFromLa, float);
DECLARE_SOA_COLUMN(DCAToPVPrFromLa, dcaToPVPrFromLa, float);

DECLARE_SOA_COLUMN(DCAToPVPiC1, dcaToPVPiC1, float);
DECLARE_SOA_COLUMN(DCAToPVPiC2, dcaToPVPiC2, float);
DECLARE_SOA_COLUMN(DCAToPVPiCC, dcaToPVPiCC, float);
// topo vars
DECLARE_SOA_COLUMN(XiDCAz, xiDCAz, float);
DECLARE_SOA_COLUMN(XiDCAxy, xiDCAxy, float);
DECLARE_SOA_COLUMN(XicDauDCA, xicDauDCA, float);
DECLARE_SOA_COLUMN(XicDCAxy, xicDCAxy, float);
DECLARE_SOA_COLUMN(XicDCAz, xicDCAz, float);
DECLARE_SOA_COLUMN(XiccDauDCA, xiccDauDCA, float);
DECLARE_SOA_COLUMN(XiccDCAxy, xiccDCAxy, float);
DECLARE_SOA_COLUMN(XiccDCAz, xiccDCAz, float);

DECLARE_SOA_COLUMN(PiFromXiDCAxy, piFromXiDCAxy, float);
DECLARE_SOA_COLUMN(PiFromLaDCAxy, piFromLaDCAxy, float);
DECLARE_SOA_COLUMN(PrFromLaDCAxy, prFromLaDCAxy, float);
DECLARE_SOA_COLUMN(PiFromXiDCAz, piFromXiDCAz, float);
DECLARE_SOA_COLUMN(PiFromLaDCAz, piFromLaDCAz, float);
DECLARE_SOA_COLUMN(PrFromLaDCAz, prFromLaDCAz, float);

DECLARE_SOA_COLUMN(Pi1cDCAxy, pi1cDCAxy, float);
DECLARE_SOA_COLUMN(Pi2cDCAxy, pi2cDCAxy, float);
DECLARE_SOA_COLUMN(PiccDCAxy, piccDCAxy, float);
DECLARE_SOA_COLUMN(Pi1cDCAz, pi1cDCAz, float);
DECLARE_SOA_COLUMN(Pi2cDCAz, pi2cDCAz, float);
DECLARE_SOA_COLUMN(PiccDCAz, piccDCAz, float);

// Lengths
DECLARE_SOA_COLUMN(XicDecayRadius2D, xicDecayRadius2D, float);
DECLARE_SOA_COLUMN(XiccDecayRadius2D, xiccDecayRadius2D, float);
DECLARE_SOA_COLUMN(XicProperLength, xicProperLength, float);
DECLARE_SOA_COLUMN(XicDistanceFromPV, xicDistanceFromPV, float);
DECLARE_SOA_COLUMN(XiccProperLength, xiccProperLength, float);

// PID
DECLARE_SOA_COLUMN(Pi1cTofDeltaInner, pi1cTofDeltaInner, float);
DECLARE_SOA_COLUMN(Pi1cTofNSigmaInner, pi1cTofNSigmaInner, float);
DECLARE_SOA_COLUMN(Pi1cTofDeltaOuter, pi1cTofDeltaOuter, float);
DECLARE_SOA_COLUMN(Pi1cTofNSigmaOuter, pi1cTofNSigmaOuter, float);
DECLARE_SOA_COLUMN(Pi2cTofDeltaInner, pi2cTofDeltaInner, float);
DECLARE_SOA_COLUMN(Pi2cTofNSigmaInner, pi2cTofNSigmaInner, float);
DECLARE_SOA_COLUMN(Pi2cTofDeltaOuter, pi2cTofDeltaOuter, float);
DECLARE_SOA_COLUMN(Pi2cTofNSigmaOuter, pi2cTofNSigmaOuter, float);
DECLARE_SOA_COLUMN(PiccTofDeltaInner, piccTofDeltaInner, float);
DECLARE_SOA_COLUMN(PiccTofNSigmaInner, piccTofNSigmaInner, float);
DECLARE_SOA_COLUMN(PiccTofDeltaOuter, piccTofDeltaOuter, float);
DECLARE_SOA_COLUMN(PiccTofNSigmaOuter, piccTofNSigmaOuter, float);

// Daughter info
DECLARE_SOA_COLUMN(PosPt, posPt, float);
DECLARE_SOA_COLUMN(PosEta, posEta, float);
DECLARE_SOA_COLUMN(NegPt, negPt, float);
DECLARE_SOA_COLUMN(NegEta, negEta, float);
DECLARE_SOA_COLUMN(BachPt, bachPt, float);
DECLARE_SOA_COLUMN(BachEta, bachEta, float);
DECLARE_SOA_COLUMN(BachPhi, bachPhi, float);
DECLARE_SOA_COLUMN(Pi1cPt, pi1cPt, float);
DECLARE_SOA_COLUMN(Pi1cEta, pi1cEta, float);
DECLARE_SOA_COLUMN(Pi2cPt, pi2cPt, float);
DECLARE_SOA_COLUMN(Pi2cEta, pi2cEta, float);
DECLARE_SOA_COLUMN(PiccPt, piccPt, float);
DECLARE_SOA_COLUMN(PiccEta, piccEta, float);

} // namespace otfmulticharm
DECLARE_SOA_TABLE(MCharmIndices, "AOD", "MCharmIndices",
Expand All @@ -80,36 +108,72 @@ DECLARE_SOA_TABLE(MCharmIndices, "AOD", "MCharmIndices",
otfmulticharm::XiCCPionId);

DECLARE_SOA_TABLE(MCharmCores, "AOD", "MCharmCores",
otfmulticharm::DCAXiCDaughters,
otfmulticharm::DCAXiCCDaughters,
otfmulticharm::MXiC,
otfmulticharm::MXiCC,
otfmulticharm::XicDauDCA,
otfmulticharm::XiccDauDCA,
otfmulticharm::XicMass,
otfmulticharm::XiccMass,
otfmulticharm::Pt,
otfmulticharm::Eta,

otfmulticharm::NSiliconHitsXi,
otfmulticharm::NSiliconHitsPiFromXi,
otfmulticharm::NSiliconHitsPiFromLa,
otfmulticharm::NSiliconHitsPrFromLa,
otfmulticharm::NSiliconHitsPiC1,
otfmulticharm::NSiliconHitsPiC2,
otfmulticharm::NSiliconHitsPiCC,
otfmulticharm::NTPCHitsPiFromXi,
otfmulticharm::NTPCHitsPiFromLa,
otfmulticharm::NTPCHitsPrFromLa,
otfmulticharm::NTPCHitsPiC1,
otfmulticharm::NTPCHitsPiC2,
otfmulticharm::NTPCHitsPiCC,

otfmulticharm::DCAToPVXi,
otfmulticharm::DCAToPVXiC,
otfmulticharm::DCAToPVXiCC,
otfmulticharm::DCAToPVPiFromXi,
otfmulticharm::DCAToPVPiFromLa,
otfmulticharm::DCAToPVPrFromLa,
otfmulticharm::DCAToPVPiC1,
otfmulticharm::DCAToPVPiC2,
otfmulticharm::DCAToPVPiCC);
otfmulticharm::XiDCAxy,
otfmulticharm::XicDCAxy,
otfmulticharm::XiccDCAxy,
otfmulticharm::XiDCAz,
otfmulticharm::XicDCAz,
otfmulticharm::XiccDCAz,

otfmulticharm::PiFromXiDCAxy,
otfmulticharm::PiFromLaDCAxy,
otfmulticharm::PrFromLaDCAxy,
otfmulticharm::PiFromXiDCAz,
otfmulticharm::PiFromLaDCAz,
otfmulticharm::PrFromLaDCAz,

otfmulticharm::Pi1cDCAxy,
otfmulticharm::Pi2cDCAxy,
otfmulticharm::PiccDCAxy,
otfmulticharm::Pi1cDCAz,
otfmulticharm::Pi2cDCAz,
otfmulticharm::PiccDCAz,

otfmulticharm::XicDecayRadius2D,
otfmulticharm::XiccDecayRadius2D,
otfmulticharm::XicProperLength,
otfmulticharm::XicDistanceFromPV,
otfmulticharm::XiccProperLength,

otfmulticharm::Pi1cTofDeltaInner,
otfmulticharm::Pi1cTofNSigmaInner,
otfmulticharm::Pi1cTofDeltaOuter,
otfmulticharm::Pi1cTofNSigmaOuter,

otfmulticharm::Pi2cTofDeltaInner,
otfmulticharm::Pi2cTofNSigmaInner,
otfmulticharm::Pi2cTofDeltaOuter,
otfmulticharm::Pi2cTofNSigmaOuter,

otfmulticharm::PiccTofDeltaInner,
otfmulticharm::PiccTofNSigmaInner,
otfmulticharm::PiccTofDeltaOuter,
otfmulticharm::PiccTofNSigmaOuter,

otfmulticharm::BachPt,
otfmulticharm::BachEta,

otfmulticharm::PosPt,
otfmulticharm::PosEta,

otfmulticharm::NegPt,
otfmulticharm::NegEta,

otfmulticharm::Pi1cPt,
otfmulticharm::Pi1cEta,

otfmulticharm::Pi2cPt,
otfmulticharm::Pi2cEta,

otfmulticharm::PiccPt,
otfmulticharm::PiccEta);

} // namespace o2::aod

Expand Down
4 changes: 2 additions & 2 deletions ALICE3/TableProducer/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2019-2020 CERN and copyright holders of ALICE O2.

Check failure on line 1 in ALICE3/TableProducer/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow] 

Use kebab-case for names of workflows and match the name of the workflow file.
# See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
# All rights not expressly granted are reserved.
#
Expand All @@ -11,42 +11,42 @@

add_subdirectory(OTF)

o2physics_add_dpl_workflow(alice3-trackselection

Check failure on line 14 in ALICE3/TableProducer/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow] 

Workflow name alice3-trackselection does not match its file name alice3-trackselection.cxx. (Matches alice3Trackselection.cxx.)
SOURCES alice3-trackselection.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(alice3-trackextension

Check failure on line 19 in ALICE3/TableProducer/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow] 

Workflow name alice3-trackextension does not match its file name alice3-trackextension.cxx. (Matches alice3Trackextension.cxx.)
SOURCES alice3-trackextension.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2::ReconstructionDataFormats
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(alice3-pid-tof

Check failure on line 24 in ALICE3/TableProducer/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow] 

Workflow name alice3-pid-tof does not match its file name alice3-pidTOF.cxx. (Matches alice3PidTof.cxx.)
SOURCES alice3-pidTOF.cxx
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2Physics::ALICE3Core
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(alice3-centrality

Check failure on line 29 in ALICE3/TableProducer/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow] 

Workflow name alice3-centrality does not match its file name alice3-centrality.cxx. (Matches alice3Centrality.cxx.)
SOURCES alice3-centrality.cxx
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(alice3-decaypreselector

Check failure on line 34 in ALICE3/TableProducer/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow] 

Workflow name alice3-decaypreselector does not match its file name alice3-decaypreselector.cxx. (Matches alice3Decaypreselector.cxx.)
SOURCES alice3-decaypreselector.cxx
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2::DCAFitter
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(alice3-decayfinder

Check failure on line 39 in ALICE3/TableProducer/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow] 

Workflow name alice3-decayfinder does not match its file name alice3-decayfinder.cxx. (Matches alice3Decayfinder.cxx.)
SOURCES alice3-decayfinder.cxx
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2::DCAFitter
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(alice3-multicharm
SOURCES alice3-multicharm.cxx
o2physics_add_dpl_workflow(alice3-multicharm-table

Check failure on line 44 in ALICE3/TableProducer/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow] 

Workflow name alice3-multicharm-table does not match its file name alice3-multicharmTable.cxx. (Matches alice3MulticharmTable.cxx.)
SOURCES alice3-multicharmTable.cxx
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2::DCAFitter
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(alice3-correlatorddbar

Check failure on line 49 in ALICE3/TableProducer/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow] 

Workflow name alice3-correlatorddbar does not match its file name alice3-correlatorDDbar.cxx. (Matches alice3Correlatorddbar.cxx.)
SOURCES alice3-correlatorDDbar.cxx
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2::DCAFitter
COMPONENT_NAME Analysis)
Loading
Loading