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
4 changes: 2 additions & 2 deletions PWGLF/DataModel/LFSigmaTables.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#ifndef PWGLF_DATAMODEL_LFSIGMATABLES_H_
#define PWGLF_DATAMODEL_LFSIGMATABLES_H_

using std::array;

Check failure on line 32 in PWGLF/DataModel/LFSigmaTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[import-std-name]

Do not import names from the std namespace in headers.

// Creating output TTree for sigma analysis
namespace o2::aod
Expand Down Expand Up @@ -73,7 +73,7 @@

DECLARE_SOA_DYNAMIC_COLUMN(Pt, pt,
[](float photonPx, float photonPy, float lambdaPx, float lambdaPy) -> float {
return RecoDecay::pt(array{photonPx + lambdaPx, photonPy + lambdaPy});

Check failure on line 76 in PWGLF/DataModel/LFSigmaTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix]

Use std:: prefix for names from the std namespace.
});

DECLARE_SOA_DYNAMIC_COLUMN(P, p, //! Total momentum in GeV/c
Expand Down Expand Up @@ -335,10 +335,10 @@
DECLARE_SOA_COLUMN(LambdaIsCorrectlyAssoc, lambdaIsCorrectlyAssoc, bool);

DECLARE_SOA_DYNAMIC_COLUMN(IsSigma0, isSigma0, //! IsSigma0
[](int pdgCode) -> bool { return pdgCode == 3212; });

Check failure on line 338 in PWGLF/DataModel/LFSigmaTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number]

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.

Check failure on line 338 in PWGLF/DataModel/LFSigmaTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[pdg/explicit-code]

Avoid hard-coded PDG codes. Use named values from PDG_t or o2::constants::physics::Pdg instead.

DECLARE_SOA_DYNAMIC_COLUMN(IsAntiSigma0, isAntiSigma0, //! IsASigma0
[](int pdgCode) -> bool { return pdgCode == -3212; });

Check failure on line 341 in PWGLF/DataModel/LFSigmaTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[pdg/explicit-code]

Avoid hard-coded PDG codes. Use named values from PDG_t or o2::constants::physics::Pdg instead.

DECLARE_SOA_DYNAMIC_COLUMN(MCPx, mcpx, //! Sigma0 px
[](float photonMCPx, float lambdaMCPx) -> float { return photonMCPx + lambdaMCPx; });
Expand All @@ -349,7 +349,7 @@

DECLARE_SOA_DYNAMIC_COLUMN(MCPt, mcpt,
[](float photonMCPx, float photonMCPy, float lambdaMCPx, float lambdaMCPy) -> float {
return RecoDecay::pt(array{photonMCPx + lambdaMCPx, photonMCPy + lambdaMCPy});

Check failure on line 352 in PWGLF/DataModel/LFSigmaTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix]

Use std:: prefix for names from the std namespace.
});

DECLARE_SOA_DYNAMIC_COLUMN(MCP, mcp, //! Total momentum in GeV/c
Expand Down Expand Up @@ -482,7 +482,7 @@
DECLARE_SOA_COLUMN(IsSigma0, isSigma0, bool); // true: sigma0, false: antisigma0
DECLARE_SOA_COLUMN(ProducedByGenerator, producedByGenerator, bool);
DECLARE_SOA_COLUMN(MCPt, mcpt, float); // MC pT
DECLARE_SOA_COLUMN(MCY, mcy, float); // MC Y
DECLARE_SOA_COLUMN(MCY, mcy, float); // MC Y

} // namespace sigma0Gen

Expand Down Expand Up @@ -566,7 +566,7 @@

DECLARE_SOA_DYNAMIC_COLUMN(Pt, pt,
[](float photon1Px, float photon1Py, float photon2Px, float photon2Py) -> float {
return RecoDecay::pt(array{photon1Px + photon2Px, photon1Py + photon2Py});

Check failure on line 569 in PWGLF/DataModel/LFSigmaTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix]

Use std:: prefix for names from the std namespace.
});

DECLARE_SOA_DYNAMIC_COLUMN(P, p, //! Total momentum in GeV/c
Expand Down Expand Up @@ -720,10 +720,10 @@
DECLARE_SOA_COLUMN(Photon2IsCorrectlyAssoc, photon2IsCorrectlyAssoc, bool);

DECLARE_SOA_DYNAMIC_COLUMN(IsPi0, isPi0, //! IsPi0
[](int pdgCode) -> bool { return pdgCode == 111; });

Check failure on line 723 in PWGLF/DataModel/LFSigmaTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[pdg/explicit-code]

Avoid hard-coded PDG codes. Use named values from PDG_t or o2::constants::physics::Pdg instead.

DECLARE_SOA_DYNAMIC_COLUMN(IsFromXi0, isFromXi0, //! Pi0 from Xi0
[](int pdgCodeMother) -> bool { return pdgCodeMother == 3322; });

Check failure on line 726 in PWGLF/DataModel/LFSigmaTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[pdg/explicit-code]

Avoid hard-coded PDG codes. Use named values from PDG_t or o2::constants::physics::Pdg instead.

DECLARE_SOA_DYNAMIC_COLUMN(MCPx, mcpx, //! Pi0 MC px
[](float photon1MCPx, float photon2MCPx) -> float { return photon1MCPx + photon2MCPx; });
Expand All @@ -734,7 +734,7 @@

DECLARE_SOA_DYNAMIC_COLUMN(MCPt, mcpt,
[](float photon1MCPx, float photon1MCPy, float photon2MCPx, float photon2MCPy) -> float {
return RecoDecay::pt(array{photon1MCPx + photon2MCPx, photon1MCPy + photon2MCPy});

Check failure on line 737 in PWGLF/DataModel/LFSigmaTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix]

Use std:: prefix for names from the std namespace.
});

DECLARE_SOA_DYNAMIC_COLUMN(MCP, mcp, //! Total momentum in GeV/c
Expand Down Expand Up @@ -862,7 +862,7 @@
{
DECLARE_SOA_COLUMN(ProducedByGenerator, producedByGenerator, bool);
DECLARE_SOA_COLUMN(MCPt, mcpt, float); // MC pT
DECLARE_SOA_COLUMN(MCY, mcy, float); // MC Y
DECLARE_SOA_COLUMN(MCY, mcy, float); // MC Y
} // namespace pi0Gen

DECLARE_SOA_TABLE(Pi0Gens, "AOD", "PI0GENS",
Expand Down
4 changes: 1 addition & 3 deletions PWGLF/Tasks/Strangeness/sigmaanalysis.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,6 @@ struct sigmaanalysis {
Configurable<float> mc_rapidityMin{"mc_rapidityMin", -0.5, "Min generated particle rapidity"};
Configurable<float> mc_rapidityMax{"mc_rapidityMax", 0.5, "Max generated particle rapidity"};
} genSelections;


// QA
Configurable<bool> fdoSigma0QA{"doSigma0QA", false, "if true, perform Sigma0 QA analysis. Only works with MC."};
Expand Down Expand Up @@ -550,8 +549,7 @@ struct sigmaanalysis {
histos.add("Gen/h2dGenAntiSigma0VsMultMC_RecoedEvt", "h2dGenAntiSigma0VsMultMC_RecoedEvt", kTH2D, {axisNch, axisPt});
histos.add("Gen/h2dGenSigma0VsMultMC", "h2dGenSigma0VsMultMC", kTH2D, {axisNch, axisPt});
histos.add("Gen/h2dGenAntiSigma0VsMultMC", "h2dGenAntiSigma0VsMultMC", kTH2D, {axisNch, axisPt});

}
}
if (doprocessPi0GeneratedRun3) { // Pi0 specific
histos.add("Gen/h2dGenPi0VsMultMC_RecoedEvt", "h2dGenPi0VsMultMC_RecoedEvt", kTH2D, {axisNch, axisPt});
histos.add("Gen/h2dGenPi0", "h2dGenPi0", kTH2D, {axisCentrality, axisPt});
Expand Down
Loading