Skip to content

Commit 3fdc82e

Browse files
author
Henrik Fribert
committed
Fix: Linter and Clang-formatting
1 parent 2018ef3 commit 3fdc82e

File tree

3 files changed

+289
-227
lines changed

3 files changed

+289
-227
lines changed

ALICE3/DataModel/OTFPIDTrk.h

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@ namespace upgrade::trk
3131
DECLARE_SOA_COLUMN(TimeOverThresholdBarrel, timeOverThresholdBarrel, float); //! Time over threshold for the Barrel layers
3232
DECLARE_SOA_COLUMN(TimeOverThresholdForward, timeOverThresholdForward, float); //! Time over threshold for the Forward layers
3333

34-
DECLARE_SOA_COLUMN(NSigmaTrkEl, nSigmaEl, float); //! NSigma electron from the tracker layers
35-
DECLARE_SOA_COLUMN(NSigmaTrkMu, nSigmaMu, float); //! NSigma muon from the tracker layers
36-
DECLARE_SOA_COLUMN(NSigmaTrkPi, nSigmaPi, float); //! NSigma pion from the tracker layers
37-
DECLARE_SOA_COLUMN(NSigmaTrkKa, nSigmaKa, float); //! NSigma kaon from the tracker layers
38-
DECLARE_SOA_COLUMN(NSigmaTrkPr, nSigmaPr, float); //! NSigma proton from the tracker layers
39-
DECLARE_SOA_COLUMN(NSigmaTrkDe, nSigmaDe, float); //! NSigma deuteron from the tracker layers
40-
DECLARE_SOA_COLUMN(NSigmaTrkTr, nSigmaTr, float); //! NSigma triton from the tracker layers
41-
DECLARE_SOA_COLUMN(NSigmaTrkHe, nSigmaHe, float); //! NSigma helium-3 from the tracker layers
42-
DECLARE_SOA_COLUMN(NSigmaTrkAl, nSigmaAl, float); //! NSigma alpha from the tracker layers
34+
DECLARE_SOA_COLUMN(NSigmaTrkEl, nSigmaTrkEl, float); //! NSigma electron from the tracker layers
35+
DECLARE_SOA_COLUMN(NSigmaTrkMu, nSigmaTrkMu, float); //! NSigma muon from the tracker layers
36+
DECLARE_SOA_COLUMN(NSigmaTrkPi, nSigmaTrkPi, float); //! NSigma pion from the tracker layers
37+
DECLARE_SOA_COLUMN(NSigmaTrkKa, nSigmaTrkKa, float); //! NSigma kaon from the tracker layers
38+
DECLARE_SOA_COLUMN(NSigmaTrkPr, nSigmaTrkPr, float); //! NSigma proton from the tracker layers
39+
DECLARE_SOA_COLUMN(NSigmaTrkDe, nSigmaTrkDe, float); //! NSigma deuteron from the tracker layers
40+
DECLARE_SOA_COLUMN(NSigmaTrkTr, nSigmaTrkTr, float); //! NSigma triton from the tracker layers
41+
DECLARE_SOA_COLUMN(NSigmaTrkHe, nSigmaTrkHe, float); //! NSigma helium-3 from the tracker layers
42+
DECLARE_SOA_COLUMN(NSigmaTrkAl, nSigmaTrkAl, float); //! NSigma alpha from the tracker layers
4343

4444
DECLARE_SOA_DYNAMIC_COLUMN(NSigmaTrk, nSigmaTrk, //! General function to get the nSigma for the tracker layers
4545
[](const float el,
@@ -102,8 +102,7 @@ DECLARE_SOA_TABLE(UpgradeTrkPids, "AOD", "UPGRADETRKPID",
102102
upgrade::trk::NSigmaTrkDe,
103103
upgrade::trk::NSigmaTrkTr,
104104
upgrade::trk::NSigmaTrkHe,
105-
upgrade::trk::NSigmaTrkAl
106-
>);
105+
upgrade::trk::NSigmaTrkAl>);
107106

108107
using UpgradeTrkPidSignal = UpgradeTrkPidSignals::iterator;
109108
using UpgradeTrkPid = UpgradeTrkPids::iterator;

ALICE3/TableProducer/OTF/onTheFlyTracker.cxx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ struct OnTheFlyTracker {
113113
Configurable<std::string> lutDe{"lutDe", "lutCovm.de.dat", "LUT for deuterons"};
114114
Configurable<std::string> lutTr{"lutTr", "lutCovm.tr.dat", "LUT for tritons"};
115115
Configurable<std::string> lutHe3{"lutHe3", "lutCovm.he3.dat", "LUT for Helium-3"};
116+
Configurable<std::string> lutAl{"lutAl", "lutCovm.he3.dat", "LUT for Alphas"}; // To be created, for now propagating as He-3
116117

117118
struct : ConfigurableGroup {
118119
ConfigurableAxis axisMomentum{"axisMomentum", {VARIABLE_WIDTH, 0.0f, 0.1f, 0.2f, 0.3f, 0.4f, 0.5f, 0.6f, 0.7f, 0.8f, 0.9f, 1.0f, 1.1f, 1.2f, 1.3f, 1.4f, 1.5f, 1.6f, 1.7f, 1.8f, 1.9f, 2.0f, 2.2f, 2.4f, 2.6f, 2.8f, 3.0f, 3.2f, 3.4f, 3.6f, 3.8f, 4.0f, 4.4f, 4.8f, 5.2f, 5.6f, 6.0f, 6.5f, 7.0f, 7.5f, 8.0f, 9.0f, 10.0f, 11.0f, 12.0f, 13.0f, 14.0f, 15.0f, 17.0f, 19.0f, 21.0f, 23.0f, 25.0f, 30.0f, 35.0f, 40.0f, 50.0f}, "#it{p} (GeV/#it{c})"};
@@ -265,6 +266,7 @@ struct OnTheFlyTracker {
265266
loadLUT(1000010020, lutDe.value);
266267
loadLUT(1000010030, lutTr.value);
267268
loadLUT(1000020030, lutHe3.value);
269+
loadLUT(1000020040, lutHe3.value);
268270

269271
// interpolate efficiencies if requested to do so
270272
mSmearer.interpolateEfficiency(static_cast<bool>(interpolateLutEfficiencyVsNch));
@@ -516,7 +518,7 @@ struct OnTheFlyTracker {
516518
continue;
517519
}
518520
const auto pdg = std::abs(mcParticle.pdgCode());
519-
if (pdg != kElectron && pdg != kMuonMinus && pdg != kPiPlus && pdg != kKPlus && pdg != kProton) {
521+
if (pdg != kElectron && pdg != kMuonMinus && pdg != kPiPlus && pdg != kKPlus && pdg != kProton && pdg != 1000010020 && pdg != 1000010030 && pdg != 1000020030 && pdg != 1000020040) {
520522
if (!cascadeDecaySettings.decayXi) {
521523
continue;
522524
} else if (pdg != 3312) {
@@ -563,7 +565,7 @@ struct OnTheFlyTracker {
563565
continue;
564566
}
565567
}
566-
if (pdg != kElectron && pdg != kMuonMinus && pdg != kPiPlus && pdg != kKPlus && pdg != kProton) {
568+
if (pdg != kElectron && pdg != kMuonMinus && pdg != kPiPlus && pdg != kKPlus && pdg != kProton && pdg != 1000010020 && pdg != 1000010030 && pdg != 1000020030 && pdg != 1000020040) {
567569
if (!cascadeDecaySettings.decayXi) {
568570
continue;
569571
} else if (pdg != 3312) {

0 commit comments

Comments
 (0)