Skip to content

Commit 95e1a78

Browse files
scannitoscannito
committed
Fix for compilers
1 parent 6cf8e4a commit 95e1a78

File tree

1 file changed

+32
-35
lines changed

1 file changed

+32
-35
lines changed

‎PWGLF/Tasks/Strangeness/phiStrangeCorrelation.cxx‎

Lines changed: 32 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,6 @@ enum AnalysisMode {
8383
kDeltaYvsDeltaPhi
8484
};
8585

86-
static constexpr std::array<std::string_view, 2> phiMassRegionLabels{"Signal", "Sideband"};
87-
8886
enum ParticleOfInterest {
8987
Phi = 0,
9088
K0S,
@@ -94,8 +92,6 @@ enum ParticleOfInterest {
9492
ParticleOfInterestSize
9593
};
9694

97-
static constexpr std::array<std::string_view, ParticleOfInterestSize> particleOfInterestLabels{"Phi", "K0S", "Pion" /*"PionTPC", "PionTPCTOF"*/};
98-
9995
/*
10096
#define LIST_OF_PARTICLES_OF_INTEREST \
10197
X(Phi) \
@@ -262,6 +258,9 @@ struct PhiStrangenessCorrelation {
262258
using BinningTypeVertexCent = ColumnBinningPolicy<aod::collision::PosZ, aod::cent::CentFT0M>;
263259
BinningTypeVertexCent binningOnVertexAndCent{{axisVertexMixing, axisCentralityMixing}, true};
264260

261+
static constexpr std::array<std::string_view, 2> phiMassRegionLabels{"Signal", "Sideband"};
262+
static constexpr std::array<std::string_view, ParticleOfInterestSize> particleOfInterestLabels{"Phi", "K0S", "Pion" /*"PionTPC", "PionTPCTOF"*/};
263+
265264
void init(InitContext&)
266265
{
267266
AxisSpec vertexZAxis = {100, -cutZVertex, cutZVertex, "vrtx_{Z} [cm]"}; // TO BE REMOVED
@@ -385,11 +384,6 @@ struct PhiStrangenessCorrelation {
385384
auto processCorrelations = [&](auto fillK0S, auto fillPion) {
386385
// Loop over all reduced K0S candidates
387386
for (const auto& k0s : k0sReduced) {
388-
/*if (k0sConfigs.selectK0sInSigRegion) {
389-
const auto& [minMassK0s, maxMassK0s] = k0sConfigs.rangeMK0sSignal.value;
390-
if (!k0s.inMassRegion(minMassK0s, maxMassK0s))
391-
continue;
392-
}*/
393387
if (!isK0sValid(k0s))
394388
continue;
395389

@@ -410,33 +404,38 @@ struct PhiStrangenessCorrelation {
410404
};
411405

412406
if (analysisMode == kMassvsMass) {
407+
auto k0sHistID = HIST("phiK0S/h6PhiK0SData");
408+
auto piTPCHistID = HIST("phiPi/h6PhiPiTPCData");
409+
auto piTOFHistID = HIST("phiPi/h6PhiPiTOFData");
410+
413411
processCorrelations(
414412
[&](const auto& k0s, float w) {
415-
auto histID = HIST("phiK0S/h6PhiK0SData");
416-
histos.fill(histID, multiplicity, phiCand.pt(), k0s.pt(), phiCand.y() - k0s.y(), phiCand.m(), k0s.m(), w);
413+
histos.fill(k0sHistID, multiplicity, phiCand.pt(), k0s.pt(), phiCand.y() - k0s.y(), phiCand.m(), k0s.m(), w);
417414
},
418415
[&](const auto& pion, float w) {
419-
auto histID1 = HIST("phiPi/h6PhiPiTPCData");
420-
histos.fill(histID1, multiplicity, phiCand.pt(), pion.pt(), phiCand.y() - pion.y(), phiCand.m(), pion.nSigmaTPC(), w);
421-
auto histID2 = HIST("phiPi/h6PhiPiTOFData");
422-
histos.fill(histID2, multiplicity, phiCand.pt(), pion.pt(), phiCand.y() - pion.y(), phiCand.m(), pion.nSigmaTOF(), w);
416+
histos.fill(piTPCHistID, multiplicity, phiCand.pt(), pion.pt(), phiCand.y() - pion.y(), phiCand.m(), pion.nSigmaTPC(), w);
417+
histos.fill(piTOFHistID, multiplicity, phiCand.pt(), pion.pt(), phiCand.y() - pion.y(), phiCand.m(), pion.nSigmaTOF(), w);
423418
});
424419
} else if (analysisMode == kDeltaYvsDeltaPhi) {
420+
auto k0sHistID = std::make_tuple(HIST("phiK0S/h5PhiK0SDataSignal"), HIST("phiK0S/h5PhiK0SDataSideband"));
421+
auto piHistID = std::make_tuple(HIST("phiPi/h5PhiPiDataSignal"), HIST("phiPi/h5PhiPiDataSideband"));
422+
425423
static_for<0, phiMassRegionLabels.size() - 1>([&](auto i_idx) {
426424
constexpr unsigned int i = i_idx.value;
427425

428426
const auto& [minMassPhi, maxMassPhi] = phiMassRegions[i];
429427
if (!phiCand.inMassRegion(minMassPhi, maxMassPhi))
430428
return;
431429

430+
// auto k0sHistID = HIST("phiK0S/h5PhiK0SData") + HIST(phiMassRegionLabels[i]);
431+
// auto piHistID = HIST("phiPi/h5PhiPiData") + HIST(phiMassRegionLabels[i]);
432+
432433
processCorrelations(
433434
[&](const auto& k0s, float w) {
434-
auto histID = HIST("phiK0S/h5PhiK0SData") + HIST(phiMassRegionLabels[i]);
435-
histos.fill(histID, multiplicity, phiCand.pt(), k0s.pt(), phiCand.y() - k0s.y(), getDeltaPhi(phiCand.phi(), k0s.phi()), w);
435+
histos.fill(std::get<i>(k0sHistID), multiplicity, phiCand.pt(), k0s.pt(), phiCand.y() - k0s.y(), getDeltaPhi(phiCand.phi(), k0s.phi()), w);
436436
},
437437
[&](const auto& pion, float w) {
438-
auto histID = HIST("phiPi/h5PhiPiData") + HIST(phiMassRegionLabels[i]);
439-
histos.fill(histID, multiplicity, phiCand.pt(), pion.pt(), phiCand.y() - pion.y(), getDeltaPhi(phiCand.phi(), pion.phi()), w);
438+
histos.fill(std::get<i>(piHistID), multiplicity, phiCand.pt(), pion.pt(), phiCand.y() - pion.y(), getDeltaPhi(phiCand.phi(), pion.phi()), w);
440439
});
441440
});
442441
}
@@ -513,24 +512,21 @@ struct PhiStrangenessCorrelation {
513512
continue;
514513

515514
auto processCorrelations = [&](auto fillK0S) {
516-
/*if (k0sConfigs.selectK0sInSigRegion) {
517-
const auto& [minMassK0s, maxMassK0s] = k0sConfigs.rangeMK0sSignal.value;
518-
if (!k0s.inMassRegion(minMassK0s, maxMassK0s))
519-
continue;
520-
}*/
521-
522515
float weightPhiK0S = computeWeight(BoundEfficiencyMap(effMaps[Phi], multiplicity, phiCand.pt(), phiCand.y()),
523516
BoundEfficiencyMap(effMaps[K0S], multiplicity, k0s.pt(), k0s.y()));
524517
fillK0S(k0s, weightPhiK0S);
525518
};
526519

527520
if (analysisMode == kMassvsMass) {
521+
auto k0sHistID = HIST("phiK0S/h6PhiK0SDataME");
522+
528523
processCorrelations(
529524
[&](const auto& k0s, float w) {
530-
auto histID = HIST("phiK0S/h6PhiK0SDataME");
531-
histos.fill(histID, multiplicity, phiCand.pt(), k0s.pt(), phiCand.y() - k0s.y(), phiCand.m(), k0s.m(), w);
525+
histos.fill(k0sHistID, multiplicity, phiCand.pt(), k0s.pt(), phiCand.y() - k0s.y(), phiCand.m(), k0s.m(), w);
532526
});
533527
} else if (analysisMode == kDeltaYvsDeltaPhi) {
528+
auto k0sHistID = std::make_tuple(HIST("phiK0S/h5PhiK0SDataMESignal"), HIST("phiK0S/h5PhiK0SDataMESideband"));
529+
534530
static_for<0, phiMassRegionLabels.size() - 1>([&](auto i_idx) {
535531
constexpr unsigned int i = i_idx.value;
536532

@@ -540,8 +536,7 @@ struct PhiStrangenessCorrelation {
540536

541537
processCorrelations(
542538
[&](const auto& k0s, float w) {
543-
auto histID = HIST("phiK0S/h5PhiK0SDataME") + HIST(phiMassRegionLabels[i]);
544-
histos.fill(histID, multiplicity, phiCand.pt(), k0s.pt(), phiCand.y() - k0s.y(), getDeltaPhi(phiCand.phi(), k0s.phi()), w);
539+
histos.fill(std::get<i>(k0sHistID), multiplicity, phiCand.pt(), k0s.pt(), phiCand.y() - k0s.y(), getDeltaPhi(phiCand.phi(), k0s.phi()), w);
545540
});
546541
});
547542
}
@@ -616,14 +611,17 @@ struct PhiStrangenessCorrelation {
616611
};
617612

618613
if (analysisMode == kMassvsMass) {
614+
auto piTPCHistID = HIST("phiPi/h6PhiPiTPCDataME");
615+
auto piTOFHistID = HIST("phiPi/h6PhiPiTOFDataME");
616+
619617
processCorrelations(
620618
[&](const auto& pion, float w) {
621-
auto histID1 = HIST("phiPi/h6PhiPiTPCDataME");
622-
histos.fill(histID1, multiplicity, phiCand.pt(), pion.pt(), phiCand.y() - pion.y(), phiCand.m(), pion.nSigmaTPC(), w);
623-
auto histID2 = HIST("phiPi/h6PhiPiTOFDataME");
624-
histos.fill(histID2, multiplicity, phiCand.pt(), pion.pt(), phiCand.y() - pion.y(), phiCand.m(), pion.nSigmaTOF(), w);
619+
histos.fill(piTPCHistID, multiplicity, phiCand.pt(), pion.pt(), phiCand.y() - pion.y(), phiCand.m(), pion.nSigmaTPC(), w);
620+
histos.fill(piTOFHistID, multiplicity, phiCand.pt(), pion.pt(), phiCand.y() - pion.y(), phiCand.m(), pion.nSigmaTOF(), w);
625621
});
626622
} else if (analysisMode == kDeltaYvsDeltaPhi) {
623+
auto piHistID = std::make_tuple(HIST("phiPi/h5PhiPiDataMESignal"), HIST("phiPi/h5PhiPiDataMESideband"));
624+
627625
static_for<0, phiMassRegionLabels.size() - 1>([&](auto i_idx) {
628626
constexpr unsigned int i = i_idx.value;
629627

@@ -633,8 +631,7 @@ struct PhiStrangenessCorrelation {
633631

634632
processCorrelations(
635633
[&](const auto& pion, float w) {
636-
auto histID = HIST("phiPi/h5PhiPiDataME") + HIST(phiMassRegionLabels[i]);
637-
histos.fill(histID, multiplicity, phiCand.pt(), pion.pt(), phiCand.y() - pion.y(), getDeltaPhi(phiCand.phi(), pion.phi()), w);
634+
histos.fill(std::get<i>(piHistID), multiplicity, phiCand.pt(), pion.pt(), phiCand.y() - pion.y(), getDeltaPhi(phiCand.phi(), pion.phi()), w);
638635
});
639636
});
640637
}

0 commit comments

Comments
 (0)