Skip to content

Commit 1411a92

Browse files
author
Valerio Di Bella
committed
Stop redefinition of configurable + clean some names
1 parent 3e6517c commit 1411a92

2 files changed

Lines changed: 41 additions & 100 deletions

File tree

‎PWGHF/HFC/TableProducer/correlatorDplusDplusReduced.cxx‎

Lines changed: 18 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -151,26 +151,19 @@ struct HfCorrelatorDplusDplusReduced {
151151
}
152152
}
153153

154-
bool skimming(auto const& candidate,
155-
std::vector<double> const& ptCutSkimming,
156-
std::vector<double> const& massMinimum,
157-
std::vector<double> const& massMaximum,
158-
std::vector<double> const& cosThetaminimum,
159-
std::vector<double> const& decayLengthminimum,
160-
std::vector<double> const& nSigmaTpcmaximum,
161-
std::vector<double> const& nSigmaTofmaximum)
154+
bool skimming(auto const& candidate)
162155
{
163-
if (candidate.pt() < ptCutSkimming[0] || candidate.pt() > ptCutSkimming[ptCutSkimming.size() - 1]) {
156+
if (candidate.pt() < cutPtSkimming.value.at(0) || candidate.pt() > cutPtSkimming.value.at(cutPtSkimming.value.size() - 1)) {
164157
return false;
165158
}
166-
for (size_t i = 0; i < ptCutSkimming.size() - 1; i++) {
167-
if (candidate.pt() <= ptCutSkimming[i + 1]) {
168-
if (hfHelper.invMassDplusToPiKPi(candidate) < massMinimum[i] ||
169-
hfHelper.invMassDplusToPiKPi(candidate) > massMaximum[i] ||
170-
candidate.cpa() < cosThetaminimum[i] ||
171-
candidate.decayLength() < decayLengthminimum[i] ||
172-
abs(candidate.nSigTofKa1()) > nSigmaTofmaximum[i] ||
173-
abs(candidate.nSigTpcKa1()) > nSigmaTpcmaximum[i]) {
159+
for (size_t i = 0; i < cutPtSkimming.value.size() - 1; i++) {
160+
if (candidate.pt() <= cutPtSkimming.value.at(i + 1)) {
161+
if (hfHelper.invMassDplusToPiKPi(candidate) < massMin.value.at(i) ||
162+
hfHelper.invMassDplusToPiKPi(candidate) > massMax.value.at(i) ||
163+
candidate.cpa() < cosThetaMin.value.at(i) ||
164+
candidate.decayLength() < decayLengthMin.value.at(i) ||
165+
std::abs(candidate.nSigTofKa1()) > nSigmaTofMax.value.at(i) ||
166+
std::abs(candidate.nSigTpcKa1()) > nSigmaTpcMax.value.at(i)) {
174167
return false;
175168
}
176169
return true;
@@ -202,14 +195,14 @@ struct HfCorrelatorDplusDplusReduced {
202195
channelMc = candidate.flagMcDecayChanRec();
203196
}
204197

205-
std::vector<float> outML = {-999., -999.};
198+
std::vector<float> mlProb = {-999., -999.};
206199
if constexpr (DoMl) {
207200
for (unsigned int iclass = 0; iclass < classMlIndexes->size(); iclass++) {
208-
outML[iclass] = candidate.mlProbDplusToPiKPi()[classMlIndexes->at(iclass)];
201+
mlProb[iclass] = candidate.mlProbDplusToPiKPi()[classMlIndexes->at(iclass)];
209202
}
210203
rowCandidateMl(
211-
outML[0],
212-
outML[1]);
204+
mlProb[0],
205+
mlProb[1]);
213206
}
214207

215208
float cent{-1.};
@@ -363,13 +356,6 @@ struct HfCorrelatorDplusDplusReduced {
363356
aod::Tracks const&,
364357
aod::BCsWithTimestamps const&)
365358
{
366-
std::vector<double> skimmingCutPt = cutPtSkimming;
367-
std::vector<double> skimmingMassMin = massMin;
368-
std::vector<double> skimmingMassMax = massMax;
369-
std::vector<double> skimmingCosThetaMin = cosThetaMin;
370-
std::vector<double> skimmingDecayLengthMin = decayLengthMin;
371-
std::vector<double> skimmingNSigmaTpcMax = nSigmaTpcMax;
372-
std::vector<double> skimmingNSigmaTofMax = nSigmaTofMax;
373359
static int lastRunNumber = -1;
374360
// reserve memory
375361
rowCandidateFullEvents.reserve(collisions.size());
@@ -406,21 +392,14 @@ struct HfCorrelatorDplusDplusReduced {
406392
auto candidateSign = -prongCandidate.sign();
407393

408394
if (applySkimming &&
409-
!skimming(candidate,
410-
skimmingCutPt,
411-
skimmingMassMin,
412-
skimmingMassMax,
413-
skimmingCosThetaMin,
414-
skimmingDecayLengthMin,
415-
skimmingNSigmaTpcMax,
416-
skimmingNSigmaTofMax)) {
395+
!skimming(candidate)) {
417396
continue;
418397
}
419398

420399
if (applyMl) {
421400
std::vector<float> inputFeatures = hfMlResponse.getInputFeatures(candidate);
422401
bool const isSelectedMl = hfMlResponse.isSelectedMl(inputFeatures,
423-
abs(candidate.pt()),
402+
std::abs(candidate.pt()),
424403
outputML);
425404
if (!isSelectedMl) {
426405
continue;
@@ -436,13 +415,6 @@ struct HfCorrelatorDplusDplusReduced {
436415
SelectedCandidatesMc const& candidates,
437416
aod::Tracks const&)
438417
{
439-
std::vector<double> skimmingCutPt = cutPtSkimming;
440-
std::vector<double> skimmingMassMin = massMin;
441-
std::vector<double> skimmingMassMax = massMax;
442-
std::vector<double> skimmingCosThetaMin = cosThetaMin;
443-
std::vector<double> skimmingDecayLengthMin = decayLengthMin;
444-
std::vector<double> skimmingNSigmaTpcMax = nSigmaTpcMax;
445-
std::vector<double> skimmingNSigmaTofMax = nSigmaTofMax;
446418
// reserve memory
447419
rowCandidateFullEvents.reserve(collisions.size());
448420
if (fillCandidateTinyTable) {
@@ -465,20 +437,13 @@ struct HfCorrelatorDplusDplusReduced {
465437
auto candidateSign = -prongCandidate.sign();
466438

467439
if (applySkimming &&
468-
!skimming(candidate,
469-
skimmingCutPt,
470-
skimmingMassMin,
471-
skimmingMassMax,
472-
skimmingCosThetaMin,
473-
skimmingDecayLengthMin,
474-
skimmingNSigmaTpcMax,
475-
skimmingNSigmaTofMax)) {
440+
!skimming(candidate)) {
476441
continue;
477442
}
478443
if (applyMl) {
479444
std::vector<float> inputFeatures = hfMlResponse.getInputFeatures(candidate);
480445
bool const isSelectedMl = hfMlResponse.isSelectedMl(inputFeatures,
481-
abs(candidate.pt()),
446+
std::abs(candidate.pt()),
482447
outputML);
483448
if (!isSelectedMl) {
484449
continue;

‎PWGHF/HFC/Tasks/taskCorrelationDplusDplusReduced.cxx‎

Lines changed: 23 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -95,28 +95,19 @@ struct HfTaskCorrelationDplusDplusReduced {
9595
sign2 = -1;
9696
}
9797
if (flattening == 0) {
98-
if (sign1 == sign2) {
99-
if (sign1 == 1) {
100-
registry.fill(HIST("hMassDplusPair"), mass2, mass1);
101-
} else {
102-
registry.fill(HIST("hMassDminusPair"), mass2, mass1);
103-
}
104-
} else {
105-
registry.fill(HIST("hMassDplusminusPair"), mass2, mass1);
106-
}
98+
std::swap(mass1, mass2);
10799
flattening = 1;
100+
} else if (flattening == 1) {
101+
flattening = 0;
108102
}
109-
if (flattening == 1) {
110-
if (sign1 == sign2) {
111-
if (sign1 == 1) {
112-
registry.fill(HIST("hMassDplusPair"), mass1, mass2);
113-
} else {
114-
registry.fill(HIST("hMassDminusPair"), mass1, mass2);
115-
}
103+
if (sign1 == sign2) {
104+
if (sign1 == 1) {
105+
registry.fill(HIST("hMassDplusPair"), mass2, mass1);
116106
} else {
117-
registry.fill(HIST("hMassDplusminusPair"), mass1, mass2);
107+
registry.fill(HIST("hMassDminusPair"), mass2, mass1);
118108
}
119-
flattening = 0;
109+
} else {
110+
registry.fill(HIST("hMassDplusminusPair"), mass2, mass1);
120111
}
121112
}
122113
}
@@ -149,40 +140,25 @@ struct HfTaskCorrelationDplusDplusReduced {
149140
sign2 = -1;
150141
}
151142
if (flattening == 0) {
152-
if (sign1 == sign2) {
153-
if (sign1 == 1) {
154-
registry.fill(HIST("hMassDplusPair"), mass1, mass2);
155-
if (std::abs(cand2.flagMcMatchRec()) == hf_decay::hf_cand_3prong::DecayChannelMain::DplusToPiKPi && std::abs(cand1.flagMcMatchRec()) == hf_decay::hf_cand_3prong::DecayChannelMain::DplusToPiKPi)
156-
registry.fill(HIST("hMassDplusPairsMatched"), mass1, mass2);
157-
} else {
158-
registry.fill(HIST("hMassDminusPair"), mass1, mass2);
159-
if (std::abs(cand2.flagMcMatchRec()) == hf_decay::hf_cand_3prong::DecayChannelMain::DplusToPiKPi && std::abs(cand1.flagMcMatchRec()) == hf_decay::hf_cand_3prong::DecayChannelMain::DplusToPiKPi)
160-
registry.fill(HIST("hMassDminusPairsMatched"), mass1, mass2);
161-
}
162-
} else {
163-
registry.fill(HIST("hMassDplusminusPair"), mass1, mass2);
164-
if (std::abs(cand2.flagMcMatchRec()) == hf_decay::hf_cand_3prong::DecayChannelMain::DplusToPiKPi && std::abs(cand1.flagMcMatchRec()) == hf_decay::hf_cand_3prong::DecayChannelMain::DplusToPiKPi)
165-
registry.fill(HIST("hMassDplusminusPairsMatched"), mass1, mass2);
166-
}
143+
std::swap(mass1, mass2);
167144
flattening = 1;
145+
} else if (flattening == 1) {
146+
flattening = 0;
168147
}
169-
if (flattening == 1) {
170-
if (sign1 == sign2) {
171-
if (sign1 == 1) {
172-
registry.fill(HIST("hMassDplusPair"), mass2, mass1);
173-
if (std::abs(cand2.flagMcMatchRec()) == hf_decay::hf_cand_3prong::DecayChannelMain::DplusToPiKPi && std::abs(cand1.flagMcMatchRec()) == hf_decay::hf_cand_3prong::DecayChannelMain::DplusToPiKPi)
174-
registry.fill(HIST("hMassDplusPairsMatched"), mass2, mass1);
175-
} else {
176-
registry.fill(HIST("hMassDminusPair"), mass2, mass1);
177-
if (std::abs(cand2.flagMcMatchRec()) == hf_decay::hf_cand_3prong::DecayChannelMain::DplusToPiKPi && std::abs(cand1.flagMcMatchRec()) == hf_decay::hf_cand_3prong::DecayChannelMain::DplusToPiKPi)
178-
registry.fill(HIST("hMassDminusPairsMatched"), mass2, mass1);
179-
}
148+
if (sign1 == sign2) {
149+
if (sign1 == 1) {
150+
registry.fill(HIST("hMassDplusPair"), mass1, mass2);
151+
if (std::abs(cand2.flagMcMatchRec()) == hf_decay::hf_cand_3prong::DecayChannelMain::DplusToPiKPi && std::abs(cand1.flagMcMatchRec()) == hf_decay::hf_cand_3prong::DecayChannelMain::DplusToPiKPi)
152+
registry.fill(HIST("hMassDplusPairsMatched"), mass1, mass2);
180153
} else {
181-
registry.fill(HIST("hMassDplusminusPair"), mass2, mass1);
154+
registry.fill(HIST("hMassDminusPair"), mass1, mass2);
182155
if (std::abs(cand2.flagMcMatchRec()) == hf_decay::hf_cand_3prong::DecayChannelMain::DplusToPiKPi && std::abs(cand1.flagMcMatchRec()) == hf_decay::hf_cand_3prong::DecayChannelMain::DplusToPiKPi)
183-
registry.fill(HIST("hMassDplusminusPairsMatched"), mass2, mass1);
156+
registry.fill(HIST("hMassDminusPairsMatched"), mass1, mass2);
184157
}
185-
flattening = 0;
158+
} else {
159+
registry.fill(HIST("hMassDplusminusPair"), mass1, mass2);
160+
if (std::abs(cand2.flagMcMatchRec()) == hf_decay::hf_cand_3prong::DecayChannelMain::DplusToPiKPi && std::abs(cand1.flagMcMatchRec()) == hf_decay::hf_cand_3prong::DecayChannelMain::DplusToPiKPi)
161+
registry.fill(HIST("hMassDplusminusPairsMatched"), mass1, mass2);
186162
}
187163
}
188164
}

0 commit comments

Comments
 (0)