Skip to content

Commit 99a9619

Browse files
AlexianLAlexianL
authored
[PWGHF] taskFlow.cxx : solve issue with CorrelationContainer (#15279)
1 parent 000404a commit 99a9619

File tree

1 file changed

+44
-43
lines changed

1 file changed

+44
-43
lines changed

‎PWGHF/HFC/Tasks/taskFlow.cxx‎

Lines changed: 44 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -535,9 +535,10 @@ struct HfTaskFlow {
535535
std::vector<AxisSpec> const effAxis = {{configAxis.axisEtaEfficiency, "#eta"},
536536
{configAxis.axisPtEfficiency, "p_{T} (GeV/c)"},
537537
{configAxis.axisVertexEfficiency, "z-vtx (cm)"}};
538-
std::vector<AxisSpec> const userAxis = {{configAxis.axisSamples, "sampling"}};
539-
std::vector<AxisSpec> const hfUserAxis = {{configAxis.axisMass, "m_{inv} (GeV/c^{2})"},
540-
{configAxis.axisSamples, "sampling"}};
538+
std::vector<AxisSpec> const hfUserAxis = {{configAxis.axisMass, "m_{inv} (GeV/c^{2})"}};
539+
// std::vector<AxisSpec> const userAxis = {{configAxis.axisSamples, "sampling"}};
540+
// std::vector<AxisSpec> const hfUserAxis = {{configAxis.axisMass, "m_{inv} (GeV/c^{2})"},
541+
// {configAxis.axisSamples, "sampling"}};
541542

542543
// =========================
543544
// Initialization of histograms and CorrelationContainers for TpcTpc cases
@@ -546,8 +547,8 @@ struct HfTaskFlow {
546547
if (doprocessSameTpcTpcChCh) {
547548
addHistograms<Data, TpcTpc, ChPartChPart>();
548549

549-
sameEvent.setObject(new CorrelationContainer("sameEvent", "sameEvent", corrAxis, effAxis, userAxis));
550-
mixedEvent.setObject(new CorrelationContainer("mixedEvent", "mixedEvent", corrAxis, effAxis, userAxis));
550+
sameEvent.setObject(new CorrelationContainer("sameEvent", "sameEvent", corrAxis, effAxis, {}));
551+
mixedEvent.setObject(new CorrelationContainer("mixedEvent", "mixedEvent", corrAxis, effAxis, {}));
551552
}
552553

553554
if (doprocessSameTpcTpcD0Ch) {
@@ -572,8 +573,8 @@ struct HfTaskFlow {
572573
addHistograms<Data, TpcMft, ChPartChPart>();
573574
addMftHistograms();
574575

575-
sameEvent.setObject(new CorrelationContainer("sameEvent", "sameEvent", corrAxis, effAxis, userAxis));
576-
mixedEvent.setObject(new CorrelationContainer("mixedEvent", "mixedEvent", corrAxis, effAxis, userAxis));
576+
sameEvent.setObject(new CorrelationContainer("sameEvent", "sameEvent", corrAxis, effAxis, {}));
577+
mixedEvent.setObject(new CorrelationContainer("mixedEvent", "mixedEvent", corrAxis, effAxis, {}));
577578
}
578579

579580
if (doprocessSameTpcMftD0Ch || doprocessSameTpcMftD0ChReassociated) {
@@ -599,8 +600,8 @@ struct HfTaskFlow {
599600
if (doprocessSameTpcFv0aChCh) {
600601
addHistograms<Data, TpcFv0a, ChPartChPart>();
601602

602-
sameEvent.setObject(new CorrelationContainer("sameEvent", "sameEvent", corrAxis, effAxis, userAxis));
603-
mixedEvent.setObject(new CorrelationContainer("mixedEvent", "mixedEvent", corrAxis, effAxis, userAxis));
603+
sameEvent.setObject(new CorrelationContainer("sameEvent", "sameEvent", corrAxis, effAxis, {}));
604+
mixedEvent.setObject(new CorrelationContainer("mixedEvent", "mixedEvent", corrAxis, effAxis, {}));
604605
}
605606

606607
if (doprocessSameTpcFv0aD0Ch) {
@@ -626,8 +627,8 @@ struct HfTaskFlow {
626627
addHistograms<Data, MftFv0a, ChPartChPart>();
627628
addMftHistograms();
628629

629-
sameEvent.setObject(new CorrelationContainer("sameEvent", "sameEvent", corrAxis, effAxis, userAxis));
630-
mixedEvent.setObject(new CorrelationContainer("mixedEvent", "mixedEvent", corrAxis, effAxis, userAxis));
630+
sameEvent.setObject(new CorrelationContainer("sameEvent", "sameEvent", corrAxis, effAxis, {}));
631+
mixedEvent.setObject(new CorrelationContainer("mixedEvent", "mixedEvent", corrAxis, effAxis, {}));
631632
}
632633

633634
// =========================
@@ -639,8 +640,8 @@ struct HfTaskFlow {
639640
registry.add("Data/FT0Amp", "", {HistType::kTH2F, {configAxis.axisChID, configAxis.axisAmplitudeFit}});
640641
registry.add("Data/FT0AmpCorr", "", {HistType::kTH2F, {configAxis.axisChID, configAxis.axisAmplitudeFit}});
641642

642-
sameEvent.setObject(new CorrelationContainer("sameEvent", "sameEvent", corrAxis, effAxis, userAxis));
643-
mixedEvent.setObject(new CorrelationContainer("mixedEvent", "mixedEvent", corrAxis, effAxis, userAxis));
643+
sameEvent.setObject(new CorrelationContainer("sameEvent", "sameEvent", corrAxis, effAxis, {}));
644+
mixedEvent.setObject(new CorrelationContainer("mixedEvent", "mixedEvent", corrAxis, effAxis, {}));
644645
}
645646

646647
if (doprocessSameTpcFt0aD0Ch) {
@@ -671,8 +672,8 @@ struct HfTaskFlow {
671672
registry.add("Data/FT0Amp", "", {HistType::kTH2F, {configAxis.axisChID, configAxis.axisAmplitudeFit}});
672673
registry.add("Data/FT0AmpCorr", "", {HistType::kTH2F, {configAxis.axisChID, configAxis.axisAmplitudeFit}});
673674

674-
sameEvent.setObject(new CorrelationContainer("sameEvent", "sameEvent", corrAxis, effAxis, userAxis));
675-
mixedEvent.setObject(new CorrelationContainer("mixedEvent", "mixedEvent", corrAxis, effAxis, userAxis));
675+
sameEvent.setObject(new CorrelationContainer("sameEvent", "sameEvent", corrAxis, effAxis, {}));
676+
mixedEvent.setObject(new CorrelationContainer("mixedEvent", "mixedEvent", corrAxis, effAxis, {}));
676677
}
677678

678679
// =========================
@@ -684,8 +685,8 @@ struct HfTaskFlow {
684685
registry.add("Data/FT0Amp", "", {HistType::kTH2F, {configAxis.axisChID, configAxis.axisAmplitudeFit}});
685686
registry.add("Data/FT0AmpCorr", "", {HistType::kTH2F, {configAxis.axisChID, configAxis.axisAmplitudeFit}});
686687

687-
sameEvent.setObject(new CorrelationContainer("sameEvent", "sameEvent", corrAxis, effAxis, userAxis));
688-
mixedEvent.setObject(new CorrelationContainer("mixedEvent", "mixedEvent", corrAxis, effAxis, userAxis));
688+
sameEvent.setObject(new CorrelationContainer("sameEvent", "sameEvent", corrAxis, effAxis, {}));
689+
mixedEvent.setObject(new CorrelationContainer("mixedEvent", "mixedEvent", corrAxis, effAxis, {}));
689690
}
690691

691692
if (doprocessSameTpcFt0cD0Ch) {
@@ -715,8 +716,8 @@ struct HfTaskFlow {
715716
registry.add("Data/FT0Amp", "", {HistType::kTH2F, {configAxis.axisChID, configAxis.axisAmplitudeFit}});
716717
registry.add("Data/FT0AmpCorr", "", {HistType::kTH2F, {configAxis.axisChID, configAxis.axisAmplitudeFit}});
717718

718-
sameEvent.setObject(new CorrelationContainer("sameEvent", "sameEvent", corrAxis, effAxis, userAxis));
719-
mixedEvent.setObject(new CorrelationContainer("mixedEvent", "mixedEvent", corrAxis, effAxis, userAxis));
719+
sameEvent.setObject(new CorrelationContainer("sameEvent", "sameEvent", corrAxis, effAxis, {}));
720+
mixedEvent.setObject(new CorrelationContainer("mixedEvent", "mixedEvent", corrAxis, effAxis, {}));
720721
}
721722

722723
} // End of init() function
@@ -1156,7 +1157,7 @@ struct HfTaskFlow {
11561157
auto triggerWeight = 1;
11571158
auto associatedWeight = 1;
11581159
auto loopCounter = 0; // To avoid filling associated tracks QA many times, I fill it only for the first trigger track of the collision
1159-
int sampleIndex = gRandom->Uniform(0, configTask.nSamples);
1160+
// int sampleIndex = gRandom->Uniform(0, configTask.nSamples);
11601161

11611162
// TRIGGER PARTICLE
11621163
for (const auto& track1 : tracks1) {
@@ -1192,9 +1193,9 @@ struct HfTaskFlow {
11921193

11931194
// fill single-track distributions
11941195
if (!fillingHFcontainer) { // if not HF-h case
1195-
target->getTriggerHist()->Fill(step, pt1, multiplicity, posZ, sampleIndex, triggerWeight);
1196+
target->getTriggerHist()->Fill(step, pt1, multiplicity, posZ, triggerWeight);
11961197
} else {
1197-
target->getTriggerHist()->Fill(step, pt1, multiplicity, posZ, invmass, sampleIndex, triggerWeight);
1198+
target->getTriggerHist()->Fill(step, pt1, multiplicity, posZ, invmass, triggerWeight);
11981199
}
11991200

12001201
// FILL QA PLOTS for trigger particle
@@ -1319,10 +1320,10 @@ struct HfTaskFlow {
13191320

13201321
if (!fillingHFcontainer) {
13211322
// fill pair correlations
1322-
target->getPairHist()->Fill(step, sampleIndex, eta1 - eta2, pt2, pt1, multiplicity, deltaPhi, posZ,
1323+
target->getPairHist()->Fill(step, eta1 - eta2, pt2, pt1, multiplicity, deltaPhi, posZ,
13231324
triggerWeight * associatedWeight);
13241325
} else {
1325-
target->getPairHist()->Fill(step, sampleIndex, eta1 - eta2, pt2, pt1, multiplicity, deltaPhi, posZ, invmass,
1326+
target->getPairHist()->Fill(step, eta1 - eta2, pt2, pt1, multiplicity, deltaPhi, posZ, invmass,
13261327
triggerWeight * associatedWeight);
13271328
}
13281329

@@ -1362,7 +1363,7 @@ struct HfTaskFlow {
13621363
auto triggerWeight = 1;
13631364
auto associatedWeight = 1;
13641365
auto loopCounter = 0; // To avoid filling associated tracks QA many times, I fill it only for the first trigger track of the collision
1365-
int sampleIndex = gRandom->Uniform(0, configTask.nSamples);
1366+
// int sampleIndex = gRandom->Uniform(0, configTask.nSamples);
13661367

13671368
// TRIGGER PARTICLE
13681369
for (const auto& track1 : tracks1) {
@@ -1394,9 +1395,9 @@ struct HfTaskFlow {
13941395

13951396
// fill single-track distributions
13961397
if (!fillingHFcontainer) { // if not HF-h case
1397-
target->getTriggerHist()->Fill(step, pt1, multiplicity, posZ, sampleIndex, triggerWeight);
1398+
target->getTriggerHist()->Fill(step, pt1, multiplicity, posZ, triggerWeight);
13981399
} else {
1399-
target->getTriggerHist()->Fill(step, pt1, multiplicity, posZ, invmass, sampleIndex, triggerWeight);
1400+
target->getTriggerHist()->Fill(step, pt1, multiplicity, posZ, invmass, triggerWeight);
14001401
}
14011402

14021403
// FILL QA PLOTS for trigger particle
@@ -1487,10 +1488,10 @@ struct HfTaskFlow {
14871488
deltaPhi = RecoDecay::constrainAngle(deltaPhi, -PIHalf);
14881489

14891490
if (!fillingHFcontainer) {
1490-
target->getPairHist()->Fill(step, sampleIndex, eta1 - eta2, pt2, pt1, multiplicity, deltaPhi, posZ,
1491+
target->getPairHist()->Fill(step, eta1 - eta2, pt2, pt1, multiplicity, deltaPhi, posZ,
14911492
triggerWeight * associatedWeight);
14921493
} else {
1493-
target->getPairHist()->Fill(step, sampleIndex, eta1 - eta2, pt2, pt1, multiplicity, deltaPhi, posZ, invmass,
1494+
target->getPairHist()->Fill(step, eta1 - eta2, pt2, pt1, multiplicity, deltaPhi, posZ, invmass,
14941495
triggerWeight * associatedWeight);
14951496
}
14961497

@@ -1519,7 +1520,7 @@ struct HfTaskFlow {
15191520
auto triggerWeight = 1;
15201521
auto associatedWeight = 1;
15211522
auto loopCounter = 0; // To avoid filling associated tracks QA many times, I fill it only for the first trigger track of the collision
1522-
int sampleIndex = gRandom->Uniform(0, configTask.nSamples);
1523+
// int sampleIndex = gRandom->Uniform(0, configTask.nSamples);
15231524

15241525
// TRIGGER PARTICLE
15251526
for (auto const& track1 : tracks1) {
@@ -1558,9 +1559,9 @@ struct HfTaskFlow {
15581559

15591560
// fill single-track distributions
15601561
if (!fillingHFcontainer) { // if not HF-h case
1561-
target->getTriggerHist()->Fill(step, pt1, multiplicity, posZ, sampleIndex, triggerWeight);
1562+
target->getTriggerHist()->Fill(step, pt1, multiplicity, posZ, triggerWeight);
15621563
} else {
1563-
target->getTriggerHist()->Fill(step, pt1, multiplicity, posZ, invmass, sampleIndex, triggerWeight);
1564+
target->getTriggerHist()->Fill(step, pt1, multiplicity, posZ, invmass, triggerWeight);
15641565
}
15651566

15661567
// FILL QA PLOTS for trigger particle
@@ -1620,10 +1621,10 @@ struct HfTaskFlow {
16201621
deltaPhi = RecoDecay::constrainAngle(deltaPhi, -PIHalf); // set range of delta phi in (-pi/2 , 3/2*pi)
16211622

16221623
if (!fillingHFcontainer) {
1623-
target->getPairHist()->Fill(step, sampleIndex, eta1 - eta2, pt1, pt1, multiplicity, deltaPhi, posZ,
1624+
target->getPairHist()->Fill(step, eta1 - eta2, pt1, pt1, multiplicity, deltaPhi, posZ,
16241625
triggerWeight * associatedWeight);
16251626
} else {
1626-
target->getPairHist()->Fill(step, sampleIndex, eta1 - eta2, pt1, pt1, multiplicity, deltaPhi, posZ, invmass,
1627+
target->getPairHist()->Fill(step, eta1 - eta2, pt1, pt1, multiplicity, deltaPhi, posZ, invmass,
16271628
triggerWeight * associatedWeight);
16281629
}
16291630

@@ -1668,10 +1669,10 @@ struct HfTaskFlow {
16681669
deltaPhi = RecoDecay::constrainAngle(deltaPhi, -PIHalf); // set range of delta phi in (-pi/2 , 3/2*pi)
16691670

16701671
if (!fillingHFcontainer) {
1671-
target->getPairHist()->Fill(step, sampleIndex, eta1 - eta2, pt1, pt1, multiplicity, deltaPhi, posZ,
1672+
target->getPairHist()->Fill(step, eta1 - eta2, pt1, pt1, multiplicity, deltaPhi, posZ,
16721673
amplitude * triggerWeight * associatedWeight);
16731674
} else {
1674-
target->getPairHist()->Fill(step, sampleIndex, eta1 - eta2, pt1, pt1, multiplicity, deltaPhi, posZ, invmass,
1675+
target->getPairHist()->Fill(step, eta1 - eta2, pt1, pt1, multiplicity, deltaPhi, posZ, invmass,
16751676
amplitude * triggerWeight * associatedWeight);
16761677
}
16771678

@@ -1719,7 +1720,7 @@ struct HfTaskFlow {
17191720
auto triggerWeight = 1;
17201721
auto associatedWeight = 1;
17211722
auto loopCounter = 0; // To avoid filling associated tracks QA many times, I fill it only for the first trigger track of the collision
1722-
int sampleIndex = gRandom->Uniform(0, configTask.nSamples);
1723+
// int sampleIndex = gRandom->Uniform(0, configTask.nSamples);
17231724

17241725
// TRIGGER PARTICLE
17251726
for (auto const& track1 : tracks1) {
@@ -1742,7 +1743,7 @@ struct HfTaskFlow {
17421743
float phi1 = reassociatedMftTrack.phi();
17431744
o2::math_utils::bringTo02Pi(phi1);
17441745

1745-
target->getTriggerHist()->Fill(step, pt1, multiplicity, posZ, sampleIndex, triggerWeight);
1746+
target->getTriggerHist()->Fill(step, pt1, multiplicity, posZ, triggerWeight);
17461747

17471748
// FILL QA PLOTS for trigger particle
17481749
if (sameEvent && (step == CorrelationContainer::kCFStepReconstructed)) {
@@ -1766,7 +1767,7 @@ struct HfTaskFlow {
17661767
float deltaPhi = phi1 - phi2;
17671768
deltaPhi = RecoDecay::constrainAngle(deltaPhi, -PIHalf); // set range of delta phi in (-pi/2 , 3/2*pi)
17681769

1769-
target->getPairHist()->Fill(step, sampleIndex, eta1 - eta2, pt1, pt1, multiplicity, deltaPhi, posZ,
1770+
target->getPairHist()->Fill(step, eta1 - eta2, pt1, pt1, multiplicity, deltaPhi, posZ,
17701771
triggerWeight * associatedWeight);
17711772

17721773
// FILL QA PLOTS for associated particle
@@ -1799,7 +1800,7 @@ struct HfTaskFlow {
17991800
float deltaPhi = phi1 - phi2;
18001801
deltaPhi = RecoDecay::constrainAngle(deltaPhi, -PIHalf); // set range of delta phi in (-pi/2 , 3/2*pi)
18011802

1802-
target->getPairHist()->Fill(step, sampleIndex, eta1 - eta2, pt1, pt1, multiplicity, deltaPhi, posZ,
1803+
target->getPairHist()->Fill(step, eta1 - eta2, pt1, pt1, multiplicity, deltaPhi, posZ,
18031804
amplitude * triggerWeight * associatedWeight);
18041805

18051806
// FILL QA PLOTS for associated particle
@@ -1821,7 +1822,7 @@ struct HfTaskFlow {
18211822
auto triggerWeight = 1;
18221823
auto associatedWeight = 1;
18231824
auto loopCounter = 0; // To avoid filling associated tracks QA many times, I fill it only for the first trigger track of the collision
1824-
int sampleIndex = gRandom->Uniform(0, configTask.nSamples);
1825+
// int sampleIndex = gRandom->Uniform(0, configTask.nSamples);
18251826

18261827
// TRIGGER PARTICLE FROM FT0A
18271828
for (std::size_t indexChannelA = 0; indexChannelA < ft0as.channelA().size(); indexChannelA++) {
@@ -1832,7 +1833,7 @@ struct HfTaskFlow {
18321833
auto phiA = getPhiFT0(channelIdA, isFT0A);
18331834
auto etaA = getEtaFT0(channelIdA, isFT0A);
18341835

1835-
target->getTriggerHist()->Fill(step, 0.f, multiplicity, posZ, sampleIndex, amplitude * triggerWeight);
1836+
target->getTriggerHist()->Fill(step, 0.f, multiplicity, posZ, amplitude * triggerWeight);
18361837

18371838
if (sameEvent && (step == CorrelationContainer::kCFStepReconstructed)) {
18381839
fillTriggerQa<Data, Ft0aFt0c, ChPartChPart>(multiplicity, etaA, phiA, 0.f);
@@ -1848,7 +1849,7 @@ struct HfTaskFlow {
18481849
auto etaC = getEtaFT0(channelIdC, isFT0C);
18491850
float deltaPhi = RecoDecay::constrainAngle(phiA - phiC, -PIHalf);
18501851

1851-
target->getPairHist()->Fill(step, sampleIndex, etaA - etaC, 0.f, 0.f, multiplicity, deltaPhi, posZ,
1852+
target->getPairHist()->Fill(step, etaA - etaC, 0.f, 0.f, multiplicity, deltaPhi, posZ,
18521853
amplitude * triggerWeight * associatedWeight);
18531854

18541855
if (sameEvent && (loopCounter == 1) && (step == CorrelationContainer::kCFStepReconstructed)) {

0 commit comments

Comments
 (0)