Skip to content

Commit 6e1724a

Browse files
author
Valerio Di Bella
committed
Resolving o2-linter warning, follow naming convention and add only one process as initially true in task
1 parent 2e6dd47 commit 6e1724a

2 files changed

Lines changed: 56 additions & 47 deletions

File tree

‎PWGHF/HFC/TableProducer/correlatorDplusDplusReduced.cxx‎

Lines changed: 48 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -90,12 +90,12 @@ struct HfCorrelatorDplusDplusReduced {
9090
Configurable<std::vector<std::string>> namesInputFeatures{"namesInputFeatures", std::vector<std::string>{"feature1", "feature2"}, "Names of ML model input features"};
9191

9292
Configurable<std::vector<double>> cutPtSkimming{"cutPtSkimming", {1, 5, 1000}, "pT bin limits for Skimming application"};
93-
Configurable<std::vector<double>> minM{"minM", {0.7, 0.7}, "Mass minimal for the cut for each pt bin"};
94-
Configurable<std::vector<double>> maxM{"maxM", {2.0, 2.1}, "Mass maximal for the cut for each pt bin"};
95-
Configurable<std::vector<double>> minCosTheta{"minCosTheta", {0.96, 0.98}, "CosTheta minimal for the cut for each pt bin"};
96-
Configurable<std::vector<double>> minDecayLength{"minDecayLength", {0.02, 0.03}, "DecayLength minimal for the cut for each pt bin"};
97-
Configurable<std::vector<double>> maxNsigmaTPC{"maxNsigmaTPC", {3, 3}, "NsigmaTPC maximal for the cut for each pt bin"};
98-
Configurable<std::vector<double>> maxNsigmaTOF{"maxNsigmaTOF", {3, 3}, "NsigmaTOF maximal for the cut for each pt bin"};
93+
Configurable<std::vector<double>> Mmin{"Mmin", {0.7, 0.7}, "Mass minimal for the cut for each pt bin"};
94+
Configurable<std::vector<double>> Mmax{"Mmax", {2.0, 2.1}, "Mass maximal for the cut for each pt bin"};
95+
Configurable<std::vector<double>> CosThetamin{"CosThetamin", {0.96, 0.98}, "CosTheta minimal for the cut for each pt bin"};
96+
Configurable<std::vector<double>> DecayLengthmin{"DecayLengthmin", {0.02, 0.03}, "DecayLength minimal for the cut for each pt bin"};
97+
Configurable<std::vector<double>> NsigmaTPCmax{"NsigmaTPCmax", {3, 3}, "NsigmaTPC maximal for the cut for each pt bin"};
98+
Configurable<std::vector<double>> NsigmaTOFmax{"NsigmaTOFmax", {3, 3}, "NsigmaTOF maximal for the cut for each pt bin"};
9999

100100
Configurable<std::vector<double>> binsPtSkimming{"binsPtSkimming", {0}, "pT bin limits for Skimming application"};
101101

@@ -153,24 +153,24 @@ struct HfCorrelatorDplusDplusReduced {
153153

154154
bool skimming(auto const& candidate,
155155
std::vector<double> const& PtcutSkimming,
156-
std::vector<double> const& Mmin,
157-
std::vector<double> const& Mmax,
158-
std::vector<double> const& CosThetamin,
159-
std::vector<double> const& DecayLengthmin,
160-
std::vector<double> const& NsigmaTPCmax,
161-
std::vector<double> const& NsigmaTOFmax)
156+
std::vector<double> const& Mminimum,
157+
std::vector<double> const& Mmaximum,
158+
std::vector<double> const& CosThetaminimum,
159+
std::vector<double> const& DecayLengthminimum,
160+
std::vector<double> const& NsigmaTPCmaximum,
161+
std::vector<double> const& NsigmaTOFmaximum)
162162
{
163163
if (candidate.pt() < PtcutSkimming[0] || candidate.pt() > PtcutSkimming[PtcutSkimming.size() - 1]) {
164164
return false;
165165
}
166166
for (size_t i = 1; i < PtcutSkimming.size(); i++) {
167167
if (candidate.pt() <= PtcutSkimming[i]) {
168-
if (hfHelper.invMassDplusToPiKPi(candidate) < Mmin[i - 1] ||
169-
hfHelper.invMassDplusToPiKPi(candidate) > Mmax[i - 1] ||
170-
candidate.cpa() < CosThetamin[i - 1] ||
171-
candidate.decayLength() < DecayLengthmin[i - 1] ||
172-
abs(candidate.nSigTofKa1()) > NsigmaTOFmax[i - 1] ||
173-
abs(candidate.nSigTpcKa1()) > NsigmaTPCmax[i - 1]) {
168+
if (hfHelper.invMassDplusToPiKPi(candidate) < Mmininimum[i - 1] ||
169+
hfHelper.invMassDplusToPiKPi(candidate) > Mmaximum[i - 1] ||
170+
candidate.cpa() < CosThetamininimum[i - 1] ||
171+
candidate.decayLength() < DecayLengthminimum[i - 1] ||
172+
abs(candidate.nSigTofKa1()) > NsigmaTOFmaximum[i - 1] ||
173+
abs(candidate.nSigTpcKa1()) > NsigmaTPCmaximum[i - 1]) {
174174
return false;
175175
}
176176
return true;
@@ -364,12 +364,12 @@ struct HfCorrelatorDplusDplusReduced {
364364
aod::BCsWithTimestamps const&)
365365
{
366366
std::vector<double> skimmingCutPt = cutPtSkimming;
367-
std::vector<double> skimmingminM = minM;
368-
std::vector<double> skimmingmaxM = maxM;
369-
std::vector<double> skimmingminCosTheta = minCosTheta;
370-
std::vector<double> skimmingminDecayLength = minDecayLength;
371-
std::vector<double> skimmingmaxNsigmaTPC = maxNsigmaTPC;
372-
std::vector<double> skimmingmaxNsigmaTOF = maxNsigmaTOF;
367+
std::vector<double> skimmingMmin = Mmin;
368+
std::vector<double> skimmingMmax = Mmax;
369+
std::vector<double> skimmingCosThetamin = CosThetamin;
370+
std::vector<double> skimmingDecayLengthmin = DecayLengthmin;
371+
std::vector<double> skimmingNsigmaTPCmax = NsigmaTPCmax;
372+
std::vector<double> skimmingNsigmaTOFmax = NsigmaTOFmax;
373373
static int lastRunNumber = -1;
374374
// reserve memory
375375
rowCandidateFullEvents.reserve(collisions.size());
@@ -408,18 +408,20 @@ struct HfCorrelatorDplusDplusReduced {
408408
if (applySkimming &&
409409
!skimming(candidate,
410410
skimmingCutPt,
411-
skimmingminM,
412-
skimmingmaxM,
413-
skimmingminCosTheta,
414-
skimmingminDecayLength,
415-
skimmingmaxNsigmaTPC,
416-
skimmingmaxNsigmaTOF)) {
411+
skimmingMmin,
412+
skimmingMmax,
413+
skimmingCosThetamin,
414+
skimmingDecayLengthmin,
415+
skimmingNsigmaTPCmax,
416+
skimmingNsigmaTOFmax)) {
417417
continue;
418418
}
419419

420420
if (applyMl) {
421421
std::vector<float> inputFeatures = hfMlResponse.getInputFeatures(candidate);
422-
bool const isSelectedMl = hfMlResponse.isSelectedMl(inputFeatures, abs(candidate.pt()), outputML);
422+
bool const isSelectedMl = hfMlResponse.isSelectedMl(inputFeatures,
423+
abs(candidate.pt()),
424+
outputML);
423425
if (!isSelectedMl) {
424426
continue;
425427
}
@@ -435,12 +437,12 @@ struct HfCorrelatorDplusDplusReduced {
435437
aod::Tracks const&)
436438
{
437439
std::vector<double> skimmingCutPt = cutPtSkimming;
438-
std::vector<double> skimmingminM = minM;
439-
std::vector<double> skimmingmaxM = maxM;
440-
std::vector<double> skimmingminCosTheta = minCosTheta;
441-
std::vector<double> skimmingminDecayLength = minDecayLength;
442-
std::vector<double> skimmingmaxNsigmaTPC = maxNsigmaTPC;
443-
std::vector<double> skimmingmaxNsigmaTOF = maxNsigmaTOF;
440+
std::vector<double> skimmingMmin = Mmin;
441+
std::vector<double> skimmingMmax = Mmax;
442+
std::vector<double> skimmingCosThetamin = CosThetamin;
443+
std::vector<double> skimmingDecayLengthmin = DecayLengthmin;
444+
std::vector<double> skimmingNsigmaTPCmax = NsigmaTPCmax;
445+
std::vector<double> skimmingNsigmaTOFmax = NsigmaTOFmax;
444446
// reserve memory
445447
rowCandidateFullEvents.reserve(collisions.size());
446448
if (fillCandidateTinyTable) {
@@ -465,17 +467,19 @@ struct HfCorrelatorDplusDplusReduced {
465467
if (applySkimming &&
466468
!skimming(candidate,
467469
skimmingCutPt,
468-
skimmingminM,
469-
skimmingmaxM,
470-
skimmingminCosTheta,
471-
skimmingminDecayLength,
472-
skimmingmaxNsigmaTPC,
473-
skimmingmaxNsigmaTOF)) {
470+
skimmingMmin,
471+
skimmingMmax,
472+
skimmingCosThetamin,
473+
skimmingDecayLengthmin,
474+
skimmingNsigmaTPCmax,
475+
skimmingNsigmaTOFmax)) {
474476
continue;
475477
}
476478
if (applyMl) {
477479
std::vector<float> inputFeatures = hfMlResponse.getInputFeatures(candidate);
478-
bool const isSelectedMl = hfMlResponse.isSelectedMl(inputFeatures, abs(candidate.pt()), outputML);
480+
bool const isSelectedMl = hfMlResponse.isSelectedMl(inputFeatures,
481+
abs(candidate.pt()),
482+
outputML);
479483
if (!isSelectedMl) {
480484
continue;
481485
}

‎PWGHF/HFC/Tasks/taskCorrelationDplusDplusReduced.cxx‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@ struct HfTaskCorrelationDplusDplusReduced {
7575
template <typename T>
7676
void processData(const T& localCandidates)
7777
{
78+
79+
std::cout << "Hi mate I m trying ok ?3" << std::endl;
7880
registry.fill(HIST("hNCand"), localCandidates.size());
7981

8082
for (const auto& cand1 : localCandidates) {
@@ -125,6 +127,8 @@ struct HfTaskCorrelationDplusDplusReduced {
125127
template <typename T>
126128
void processLocalDataMcRec(const T& localCandidates)
127129
{
130+
131+
std::cout << "Hi mate I m trying ok ?2" << std::endl;
128132
registry.fill(HIST("hNMcRec"), localCandidates.size());
129133

130134
for (const auto& cand1 : localCandidates) {
@@ -193,14 +197,14 @@ struct HfTaskCorrelationDplusDplusReduced {
193197
{
194198
processData(localCandidates);
195199
}
196-
PROCESS_SWITCH(HfTaskCorrelationDplusDplusReduced, processLocalDataTiny, "Process local data for Tiny", true);
200+
PROCESS_SWITCH(HfTaskCorrelationDplusDplusReduced, processLocalDataTiny, "Process local data for Tiny", false);
197201

198202
void processLocalDataLite(o2::aod::HfCandDpFullEvs::iterator const&,
199203
SelectedCandidatesLite const& localCandidates)
200204
{
201205
processData(localCandidates);
202206
}
203-
PROCESS_SWITCH(HfTaskCorrelationDplusDplusReduced, processLocalDataLite, "Process local data for Lite", true);
207+
PROCESS_SWITCH(HfTaskCorrelationDplusDplusReduced, processLocalDataLite, "Process local data for Lite", false);
204208

205209
void processLocalDataFull(o2::aod::HfCandDpFullEvs::iterator const&,
206210
SelectedCandidatesFull const& localCandidates)
@@ -226,9 +230,10 @@ struct HfTaskCorrelationDplusDplusReduced {
226230
void processLocalDataMcRecFull(o2::aod::HfCandDpFullEvs::iterator const&,
227231
SelectedCandidatesFull const& localCandidates)
228232
{
233+
std::cout << "Hi mate I m trying ok ?" << std::endl;
229234
processLocalDataMcRec(localCandidates);
230235
}
231-
PROCESS_SWITCH(HfTaskCorrelationDplusDplusReduced, processLocalDataMcRecFull, "Process local MC data for Full", false);
236+
PROCESS_SWITCH(HfTaskCorrelationDplusDplusReduced, processLocalDataMcRecFull, "Process local MC data for Full", true);
232237

233238
void processLocalDataMcGen(o2::aod::HfCandDpMcEvs::iterator const&,
234239
SelectedMcParticles const& localMcParticles)

0 commit comments

Comments
 (0)