Skip to content

Commit 14265bf

Browse files
committed
Fix bug in filling deta-dphi at lower and upper limit of kT
1 parent e7cacf2 commit 14265bf

File tree

2 files changed

+17
-18
lines changed

2 files changed

+17
-18
lines changed

PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ class FemtoUniverseDetaDphiStar
200200

201201
if constexpr (kPartOneType == o2::aod::femtouniverseparticle::ParticleType::kTrack && kPartTwoType == o2::aod::femtouniverseparticle::ParticleType::kTrack) {
202202
std::string dirName = static_cast<std::string>(DirNames[0]);
203-
for (int j = 0; j < static_cast<int>(ktBins.size() - 1); j++) {
203+
for (int j = 1; j < static_cast<int>(ktBins.size() - 1); j++) {
204204
std::string histSuffixkT1 = std::to_string(static_cast<int>(ktBins[j] * 100.0));
205205
std::string histSuffixkT2 = std::to_string(static_cast<int>(ktBins[j + 1] * 100.0));
206206
std::string histFolderkT = "kT_" + histSuffixkT1 + "_" + histSuffixkT2 + "/";
@@ -655,15 +655,15 @@ class FemtoUniverseDetaDphiStar
655655
return false;
656656
}
657657

658-
int ktbinval = -1;
659-
if (ktval >= ktBins[0] && ktval < ktBins[1]) {
660-
ktbinval = 0;
661-
} else if (ktval >= ktBins[1] && ktval < ktBins[2]) {
658+
int ktbinval = 1;
659+
if (ktval >= ktBins[1] && ktval < ktBins[2]) {
662660
ktbinval = 1;
663661
} else if (ktval >= ktBins[2] && ktval < ktBins[3]) {
664662
ktbinval = 2;
665663
} else if (ktval >= ktBins[3] && ktval < ktBins[4]) {
666664
ktbinval = 3;
665+
} else if (ktval >= ktBins[4] && ktval < ktBins[5]) {
666+
ktbinval = 4;
667667
}
668668

669669
auto deta = part1.eta() - part2.eta();
@@ -676,16 +676,6 @@ class FemtoUniverseDetaDphiStar
676676
LOG(fatal) << "FemtoUniverseDetaDphiStar: passed arguments don't agree with FemtoUniverseDetaDphiStar's type of events! Please provide same or mixed.";
677677
}
678678

679-
if (std::pow(dphiAvg, 2) / std::pow(cutDeltaPhiStarMaxVector[ktbinval], 2) + std::pow(deta, 2) / std::pow(cutDeltaEtaMaxVector[ktbinval], 2) > 1.) {
680-
if (ChosenEventType == femto_universe_container::EventType::same) {
681-
histdetadphisameafterkT[ktbinval]->Fill(deta, dphiAvg);
682-
} else if (ChosenEventType == femto_universe_container::EventType::mixed) {
683-
histdetadphimixedafterkT[ktbinval]->Fill(deta, dphiAvg);
684-
} else {
685-
LOG(fatal) << "FemtoUniverseDetaDphiStar: passed arguments don't agree with FemtoUniverseDetaDphiStar's type of events! Please provide same or mixed.";
686-
}
687-
}
688-
689679
if (CircCut && (std::pow(dphiAvg, 2) / std::pow(cutDeltaPhiStarMaxVector[ktbinval], 2) + std::pow(deta, 2) / std::pow(cutDeltaEtaMaxVector[ktbinval], 2) < 1.)) {
690680
return true;
691681
} else if (!CircCut && (dphiAvg > cutDeltaPhiStarMinVector[ktbinval]) && (dphiAvg < cutDeltaPhiStarMaxVector[ktbinval]) && (deta > cutDeltaEtaMinVector[ktbinval]) && (deta < cutDeltaEtaMaxVector[ktbinval])) {

PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackSpherHarMultKtExtended.cxx

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -526,7 +526,10 @@ struct femtoUniversePairTaskTrackTrackSpherHarMultKtExtended {
526526
}
527527

528528
float kT = FemtoUniverseMath::getkT(p1, mass1, p2, mass2);
529-
if (kT > ConfKtKstarBins.value.back() || kT < ConfKtKstarBins.value.front())
529+
float lastElement = ConfKtKstarBins.value.back();
530+
float firstRealElement = ConfKtKstarBins.value[1];
531+
532+
if (kT < firstRealElement || kT > lastElement)
530533
continue;
531534

532535
if (twotracksconfigs.ConfIsCPR.value) {
@@ -565,7 +568,10 @@ struct femtoUniversePairTaskTrackTrackSpherHarMultKtExtended {
565568
}
566569

567570
float kT = FemtoUniverseMath::getkT(p1, mass1, p2, mass2);
568-
if (kT > ConfKtKstarBins.value.back() || kT < ConfKtKstarBins.value.front())
571+
float lastElement = ConfKtKstarBins.value.back();
572+
float firstRealElement = ConfKtKstarBins.value[1];
573+
574+
if (kT < firstRealElement || kT > lastElement)
569575
continue;
570576

571577
if (twotracksconfigs.ConfIsCPR.value) {
@@ -944,7 +950,10 @@ struct femtoUniversePairTaskTrackTrackSpherHarMultKtExtended {
944950
}
945951

946952
float kT = FemtoUniverseMath::getkT(p1, mass1, p2, mass2);
947-
if (kT > ConfKtKstarBins.value.back() || kT < ConfKtKstarBins.value.front())
953+
float lastElement = ConfKtKstarBins.value.back();
954+
float firstRealElement = ConfKtKstarBins.value[1];
955+
956+
if (kT < firstRealElement || kT > lastElement)
948957
continue;
949958

950959
if (twotracksconfigs.ConfIsCPR.value) {

0 commit comments

Comments
 (0)