Skip to content

Commit b6b28e3

Browse files
NucleiTask - Fix variables
1 parent 8ad53e5 commit b6b28e3

2 files changed

Lines changed: 16 additions & 16 deletions

File tree

PWGLF/DataModel/LFNucleiTables.h

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -61,20 +61,20 @@ namespace full
6161
{
6262
DECLARE_SOA_INDEX_COLUMN(LfNuclEvent, lfNuclEvent);
6363
DECLARE_SOA_COLUMN(Pt, pt, float);
64-
DECLARE_SOA_DYNAMIC_COLUMN(P, p, [](float pt, float eta) -> float { return pt * cosh(eta); });
64+
DECLARE_SOA_DYNAMIC_COLUMN(P, p, [](float pt, float eta) -> float { return pt * std::cosh(eta); });
6565
DECLARE_SOA_COLUMN(Eta, eta, float);
6666
DECLARE_SOA_COLUMN(Sign, sign, int16_t);
6767
DECLARE_SOA_COLUMN(Phi, phi, float);
6868
DECLARE_SOA_COLUMN(IsPVContributor, isPVContributor, bool);
6969
DECLARE_SOA_DYNAMIC_COLUMN(Rapidity, rapidity,
7070
[](float pt, float eta, float mass) -> float {
71-
const auto p = pt * cosh(eta);
72-
const auto pz = pt * sinh(eta);
73-
const auto energy = sqrt(p * p + mass * mass);
74-
return 0.5f * log((energy + pz) / (energy - pz));
71+
const auto p = pt * std::cosh(eta);
72+
const auto pz = pt * std::sinh(eta);
73+
const auto energy = std::sqrt(p * p + mass * mass);
74+
return 0.5f * std::log((energy + pz) / (energy - pz));
7575
});
7676
// ITS
77-
DECLARE_SOA_COLUMN(ITSClusterSizes, itsClusterSizes, uint32_t); //! ITS cluster sizes per layer
77+
DECLARE_SOA_COLUMN(ItsClusterSizes, itsClusterSizes, uint32_t); //! ITS cluster sizes per layer
7878
// TPC
7979
DECLARE_SOA_COLUMN(TPCNSigmaPi, tpcNSigmaPi, float);
8080
DECLARE_SOA_COLUMN(TPCNSigmaKa, tpcNSigmaKa, float);
@@ -103,7 +103,7 @@ DECLARE_SOA_COLUMN(HasTOF, hasTOF, bool);
103103
DECLARE_SOA_COLUMN(HasTRD, hasTRD, bool);
104104
DECLARE_SOA_COLUMN(DcaXY, dcaXY, float);
105105
DECLARE_SOA_COLUMN(DcaZ, dcaZ, float);
106-
DECLARE_SOA_COLUMN(TPCInnerParam, tpcInnerParam, float);
106+
DECLARE_SOA_COLUMN(TpcInnerParam, tpcInnerParam, float);
107107
DECLARE_SOA_COLUMN(TOFExpMom, tofExpMom, float);
108108
DECLARE_SOA_COLUMN(TPCSignal, tpcSignal, float);
109109
DECLARE_SOA_COLUMN(Beta, beta, float);
@@ -178,7 +178,7 @@ DECLARE_SOA_TABLE(LfCandNucleus, "AOD", "LFNUCL",
178178
full::IsEvTimeT0AC,
179179
full::HasTOF,
180180
full::HasTRD,
181-
full::TPCInnerParam,
181+
full::TpcInnerParam,
182182
full::Beta,
183183
full::PIDForTracking,
184184
full::TPCSignal,
@@ -196,7 +196,7 @@ DECLARE_SOA_TABLE(LfCandNucleus, "AOD", "LFNUCL",
196196
full::IsPVContributor,
197197
full::P<full::Pt, full::Eta>,
198198
full::Rapidity<full::Pt, full::Eta>,
199-
full::ITSClusterSizes,
199+
full::ItsClusterSizes,
200200
track::TPCNClsFound<track::TPCNClsFindable, track::TPCNClsFindableMinusFound>,
201201
track::TPCNClsCrossedRows<track::TPCNClsFindable, track::TPCNClsFindableMinusCrossedRows>,
202202
track::TPCCrossedRowsOverFindableCls<track::TPCNClsFindable, track::TPCNClsFindableMinusCrossedRows>,
@@ -211,7 +211,7 @@ DECLARE_SOA_TABLE_VERSIONED(LfCandNucleusDummy, "AOD", "LFNUCL", 1,
211211
full::IsEvTimeT0AC,
212212
full::HasTOF,
213213
full::HasTRD,
214-
full::TPCInnerParam,
214+
full::TpcInnerParam,
215215
full::Beta,
216216
full::PIDForTracking,
217217
full::TPCSignal,
@@ -228,7 +228,7 @@ DECLARE_SOA_TABLE_VERSIONED(LfCandNucleusDummy, "AOD", "LFNUCL", 1,
228228
track::ITSClusterMap,
229229
full::IsPVContributor,
230230
full::P<full::Pt, full::Eta>,
231-
full::ITSClusterSizes,
231+
full::ItsClusterSizes,
232232
dummy::TPCNSigmaPi<full::HasTOF>, dummy::TPCNSigmaKa<full::HasTOF>, dummy::TPCNSigmaPr<full::HasTOF>,
233233
dummy::TPCNSigmaTr<full::HasTOF>, dummy::TPCNSigmaAl<full::HasTOF>,
234234
dummy::TOFNSigmaPi<full::HasTOF>, dummy::TOFNSigmaKa<full::HasTOF>, dummy::TOFNSigmaPr<full::HasTOF>,

PWGLF/TableProducer/Nuspex/LFTreeCreatorNuclei.cxx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ struct LfTreeCreatorNuclei {
9494
Configurable<float> cfgHighCutVertex{"cfgHighCutVertex", 10.0f, "Accepted z-vertex range"};
9595
Configurable<float> cfgLowCutVertex{"cfgLowCutVertex", -10.0f, "Accepted z-vertex range"};
9696
Configurable<bool> useSel8{"useSel8", true, "Use Sel8 for run3 Event Selection"};
97-
Configurable<bool> TVXtrigger{"TVXtrigger", false, "Use TVX for Event Selection (default w/ Sel8)"};
97+
Configurable<bool> tvxTrigger{"tvxTrigger", false, "Use TVX for Event Selection (default w/ Sel8)"};
9898
Configurable<bool> removeTFBorder{"removeTFBorder", false, "Remove TimeFrame border (default w/ Sel8)"};
9999
Configurable<bool> removeITSROFBorder{"removeITSROFBorder", false, "Remove ITS Read-Out Frame border (default w/ Sel8)"};
100100

@@ -149,7 +149,7 @@ struct LfTreeCreatorNuclei {
149149
if ((track.pt() < ptcutLow.value) || (track.pt() > ptcutHigh.value)) {
150150
continue;
151151
}
152-
if ((TMath::Abs(track.tpcNSigmaDe()) > filterDeTPC.value) && (TMath::Abs(track.tpcNSigmaHe()) > filterHeTPC.value)) {
152+
if ((std::abs(track.tpcNSigmaDe()) > filterDeTPC.value) && (std::abs(track.tpcNSigmaHe()) > filterHeTPC.value)) {
153153
continue;
154154
}
155155
out = kTRUE;
@@ -233,7 +233,7 @@ struct LfTreeCreatorNuclei {
233233
if ((track.pt() < ptcutLow.value) || (track.pt() > ptcutHigh.value)) {
234234
continue;
235235
}
236-
if ((TMath::Abs(track.tpcNSigmaDe()) > filterDeTPC.value) && (TMath::Abs(track.tpcNSigmaHe()) > filterHeTPC.value)) {
236+
if ((std::abs(track.tpcNSigmaDe()) > filterDeTPC.value) && (std::abs(track.tpcNSigmaHe()) > filterHeTPC.value)) {
237237
continue;
238238
}
239239
}
@@ -313,7 +313,7 @@ struct LfTreeCreatorNuclei {
313313
hEvents.fill(HIST("eventSelection"), 0);
314314

315315
if (!collision.selection_bit(aod::evsel::kIsTriggerTVX)) {
316-
if (TVXtrigger)
316+
if (tvxTrigger)
317317
continue;
318318
} else {
319319
hEvents.fill(HIST("eventSelection"), 1);
@@ -371,7 +371,7 @@ struct LfTreeCreatorNuclei {
371371
hEvents.fill(HIST("eventSelection"), 0);
372372

373373
if (!collision.selection_bit(aod::evsel::kIsTriggerTVX)) {
374-
if (TVXtrigger)
374+
if (tvxTrigger)
375375
continue;
376376
} else {
377377
hEvents.fill(HIST("eventSelection"), 1);

0 commit comments

Comments
 (0)