Skip to content

Commit 33a5a12

Browse files
AlexianLAlexianL
committed
add sampling axis
1 parent 131f855 commit 33a5a12

File tree

1 file changed

+48
-47
lines changed

1 file changed

+48
-47
lines changed

‎PWGHF/HFC/Tasks/taskFlow.cxx‎

Lines changed: 48 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -476,8 +476,7 @@ struct HfTaskFlow {
476476
// Declaration of correlation containers and their respective axis
477477
// =========================
478478

479-
std::vector<AxisSpec> const corrAxis = {{configAxis.axisSamples, "sampling"},
480-
{configAxis.axisDeltaEta, "#Delta#eta"},
479+
std::vector<AxisSpec> const corrAxis = {{configAxis.axisDeltaEta, "#Delta#eta"},
481480
{configAxis.axisPtAssoc, "p_{T} (GeV/c)"},
482481
{configAxis.axisPtTrigger, "p_{T} (GeV/c)"},
483482
{configAxis.axisMultiplicity, "multiplicity"},
@@ -486,28 +485,30 @@ struct HfTaskFlow {
486485
std::vector<AxisSpec> const effAxis = {{configAxis.axisEtaEfficiency, "#eta"},
487486
{configAxis.axisPtEfficiency, "p_{T} (GeV/c)"},
488487
{configAxis.axisVertexEfficiency, "z-vtx (cm)"}};
489-
std::vector<AxisSpec> const userAxis = {{configAxis.axisMass, "m_{inv} (GeV/c^{2})"}};
488+
std::vector<AxisSpec> const userAxis = {{configAxis.axisSamples, "sampling"}};
489+
std::vector<AxisSpec> const hfUserAxis = {{configAxis.axisMass, "m_{inv} (GeV/c^{2})"},
490+
{configAxis.axisSamples, "sampling"}};
490491

491492
// =========================
492493
// Initialization of histograms and CorrelationContainers for TpcTpc cases
493494
// =========================
494495

495496
if (doprocessSameTpcTpcChCh) {
496497
addHistograms<Data, TpcTpc, ChPartChPart>();
497-
sameEvent.setObject(new CorrelationContainer("sameEvent", "sameEvent", corrAxis, effAxis, {}));
498-
mixedEvent.setObject(new CorrelationContainer("mixedEvent", "mixedEvent", corrAxis, effAxis, {}));
498+
sameEvent.setObject(new CorrelationContainer("sameEvent", "sameEvent", corrAxis, effAxis, userAxis));
499+
mixedEvent.setObject(new CorrelationContainer("mixedEvent", "mixedEvent", corrAxis, effAxis, userAxis));
499500
}
500501

501502
if (doprocessSameTpcTpcD0Ch) {
502503
addHistograms<Data, TpcTpc, D0ChPart>();
503-
sameEventHf.setObject(new CorrelationContainer("sameEventHf", "sameEventHf", corrAxis, effAxis, userAxis));
504-
mixedEventHf.setObject(new CorrelationContainer("mixedEventHf", "mixedEventHf", corrAxis, effAxis, userAxis));
504+
sameEventHf.setObject(new CorrelationContainer("sameEventHf", "sameEventHf", corrAxis, effAxis, hfUserAxis));
505+
mixedEventHf.setObject(new CorrelationContainer("mixedEventHf", "mixedEventHf", corrAxis, effAxis, hfUserAxis));
505506
}
506507

507508
if (doprocessSameTpcTpcLcCh) {
508509
addHistograms<Data, TpcTpc, LcChPart>();
509-
sameEventHf.setObject(new CorrelationContainer("sameEventHf", "sameEventHf", corrAxis, effAxis, userAxis));
510-
mixedEventHf.setObject(new CorrelationContainer("mixedEventHf", "mixedEventHf", corrAxis, effAxis, userAxis));
510+
sameEventHf.setObject(new CorrelationContainer("sameEventHf", "sameEventHf", corrAxis, effAxis, hfUserAxis));
511+
mixedEventHf.setObject(new CorrelationContainer("mixedEventHf", "mixedEventHf", corrAxis, effAxis, hfUserAxis));
511512
}
512513

513514
// =========================
@@ -518,24 +519,24 @@ struct HfTaskFlow {
518519
addHistograms<Data, TpcMft, ChPartChPart>();
519520
addMftHistograms();
520521

521-
sameEvent.setObject(new CorrelationContainer("sameEvent", "sameEvent", corrAxis, effAxis, {}));
522-
mixedEvent.setObject(new CorrelationContainer("mixedEvent", "mixedEvent", corrAxis, effAxis, {}));
522+
sameEvent.setObject(new CorrelationContainer("sameEvent", "sameEvent", corrAxis, effAxis, userAxis));
523+
mixedEvent.setObject(new CorrelationContainer("mixedEvent", "mixedEvent", corrAxis, effAxis, userAxis));
523524
}
524525

525526
if (doprocessSameTpcMftD0Ch || doprocessSameTpcMftD0ChReassociated) {
526527
addHistograms<Data, TpcMft, D0ChPart>();
527528
addMftHistograms();
528529

529-
sameEventHf.setObject(new CorrelationContainer("sameEventHf", "sameEventHf", corrAxis, effAxis, userAxis));
530-
mixedEventHf.setObject(new CorrelationContainer("mixedEventHf", "mixedEventHf", corrAxis, effAxis, userAxis));
530+
sameEventHf.setObject(new CorrelationContainer("sameEventHf", "sameEventHf", corrAxis, effAxis, hfUserAxis));
531+
mixedEventHf.setObject(new CorrelationContainer("mixedEventHf", "mixedEventHf", corrAxis, effAxis, hfUserAxis));
531532
}
532533

533534
if (doprocessSameTpcMftLcCh || doprocessSameTpcMftLcChReassociated) {
534535
addHistograms<Data, TpcMft, LcChPart>();
535536
addMftHistograms();
536537

537-
sameEventHf.setObject(new CorrelationContainer("sameEventHf", "sameEventHf", corrAxis, effAxis, userAxis));
538-
mixedEventHf.setObject(new CorrelationContainer("mixedEventHf", "mixedEventHf", corrAxis, effAxis, userAxis));
538+
sameEventHf.setObject(new CorrelationContainer("sameEventHf", "sameEventHf", corrAxis, effAxis, hfUserAxis));
539+
mixedEventHf.setObject(new CorrelationContainer("mixedEventHf", "mixedEventHf", corrAxis, effAxis, hfUserAxis));
539540
}
540541

541542
// =========================
@@ -545,22 +546,22 @@ struct HfTaskFlow {
545546
if (doprocessSameTpcFv0aChCh) {
546547
addHistograms<Data, TpcFv0a, ChPartChPart>();
547548

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

552553
if (doprocessSameTpcFv0aD0Ch) {
553554
addHistograms<Data, TpcFv0a, D0ChPart>();
554555

555-
sameEventHf.setObject(new CorrelationContainer("sameEventHf", "sameEventHf", corrAxis, effAxis, userAxis));
556-
mixedEventHf.setObject(new CorrelationContainer("mixedEventHf", "mixedEventHf", corrAxis, effAxis, userAxis));
556+
sameEventHf.setObject(new CorrelationContainer("sameEventHf", "sameEventHf", corrAxis, effAxis, hfUserAxis));
557+
mixedEventHf.setObject(new CorrelationContainer("mixedEventHf", "mixedEventHf", corrAxis, effAxis, hfUserAxis));
557558
}
558559

559560
if (doprocessSameTpcFv0aLcCh) {
560561
addHistograms<Data, TpcFv0a, LcChPart>();
561562

562-
sameEventHf.setObject(new CorrelationContainer("sameEventHf", "sameEventHf", corrAxis, effAxis, userAxis));
563-
mixedEventHf.setObject(new CorrelationContainer("mixedEventHf", "mixedEventHf", corrAxis, effAxis, userAxis));
563+
sameEventHf.setObject(new CorrelationContainer("sameEventHf", "sameEventHf", corrAxis, effAxis, hfUserAxis));
564+
mixedEventHf.setObject(new CorrelationContainer("mixedEventHf", "mixedEventHf", corrAxis, effAxis, hfUserAxis));
564565
}
565566

566567
// =========================
@@ -572,8 +573,8 @@ struct HfTaskFlow {
572573
addHistograms<Data, MftFv0a, ChPartChPart>();
573574
addMftHistograms();
574575

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

579580
// =========================
@@ -585,26 +586,26 @@ struct HfTaskFlow {
585586
registry.add("Data/FT0Amp", "", {HistType::kTH2F, {configAxis.axisChID, configAxis.axisAmplitudeFit}});
586587
registry.add("Data/FT0AmpCorr", "", {HistType::kTH2F, {configAxis.axisChID, configAxis.axisAmplitudeFit}});
587588

588-
sameEvent.setObject(new CorrelationContainer("sameEvent", "sameEvent", corrAxis, effAxis, {}));
589-
mixedEvent.setObject(new CorrelationContainer("mixedEvent", "mixedEvent", corrAxis, effAxis, {}));
589+
sameEvent.setObject(new CorrelationContainer("sameEvent", "sameEvent", corrAxis, effAxis, userAxis));
590+
mixedEvent.setObject(new CorrelationContainer("mixedEvent", "mixedEvent", corrAxis, effAxis, userAxis));
590591
}
591592

592593
if (doprocessSameTpcFt0aD0Ch) {
593594
addHistograms<Data, TpcFt0a, D0ChPart>();
594595
registry.add("Data/FT0Amp", "", {HistType::kTH2F, {configAxis.axisChID, configAxis.axisAmplitudeFit}});
595596
registry.add("Data/FT0AmpCorr", "", {HistType::kTH2F, {configAxis.axisChID, configAxis.axisAmplitudeFit}});
596597

597-
sameEventHf.setObject(new CorrelationContainer("sameEventHf", "sameEventHf", corrAxis, effAxis, userAxis));
598-
mixedEventHf.setObject(new CorrelationContainer("mixedEventHf", "mixedEventHf", corrAxis, effAxis, userAxis));
598+
sameEventHf.setObject(new CorrelationContainer("sameEventHf", "sameEventHf", corrAxis, effAxis, hfUserAxis));
599+
mixedEventHf.setObject(new CorrelationContainer("mixedEventHf", "mixedEventHf", corrAxis, effAxis, hfUserAxis));
599600
}
600601

601602
if (doprocessSameTpcFt0aLcCh) {
602603
addHistograms<Data, TpcFt0a, LcChPart>();
603604
registry.add("Data/FT0Amp", "", {HistType::kTH2F, {configAxis.axisChID, configAxis.axisAmplitudeFit}});
604605
registry.add("Data/FT0AmpCorr", "", {HistType::kTH2F, {configAxis.axisChID, configAxis.axisAmplitudeFit}});
605606

606-
sameEventHf.setObject(new CorrelationContainer("sameEventHf", "sameEventHf", corrAxis, effAxis, userAxis));
607-
mixedEventHf.setObject(new CorrelationContainer("mixedEventHf", "mixedEventHf", corrAxis, effAxis, userAxis));
607+
sameEventHf.setObject(new CorrelationContainer("sameEventHf", "sameEventHf", corrAxis, effAxis, hfUserAxis));
608+
mixedEventHf.setObject(new CorrelationContainer("mixedEventHf", "mixedEventHf", corrAxis, effAxis, hfUserAxis));
608609
}
609610

610611
// =========================
@@ -617,8 +618,8 @@ struct HfTaskFlow {
617618
registry.add("Data/FT0Amp", "", {HistType::kTH2F, {configAxis.axisChID, configAxis.axisAmplitudeFit}});
618619
registry.add("Data/FT0AmpCorr", "", {HistType::kTH2F, {configAxis.axisChID, configAxis.axisAmplitudeFit}});
619620

620-
sameEvent.setObject(new CorrelationContainer("sameEvent", "sameEvent", corrAxis, effAxis, {}));
621-
mixedEvent.setObject(new CorrelationContainer("mixedEvent", "mixedEvent", corrAxis, effAxis, {}));
621+
sameEvent.setObject(new CorrelationContainer("sameEvent", "sameEvent", corrAxis, effAxis, userAxis));
622+
mixedEvent.setObject(new CorrelationContainer("mixedEvent", "mixedEvent", corrAxis, effAxis, userAxis));
622623
}
623624

624625
// =========================
@@ -630,26 +631,26 @@ struct HfTaskFlow {
630631
registry.add("Data/FT0Amp", "", {HistType::kTH2F, {configAxis.axisChID, configAxis.axisAmplitudeFit}});
631632
registry.add("Data/FT0AmpCorr", "", {HistType::kTH2F, {configAxis.axisChID, configAxis.axisAmplitudeFit}});
632633

633-
sameEvent.setObject(new CorrelationContainer("sameEvent", "sameEvent", corrAxis, effAxis, {}));
634-
mixedEvent.setObject(new CorrelationContainer("mixedEvent", "mixedEvent", corrAxis, effAxis, {}));
634+
sameEvent.setObject(new CorrelationContainer("sameEvent", "sameEvent", corrAxis, effAxis, userAxis));
635+
mixedEvent.setObject(new CorrelationContainer("mixedEvent", "mixedEvent", corrAxis, effAxis, userAxis));
635636
}
636637

637638
if (doprocessSameTpcFt0cD0Ch) {
638639
addHistograms<Data, TpcFt0c, D0ChPart>();
639640
registry.add("Data/FT0Amp", "", {HistType::kTH2F, {configAxis.axisChID, configAxis.axisAmplitudeFit}});
640641
registry.add("Data/FT0AmpCorr", "", {HistType::kTH2F, {configAxis.axisChID, configAxis.axisAmplitudeFit}});
641642

642-
sameEventHf.setObject(new CorrelationContainer("sameEventHf", "sameEventHf", corrAxis, effAxis, userAxis));
643-
mixedEventHf.setObject(new CorrelationContainer("mixedEventHf", "mixedEventHf", corrAxis, effAxis, userAxis));
643+
sameEventHf.setObject(new CorrelationContainer("sameEventHf", "sameEventHf", corrAxis, effAxis, hfUserAxis));
644+
mixedEventHf.setObject(new CorrelationContainer("mixedEventHf", "mixedEventHf", corrAxis, effAxis, hfUserAxis));
644645
}
645646

646647
if (doprocessSameTpcFt0cLcCh) {
647648
addHistograms<Data, TpcFt0c, LcChPart>();
648649
registry.add("Data/FT0Amp", "", {HistType::kTH2F, {configAxis.axisChID, configAxis.axisAmplitudeFit}});
649650
registry.add("Data/FT0AmpCorr", "", {HistType::kTH2F, {configAxis.axisChID, configAxis.axisAmplitudeFit}});
650651

651-
sameEventHf.setObject(new CorrelationContainer("sameEventHf", "sameEventHf", corrAxis, effAxis, userAxis));
652-
mixedEventHf.setObject(new CorrelationContainer("mixedEventHf", "mixedEventHf", corrAxis, effAxis, userAxis));
652+
sameEventHf.setObject(new CorrelationContainer("sameEventHf", "sameEventHf", corrAxis, effAxis, hfUserAxis));
653+
mixedEventHf.setObject(new CorrelationContainer("mixedEventHf", "mixedEventHf", corrAxis, effAxis, hfUserAxis));
653654
}
654655

655656
// =========================
@@ -661,8 +662,8 @@ struct HfTaskFlow {
661662
registry.add("Data/FT0Amp", "", {HistType::kTH2F, {configAxis.axisChID, configAxis.axisAmplitudeFit}});
662663
registry.add("Data/FT0AmpCorr", "", {HistType::kTH2F, {configAxis.axisChID, configAxis.axisAmplitudeFit}});
663664

664-
sameEvent.setObject(new CorrelationContainer("sameEvent", "sameEvent", corrAxis, effAxis, {}));
665-
mixedEvent.setObject(new CorrelationContainer("mixedEvent", "mixedEvent", corrAxis, effAxis, {}));
665+
sameEvent.setObject(new CorrelationContainer("sameEvent", "sameEvent", corrAxis, effAxis, userAxis));
666+
mixedEvent.setObject(new CorrelationContainer("mixedEvent", "mixedEvent", corrAxis, effAxis, userAxis));
666667
}
667668

668669
} // End of init() function
@@ -1087,9 +1088,9 @@ struct HfTaskFlow {
10871088

10881089
// fill single-track distributions
10891090
if (!fillingHFcontainer) { // if not HF-h case
1090-
target->getTriggerHist()->Fill(step, pt1, multiplicity, posZ, triggerWeight);
1091+
target->getTriggerHist()->Fill(step, pt1, multiplicity, posZ, sampleIndex, triggerWeight);
10911092
} else {
1092-
target->getTriggerHist()->Fill(step, pt1, multiplicity, posZ, invmass, triggerWeight);
1093+
target->getTriggerHist()->Fill(step, pt1, multiplicity, posZ, invmass, sampleIndex, triggerWeight);
10931094
}
10941095

10951096
// FILL QA PLOTS for trigger particle
@@ -1288,9 +1289,9 @@ struct HfTaskFlow {
12881289

12891290
// fill single-track distributions
12901291
if (!fillingHFcontainer) { // if not HF-h case
1291-
target->getTriggerHist()->Fill(step, pt1, multiplicity, posZ, triggerWeight);
1292+
target->getTriggerHist()->Fill(step, pt1, multiplicity, posZ, sampleIndex, triggerWeight);
12921293
} else {
1293-
target->getTriggerHist()->Fill(step, pt1, multiplicity, posZ, invmass, triggerWeight);
1294+
target->getTriggerHist()->Fill(step, pt1, multiplicity, posZ, invmass, sampleIndex, triggerWeight);
12941295
}
12951296

12961297
// FILL QA PLOTS for trigger particle
@@ -1452,9 +1453,9 @@ struct HfTaskFlow {
14521453

14531454
// fill single-track distributions
14541455
if (!fillingHFcontainer) { // if not HF-h case
1455-
target->getTriggerHist()->Fill(step, pt1, multiplicity, posZ, triggerWeight);
1456+
target->getTriggerHist()->Fill(step, pt1, multiplicity, posZ, sampleIndex, triggerWeight);
14561457
} else {
1457-
target->getTriggerHist()->Fill(step, pt1, multiplicity, posZ, invmass, triggerWeight);
1458+
target->getTriggerHist()->Fill(step, pt1, multiplicity, posZ, invmass, sampleIndex, triggerWeight);
14581459
}
14591460

14601461
// FILL QA PLOTS for trigger particle
@@ -1636,7 +1637,7 @@ struct HfTaskFlow {
16361637
float phi1 = reassociatedMftTrack.phi();
16371638
o2::math_utils::bringTo02Pi(phi1);
16381639

1639-
target->getTriggerHist()->Fill(step, pt1, multiplicity, posZ, triggerWeight);
1640+
target->getTriggerHist()->Fill(step, pt1, multiplicity, posZ, sampleIndex, triggerWeight);
16401641

16411642
// FILL QA PLOTS for trigger particle
16421643
if (sameEvent && (step == CorrelationContainer::kCFStepReconstructed)) {
@@ -1726,7 +1727,7 @@ struct HfTaskFlow {
17261727
auto phiA = getPhiFT0(channelIdA, isFT0A);
17271728
auto etaA = getEtaFT0(channelIdA, isFT0A);
17281729

1729-
target->getTriggerHist()->Fill(step, 0.f, multiplicity, posZ, amplitude * triggerWeight);
1730+
target->getTriggerHist()->Fill(step, 0.f, multiplicity, posZ, sampleIndex, amplitude * triggerWeight);
17301731

17311732
if (sameEvent && (step == CorrelationContainer::kCFStepReconstructed)) {
17321733
fillTriggerQa<Data, Ft0aFt0c, ChPartChPart>(multiplicity, etaA, phiA, 0.f);

0 commit comments

Comments
 (0)