Skip to content

Commit eb39eb2

Browse files
AlexianLAlexianL
committed
correct problem
1 parent 2ca5480 commit eb39eb2

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
@@ -1154,7 +1155,7 @@ struct HfTaskFlow {
11541155
auto triggerWeight = 1;
11551156
auto associatedWeight = 1;
11561157
auto loopCounter = 0; // To avoid filling associated tracks QA many times, I fill it only for the first trigger track of the collision
1157-
int sampleIndex = gRandom->Uniform(0, configTask.nSamples);
1158+
// int sampleIndex = gRandom->Uniform(0, configTask.nSamples);
11581159

11591160
// TRIGGER PARTICLE
11601161
for (const auto& track1 : tracks1) {
@@ -1190,9 +1191,9 @@ struct HfTaskFlow {
11901191

11911192
// fill single-track distributions
11921193
if (!fillingHFcontainer) { // if not HF-h case
1193-
target->getTriggerHist()->Fill(step, pt1, multiplicity, posZ, sampleIndex, triggerWeight);
1194+
target->getTriggerHist()->Fill(step, pt1, multiplicity, posZ, triggerWeight);
11941195
} else {
1195-
target->getTriggerHist()->Fill(step, pt1, multiplicity, posZ, invmass, sampleIndex, triggerWeight);
1196+
target->getTriggerHist()->Fill(step, pt1, multiplicity, posZ, invmass, triggerWeight);
11961197
}
11971198

11981199
// FILL QA PLOTS for trigger particle
@@ -1316,10 +1317,10 @@ struct HfTaskFlow {
13161317

13171318
if (!fillingHFcontainer) {
13181319
// fill pair correlations
1319-
target->getPairHist()->Fill(step, eta1 - eta2, pt2, pt1, multiplicity, deltaPhi, posZ, sampleIndex,
1320+
target->getPairHist()->Fill(step, eta1 - eta2, pt2, pt1, multiplicity, deltaPhi, posZ,
13201321
triggerWeight * associatedWeight);
13211322
} else {
1322-
target->getPairHist()->Fill(step, eta1 - eta2, pt2, pt1, multiplicity, deltaPhi, posZ, invmass, sampleIndex,
1323+
target->getPairHist()->Fill(step, eta1 - eta2, pt2, pt1, multiplicity, deltaPhi, posZ, invmass,
13231324
triggerWeight * associatedWeight);
13241325
}
13251326

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

13641365
// TRIGGER PARTICLE
13651366
for (const auto& track1 : tracks1) {
@@ -1391,9 +1392,9 @@ struct HfTaskFlow {
13911392

13921393
// fill single-track distributions
13931394
if (!fillingHFcontainer) { // if not HF-h case
1394-
target->getTriggerHist()->Fill(step, pt1, multiplicity, posZ, sampleIndex, triggerWeight);
1395+
target->getTriggerHist()->Fill(step, pt1, multiplicity, posZ, triggerWeight);
13951396
} else {
1396-
target->getTriggerHist()->Fill(step, pt1, multiplicity, posZ, invmass, sampleIndex, triggerWeight);
1397+
target->getTriggerHist()->Fill(step, pt1, multiplicity, posZ, invmass, triggerWeight);
13971398
}
13981399

13991400
// FILL QA PLOTS for trigger particle
@@ -1484,10 +1485,10 @@ struct HfTaskFlow {
14841485
deltaPhi = RecoDecay::constrainAngle(deltaPhi, -PIHalf);
14851486

14861487
if (!fillingHFcontainer) {
1487-
target->getPairHist()->Fill(step, eta1 - eta2, pt2, pt1, multiplicity, deltaPhi, posZ, sampleIndex,
1488+
target->getPairHist()->Fill(step, eta1 - eta2, pt2, pt1, multiplicity, deltaPhi, posZ,
14881489
triggerWeight * associatedWeight);
14891490
} else {
1490-
target->getPairHist()->Fill(step, eta1 - eta2, pt2, pt1, multiplicity, deltaPhi, posZ, invmass, sampleIndex,
1491+
target->getPairHist()->Fill(step, eta1 - eta2, pt2, pt1, multiplicity, deltaPhi, posZ, invmass,
14911492
triggerWeight * associatedWeight);
14921493
}
14931494

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

15211522
// TRIGGER PARTICLE
15221523
for (auto const& track1 : tracks1) {
@@ -1555,9 +1556,9 @@ struct HfTaskFlow {
15551556

15561557
// fill single-track distributions
15571558
if (!fillingHFcontainer) { // if not HF-h case
1558-
target->getTriggerHist()->Fill(step, pt1, multiplicity, posZ, sampleIndex, triggerWeight);
1559+
target->getTriggerHist()->Fill(step, pt1, multiplicity, posZ, triggerWeight);
15591560
} else {
1560-
target->getTriggerHist()->Fill(step, pt1, multiplicity, posZ, invmass, sampleIndex, triggerWeight);
1561+
target->getTriggerHist()->Fill(step, pt1, multiplicity, posZ, invmass, triggerWeight);
15611562
}
15621563

15631564
// FILL QA PLOTS for trigger particle
@@ -1617,10 +1618,10 @@ struct HfTaskFlow {
16171618
deltaPhi = RecoDecay::constrainAngle(deltaPhi, -PIHalf); // set range of delta phi in (-pi/2 , 3/2*pi)
16181619

16191620
if (!fillingHFcontainer) {
1620-
target->getPairHist()->Fill(step, eta1 - eta2, pt1, pt1, multiplicity, deltaPhi, posZ, sampleIndex,
1621+
target->getPairHist()->Fill(step, eta1 - eta2, pt1, pt1, multiplicity, deltaPhi, posZ,
16211622
triggerWeight * associatedWeight);
16221623
} else {
1623-
target->getPairHist()->Fill(step, eta1 - eta2, pt1, pt1, multiplicity, deltaPhi, posZ, invmass, sampleIndex,
1624+
target->getPairHist()->Fill(step, eta1 - eta2, pt1, pt1, multiplicity, deltaPhi, posZ, invmass,
16241625
triggerWeight * associatedWeight);
16251626
}
16261627

@@ -1665,10 +1666,10 @@ struct HfTaskFlow {
16651666
deltaPhi = RecoDecay::constrainAngle(deltaPhi, -PIHalf); // set range of delta phi in (-pi/2 , 3/2*pi)
16661667

16671668
if (!fillingHFcontainer) {
1668-
target->getPairHist()->Fill(step, eta1 - eta2, pt1, pt1, multiplicity, deltaPhi, posZ, sampleIndex,
1669+
target->getPairHist()->Fill(step, eta1 - eta2, pt1, pt1, multiplicity, deltaPhi, posZ,
16691670
amplitude * triggerWeight * associatedWeight);
16701671
} else {
1671-
target->getPairHist()->Fill(step, eta1 - eta2, pt1, pt1, multiplicity, deltaPhi, posZ, invmass, sampleIndex,
1672+
target->getPairHist()->Fill(step, eta1 - eta2, pt1, pt1, multiplicity, deltaPhi, posZ, invmass,
16721673
amplitude * triggerWeight * associatedWeight);
16731674
}
16741675

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

17211722
// TRIGGER PARTICLE
17221723
for (auto const& track1 : tracks1) {
@@ -1739,7 +1740,7 @@ struct HfTaskFlow {
17391740
float phi1 = reassociatedMftTrack.phi();
17401741
o2::math_utils::bringTo02Pi(phi1);
17411742

1742-
target->getTriggerHist()->Fill(step, pt1, multiplicity, posZ, sampleIndex, triggerWeight);
1743+
target->getTriggerHist()->Fill(step, pt1, multiplicity, posZ, triggerWeight);
17431744

17441745
// FILL QA PLOTS for trigger particle
17451746
if (sameEvent && (step == CorrelationContainer::kCFStepReconstructed)) {
@@ -1763,7 +1764,7 @@ struct HfTaskFlow {
17631764
float deltaPhi = phi1 - phi2;
17641765
deltaPhi = RecoDecay::constrainAngle(deltaPhi, -PIHalf); // set range of delta phi in (-pi/2 , 3/2*pi)
17651766

1766-
target->getPairHist()->Fill(step, eta1 - eta2, pt1, pt1, multiplicity, deltaPhi, posZ, sampleIndex,
1767+
target->getPairHist()->Fill(step, eta1 - eta2, pt1, pt1, multiplicity, deltaPhi, posZ,
17671768
triggerWeight * associatedWeight);
17681769

17691770
// FILL QA PLOTS for associated particle
@@ -1796,7 +1797,7 @@ struct HfTaskFlow {
17961797
float deltaPhi = phi1 - phi2;
17971798
deltaPhi = RecoDecay::constrainAngle(deltaPhi, -PIHalf); // set range of delta phi in (-pi/2 , 3/2*pi)
17981799

1799-
target->getPairHist()->Fill(step, eta1 - eta2, pt1, pt1, multiplicity, deltaPhi, posZ, sampleIndex,
1800+
target->getPairHist()->Fill(step, eta1 - eta2, pt1, pt1, multiplicity, deltaPhi, posZ,
18001801
amplitude * triggerWeight * associatedWeight);
18011802

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

18231824
// TRIGGER PARTICLE FROM FT0A
18241825
for (std::size_t indexChannelA = 0; indexChannelA < ft0as.channelA().size(); indexChannelA++) {
@@ -1829,7 +1830,7 @@ struct HfTaskFlow {
18291830
auto phiA = getPhiFT0(channelIdA, isFT0A);
18301831
auto etaA = getEtaFT0(channelIdA, isFT0A);
18311832

1832-
target->getTriggerHist()->Fill(step, 0.f, multiplicity, posZ, sampleIndex, amplitude * triggerWeight);
1833+
target->getTriggerHist()->Fill(step, 0.f, multiplicity, posZ, amplitude * triggerWeight);
18331834

18341835
if (sameEvent && (step == CorrelationContainer::kCFStepReconstructed)) {
18351836
fillTriggerQa<Data, Ft0aFt0c, ChPartChPart>(multiplicity, etaA, phiA, 0.f);
@@ -1845,7 +1846,7 @@ struct HfTaskFlow {
18451846
auto etaC = getEtaFT0(channelIdC, isFT0C);
18461847
float deltaPhi = RecoDecay::constrainAngle(phiA - phiC, -PIHalf);
18471848

1848-
target->getPairHist()->Fill(step, etaA - etaC, 0.f, 0.f, multiplicity, deltaPhi, posZ, sampleIndex,
1849+
target->getPairHist()->Fill(step, etaA - etaC, 0.f, 0.f, multiplicity, deltaPhi, posZ,
18491850
amplitude * triggerWeight * associatedWeight);
18501851

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

0 commit comments

Comments
 (0)