Skip to content

[PWGLF] removed deprecated table, slimmed the output tables for Li4 #16027

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
maciacco merged 1 commit into from
Apr 30, 2026
+43 −162
Merged

[PWGLF] removed deprecated table, slimmed the output tables for Li4 #16027

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
125 changes: 0 additions & 125 deletions PWGLF/DataModel/LFLithium4Tables.h
View file
Open in desktop

This file was deleted.

29 changes: 16 additions & 13 deletions PWGLF/DataModel/LFhe3HadronTables.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,21 +33,22 @@
DECLARE_SOA_COLUMN(EtaHad, etaHad, float);
DECLARE_SOA_COLUMN(PhiHad, phiHad, float);

DECLARE_SOA_COLUMN(DCAxyHe3, dcaxyHe3, float);

Check failure on line 36 in PWGLF/DataModel/LFhe3HadronTables.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(DCAzHe3, dcazHe3, float);

Check failure on line 37 in PWGLF/DataModel/LFhe3HadronTables.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(DCAxyHad, dcaxyHad, float);

Check failure on line 38 in PWGLF/DataModel/LFhe3HadronTables.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(DCAzHad, dcazHad, float);

Check failure on line 39 in PWGLF/DataModel/LFhe3HadronTables.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(DCApair, dcapair, float);

DECLARE_SOA_COLUMN(SignalTPCHe3, signalTPCHe3, float);
DECLARE_SOA_COLUMN(InnerParamTPCHe3, innerParamTPCHe3, float);
DECLARE_SOA_COLUMN(SignalTPCHad, signalTPCHad, float);
DECLARE_SOA_COLUMN(InnerParamTPCHad, innerParamTPCHad, float);
DECLARE_SOA_COLUMN(NClsTPCHe3, nClsTPCHe3, uint8_t);
DECLARE_SOA_COLUMN(NSigmaTPCHe3, nSigmaTPCHe3, float);
DECLARE_SOA_COLUMN(NSigmaTPCHad, nSigmaTPCHad, float);
DECLARE_SOA_COLUMN(NSigmaTPCHadPi, nSigmaTPCHadPi, float);
DECLARE_SOA_COLUMN(NSigmaTPCHadKa, nSigmaTPCHadKa, float);
DECLARE_SOA_COLUMN(NSigmaTPCHadPr, nSigmaTPCHadPr, float);
DECLARE_SOA_COLUMN(NSigmaTOFHad, nSigmaTOFHad, float);
DECLARE_SOA_COLUMN(NSigmaTOFHadPi, nSigmaTOFHadPi, float);
DECLARE_SOA_COLUMN(NSigmaTOFHadKa, nSigmaTOFHadKa, float);
DECLARE_SOA_COLUMN(NSigmaTOFHadPr, nSigmaTOFHadPr, float);
Expand All @@ -55,8 +56,8 @@
DECLARE_SOA_COLUMN(Chi2TPCHad, chi2TPCHad, float);
DECLARE_SOA_COLUMN(MassTOFHe3, massTOFHe3, float);
DECLARE_SOA_COLUMN(MassTOFHad, massTOFHad, float);
DECLARE_SOA_COLUMN(PIDtrkHe3, pidTrkHe3, uint32_t);

Check failure on line 59 in PWGLF/DataModel/LFhe3HadronTables.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(PIDtrkHad, pidTrkHad, uint32_t);

Check failure on line 60 in PWGLF/DataModel/LFhe3HadronTables.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(TrackIDHe3, trackIDHe3, int);
DECLARE_SOA_COLUMN(TrackIDHad, trackIDHad, int);

Expand All @@ -81,7 +82,7 @@
DECLARE_SOA_COLUMN(CollisionId, collisionId, int64_t);
DECLARE_SOA_COLUMN(ZVertex, zVertex, float);
DECLARE_SOA_COLUMN(Multiplicity, multiplicity, uint16_t);
DECLARE_SOA_COLUMN(CentralityFT0C, centFT0C, float);

Check failure on line 85 in PWGLF/DataModel/LFhe3HadronTables.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(MultiplicityFT0C, multiplicityFT0C, float);

/* Flags: 0 - both primary,
Expand All @@ -93,7 +94,7 @@

} // namespace he3HadronTablesNS

DECLARE_SOA_TABLE(he3HadronTable, "AOD", "HE3HADTABLE",

Check failure on line 97 in PWGLF/DataModel/LFhe3HadronTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-table] 

Use UpperCamelCase for names of O2 tables.
he3HadronTablesNS::PtHe3,
he3HadronTablesNS::EtaHe3,
he3HadronTablesNS::PhiHe3,
Expand All @@ -104,30 +105,22 @@
he3HadronTablesNS::DCAzHe3,
he3HadronTablesNS::DCAxyHad,
he3HadronTablesNS::DCAzHad,
he3HadronTablesNS::DCApair,
he3HadronTablesNS::SignalTPCHe3,
he3HadronTablesNS::InnerParamTPCHe3,
he3HadronTablesNS::SignalTPCHad,
he3HadronTablesNS::InnerParamTPCHad,
he3HadronTablesNS::NClsTPCHe3,
he3HadronTablesNS::NSigmaTPCHe3,
he3HadronTablesNS::NSigmaTPCHadPi,
he3HadronTablesNS::NSigmaTPCHadKa,
he3HadronTablesNS::NSigmaTPCHadPr,
he3HadronTablesNS::NSigmaTOFHadPi,
he3HadronTablesNS::NSigmaTOFHadKa,
he3HadronTablesNS::NSigmaTOFHadPr,
he3HadronTablesNS::NSigmaTPCHad,
he3HadronTablesNS::NSigmaTOFHad,
he3HadronTablesNS::Chi2TPCHe3,
he3HadronTablesNS::Chi2TPCHad,
he3HadronTablesNS::MassTOFHe3,
he3HadronTablesNS::MassTOFHad,
he3HadronTablesNS::PIDtrkHe3,
he3HadronTablesNS::PIDtrkHad,
he3HadronTablesNS::ItsClusterSizeHe3,
he3HadronTablesNS::ItsClusterSizeHad,
he3HadronTablesNS::SharedClustersHe3,
he3HadronTablesNS::SharedClustersHad)
he3HadronTablesNS::SharedClustersHe3)
DECLARE_SOA_TABLE(he3HadronTableMC, "AOD", "HE3HADTABLEMC",

Check failure on line 123 in PWGLF/DataModel/LFhe3HadronTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-table] 

Use UpperCamelCase for names of O2 tables.
he3HadronTablesNS::PtMCHe3,
he3HadronTablesNS::EtaMCHe3,
he3HadronTablesNS::PhiMCHe3,
Expand All @@ -137,7 +130,7 @@
he3HadronTablesNS::SignedPtMC,
he3HadronTablesNS::MassMC,
he3HadronTablesNS::Flags)
DECLARE_SOA_TABLE(he3HadronMult, "AOD", "HE3HADMULT",

Check failure on line 133 in PWGLF/DataModel/LFhe3HadronTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-table] 

Use UpperCamelCase for names of O2 tables.
he3HadronTablesNS::CollisionId,
he3HadronTablesNS::ZVertex,
he3HadronTablesNS::Multiplicity,
Expand All @@ -145,7 +138,17 @@
he3HadronTablesNS::MultiplicityFT0C)
DECLARE_SOA_TABLE(he3HadronQa, "AOD", "HE3HADQA",
he3HadronTablesNS::TrackIDHe3,
he3HadronTablesNS::TrackIDHad)
he3HadronTablesNS::TrackIDHad,
he3HadronTablesNS::MassTOFHe3,
he3HadronTablesNS::PIDtrkHad,
he3HadronTablesNS::SharedClustersHad)
DECLARE_SOA_TABLE(he3HadronPid, "AOD", "HE3HADPID",
he3HadronTablesNS::NSigmaTPCHadPi,
he3HadronTablesNS::NSigmaTPCHadKa,
he3HadronTablesNS::NSigmaTPCHadPr,
he3HadronTablesNS::NSigmaTOFHadPi,
he3HadronTablesNS::NSigmaTOFHadKa,
he3HadronTablesNS::NSigmaTOFHadPr)

} // namespace o2::aod

Expand Down
51 changes: 27 additions & 24 deletions PWGLF/TableProducer/Nuspex/he3HadronFemto.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,9 +192,11 @@ struct He3HadCandidate {
float chi2TPCHe3 = -10.f;
float chi2TPCHad = -10.f;
float nSigmaHe3 = -10.f;
float nSigmaTPCHad = -10.f;
float nSigmaTPCHadPi = -10.f;
float nSigmaTPCHadKa = -10.f;
float nSigmaTPCHadPr = -10.f;
float nSigmaTOFHad = -10.f;
float nSigmaTOFHadPi = -10.f;
float nSigmaTOFHadKa = -10.f;
float nSigmaTOFHadPr = -10.f;
Expand Down Expand Up @@ -239,6 +241,7 @@ struct he3HadronFemto {
Produces<aod::he3HadronTableMC> outputMcTable;
Produces<aod::he3HadronMult> outputMultiplicityTable;
Produces<aod::he3HadronQa> outputQaTable;
Produces<aod::he3HadronPid> outputPidTable;

// Selections
Configurable<int> settingHadPDGCode{"settingHadPDGCode", 211, "Hadron - PDG code"};
Expand Down Expand Up @@ -755,9 +758,11 @@ struct he3HadronFemto {

he3Hadcand.nTPCClustersHe3 = trackHe3.tpcNClsFound();
he3Hadcand.nSigmaHe3 = computeNSigmaHe3(trackHe3);
he3Hadcand.nSigmaTPCHad = computeTPCNSigmaHadron(trackHad);
he3Hadcand.nSigmaTPCHadPi = trackHad.tpcNSigmaPi();
he3Hadcand.nSigmaTPCHadKa = trackHad.tpcNSigmaKa();
he3Hadcand.nSigmaTPCHadPr = trackHad.tpcNSigmaPr();
he3Hadcand.nSigmaTOFHad = computeTOFNSigmaHadron(trackHad);
he3Hadcand.nSigmaTOFHadPi = trackHad.tofNSigmaPi();
he3Hadcand.nSigmaTOFHadKa = trackHad.tofNSigmaKa();
he3Hadcand.nSigmaTOFHadPr = trackHad.tofNSigmaPr();
Expand Down Expand Up @@ -906,29 +911,21 @@ struct he3HadronFemto {
he3Hadcand.dcazHe3,
he3Hadcand.dcaxyHad,
he3Hadcand.dcazHad,
he3Hadcand.dcaPair,
he3Hadcand.tpcSignalHe3,
he3Hadcand.momHe3TPC,
he3Hadcand.tpcSignalHad,
he3Hadcand.momHadTPC,
he3Hadcand.nTPCClustersHe3,
he3Hadcand.nSigmaHe3,
he3Hadcand.nSigmaTPCHadPi,
he3Hadcand.nSigmaTPCHadKa,
he3Hadcand.nSigmaTPCHadPr,
he3Hadcand.nSigmaTOFHadPi,
he3Hadcand.nSigmaTOFHadKa,
he3Hadcand.nSigmaTOFHadPr,
he3Hadcand.nSigmaTPCHad,
he3Hadcand.nSigmaTOFHad,
he3Hadcand.chi2TPCHe3,
he3Hadcand.chi2TPCHad,
he3Hadcand.massTOFHe3,
he3Hadcand.massTOFHad,
he3Hadcand.pidtrkHe3,
he3Hadcand.pidtrkHad,
he3Hadcand.itsClSizeHe3,
he3Hadcand.itsClSizeHad,
he3Hadcand.sharedClustersHe3,
he3Hadcand.sharedClustersHad);
he3Hadcand.sharedClustersHe3);
if (isMC) {
outputMcTable(
he3Hadcand.momHe3MC,
Expand All @@ -941,19 +938,25 @@ struct he3HadronFemto {
he3Hadcand.l4MassMC,
he3Hadcand.flags);
}
if (settingFillMultiplicity) {
outputMultiplicityTable(
collision.globalIndex(),
collision.posZ(),
collision.numContrib(),
collision.centFT0C(),
collision.multFT0C());
}
if (settingFillQa) {
outputQaTable(
he3Hadcand.trackIDHe3,
he3Hadcand.trackIDHad);
}
outputMultiplicityTable(
collision.globalIndex(),
collision.posZ(),
collision.numContrib(),
collision.centFT0C(),
collision.multFT0C());
outputQaTable(
he3Hadcand.trackIDHe3,
he3Hadcand.trackIDHad,
he3Hadcand.massTOFHe3,
he3Hadcand.pidtrkHad,
he3Hadcand.sharedClustersHad);
outputPidTable(
he3Hadcand.nSigmaTPCHadPi,
he3Hadcand.nSigmaTPCHadKa,
he3Hadcand.nSigmaTPCHadPr,
he3Hadcand.nSigmaTOFHadPi,
he3Hadcand.nSigmaTOFHadKa,
he3Hadcand.nSigmaTOFHadPr);
}

void fillHistograms(const He3HadCandidate& he3Hadcand, bool isMc = false)
Expand Down
Loading