Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,8 @@
Configurable<bool> confIsCPRkT{"confIsCPRkT", true, "kT dependent deltaEta-deltaPhi cut for Close Pair Rejection"};
Configurable<float> confCPRChosenRadii{"confCPRChosenRadii", 0.80, "Delta Eta cut for Close Pair Rejection"};
Configurable<bool> confUseCCImCut{"confUseCCImCut", false, "Fill SH within specific quadrants of qout-qside"};
Configurable<bool> confUseMinqTcut{"confUseMinqTcut", false, "Fill SH with min. qT cut"};
Configurable<float> confMinqTcut{"confMinqTcut", 0.005, "Min. qT cut on filling SH"};
Configurable<bool> confUse1stand3rd{"confUse1stand3rd", false, "Use first and third quadrants of qout-qside"};
Configurable<bool> confUse2ndand4th{"confUse2ndand4th", false, "Use second and fourth quadrants of qout-qside"};
} twotracksconfigs;
Expand Down Expand Up @@ -284,34 +286,34 @@

bool IsKaonNSigma(float mom, float nsigmaTPCK, float nsigmaTOFK)
{
if (mom < 0.3) { // 0.0-0.3

Check failure on line 289 in PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackSpherHarMultKtExtended.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number]

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
if (std::abs(nsigmaTPCK) < 3.0) {

Check failure on line 290 in PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackSpherHarMultKtExtended.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number]

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
return true;
} else {
return false;
}
} else if (mom < 0.45) { // 0.30 - 0.45

Check failure on line 295 in PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackSpherHarMultKtExtended.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number]

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
if (std::abs(nsigmaTPCK) < 2.0) {

Check failure on line 296 in PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackSpherHarMultKtExtended.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number]

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
return true;
} else {
return false;
}
} else if (mom < 0.55) { // 0.45-0.55

Check failure on line 301 in PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackSpherHarMultKtExtended.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number]

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
if (std::abs(nsigmaTPCK) < 1.0) {
return true;
} else {
return false;
}
} else if (mom < 1.5) { // 0.55-1.5 (now we use TPC and TOF)

Check failure on line 307 in PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackSpherHarMultKtExtended.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number]

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
if ((std::abs(nsigmaTOFK) < 3.0) && (std::abs(nsigmaTPCK) < 3.0)) {

Check failure on line 308 in PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackSpherHarMultKtExtended.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number]

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
{
return true;
}
} else {
return false;
}
} else if (mom > 1.5) { // 1.5 -

Check failure on line 315 in PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackSpherHarMultKtExtended.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number]

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
if ((std::abs(nsigmaTOFK) < 2.0) && (std::abs(nsigmaTPCK) < 3.0)) {

Check failure on line 316 in PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackSpherHarMultKtExtended.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number]

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
return true;
} else {
return false;
Expand Down Expand Up @@ -376,7 +378,7 @@
return false;
}
return false;
} else if (particle_number == 2) {

Check failure on line 381 in PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackSpherHarMultKtExtended.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number]

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
switch (tracktwofilter.confPDGCodePartTwo) {
case 2212: // Proton
case -2212: // Antiproton
Expand Down Expand Up @@ -600,13 +602,20 @@
std::vector<double> f3d;
double kv;
float outsideref = 0.0;

float qTmin = 0.0;
switch (ContType) {
case 2: {
if (rand > 0.5) {
f3d = FemtoUniverseMath::newpairfunc(p1, mass1, p2, mass2, confIsIden);
qTmin = std::sqrt(f3d[1] * f3d[1] + f3d[2] * f3d[2]);
if (!twotracksconfigs.confUseCCImCut) {
sameEventMultContPP.fillMultNumDen(p1, p2, femto_universe_sh_container::EventType::same, 2, multCol, kT, confIsIden);
if (!twotracksconfigs.confUseMinqTcut) {
sameEventMultContPP.fillMultNumDen(p1, p2, femto_universe_sh_container::EventType::same, 2, multCol, kT, confIsIden);
} else {
if (qTmin > twotracksconfigs.confMinqTcut) {
sameEventMultContPP.fillMultNumDen(p1, p2, femto_universe_sh_container::EventType::same, 2, multCol, kT, confIsIden);
}
}
} else {
if (twotracksconfigs.confUse1stand3rd) {
if ((f3d[1] >= outsideref && f3d[2] >= outsideref) || (f3d[1] < outsideref && f3d[2] < outsideref)) {
Expand All @@ -624,8 +633,15 @@
}
} else if (rand <= 0.5) {
f3d = FemtoUniverseMath::newpairfunc(p2, mass2, p1, mass1, confIsIden);
qTmin = std::sqrt(f3d[1] * f3d[1] + f3d[2] * f3d[2]);
if (!twotracksconfigs.confUseCCImCut) {
sameEventMultContPP.fillMultNumDen(p2, p1, femto_universe_sh_container::EventType::same, 2, multCol, kT, confIsIden);
if (!twotracksconfigs.confUseMinqTcut) {
sameEventMultContPP.fillMultNumDen(p2, p1, femto_universe_sh_container::EventType::same, 2, multCol, kT, confIsIden);
} else {
if (qTmin > twotracksconfigs.confMinqTcut) {
sameEventMultContPP.fillMultNumDen(p2, p1, femto_universe_sh_container::EventType::same, 2, multCol, kT, confIsIden);
}
}
} else {
if (twotracksconfigs.confUse1stand3rd) {
if ((f3d[1] >= outsideref && f3d[2] >= outsideref) || (f3d[1] < outsideref && f3d[2] < outsideref)) {
Expand All @@ -652,8 +668,15 @@
case 3: {
if (rand > 0.5) {
f3d = FemtoUniverseMath::newpairfunc(p1, mass1, p2, mass2, confIsIden);
qTmin = std::sqrt(f3d[1] * f3d[1] + f3d[2] * f3d[2]);
if (!twotracksconfigs.confUseCCImCut) {
sameEventMultContMM.fillMultNumDen(p1, p2, femto_universe_sh_container::EventType::same, 2, multCol, kT, confIsIden);
if (!twotracksconfigs.confUseMinqTcut) {
sameEventMultContMM.fillMultNumDen(p1, p2, femto_universe_sh_container::EventType::same, 2, multCol, kT, confIsIden);
} else {
if (qTmin > twotracksconfigs.confMinqTcut) {
sameEventMultContMM.fillMultNumDen(p1, p2, femto_universe_sh_container::EventType::same, 2, multCol, kT, confIsIden);
}
}
} else {
if (twotracksconfigs.confUse1stand3rd) {
if ((f3d[1] >= outsideref && f3d[2] >= outsideref) || (f3d[1] < outsideref && f3d[2] < outsideref)) {
Expand All @@ -671,8 +694,15 @@
}
} else if (rand <= 0.5) {
f3d = FemtoUniverseMath::newpairfunc(p2, mass2, p1, mass1, confIsIden);
qTmin = std::sqrt(f3d[1] * f3d[1] + f3d[2] * f3d[2]);
if (!twotracksconfigs.confUseCCImCut) {
sameEventMultContMM.fillMultNumDen(p2, p1, femto_universe_sh_container::EventType::same, 2, multCol, kT, confIsIden);
if (!twotracksconfigs.confUseMinqTcut) {
sameEventMultContMM.fillMultNumDen(p2, p1, femto_universe_sh_container::EventType::same, 2, multCol, kT, confIsIden);
} else {
if (qTmin > twotracksconfigs.confMinqTcut) {
sameEventMultContMM.fillMultNumDen(p2, p1, femto_universe_sh_container::EventType::same, 2, multCol, kT, confIsIden);
}
}
} else {
if (twotracksconfigs.confUse1stand3rd) {
if ((f3d[1] >= outsideref && f3d[2] >= outsideref) || (f3d[1] < outsideref && f3d[2] < outsideref)) {
Expand Down Expand Up @@ -977,6 +1007,7 @@
std::vector<double> f3d;
double kv;
float outsideref = 0.0;
float qTmin = 0.0;

switch (ContType) {
case 1: {
Expand All @@ -991,8 +1022,15 @@
case 2: {
if (rand > 0.5) {
f3d = FemtoUniverseMath::newpairfunc(p1, mass1, p2, mass2, confIsIden);
qTmin = std::sqrt(f3d[1] * f3d[1] + f3d[2] * f3d[2]);
if (!twotracksconfigs.confUseCCImCut) {
mixedEventMultContPP.fillMultNumDen(p1, p2, femto_universe_sh_container::EventType::mixed, 2, multCol, kT, confIsIden);
if (!twotracksconfigs.confUseMinqTcut) {
mixedEventMultContPP.fillMultNumDen(p1, p2, femto_universe_sh_container::EventType::mixed, 2, multCol, kT, confIsIden);
} else {
if (qTmin > twotracksconfigs.confMinqTcut) {
mixedEventMultContPP.fillMultNumDen(p1, p2, femto_universe_sh_container::EventType::mixed, 2, multCol, kT, confIsIden);
}
}
} else {
if (twotracksconfigs.confUse1stand3rd) {
if ((f3d[1] >= outsideref && f3d[2] >= outsideref) || (f3d[1] < outsideref && f3d[2] < outsideref)) {
Expand All @@ -1006,8 +1044,15 @@
}
} else {
f3d = FemtoUniverseMath::newpairfunc(p2, mass2, p1, mass1, confIsIden);
qTmin = std::sqrt(f3d[1] * f3d[1] + f3d[2] * f3d[2]);
if (!twotracksconfigs.confUseCCImCut) {
mixedEventMultContPP.fillMultNumDen(p2, p1, femto_universe_sh_container::EventType::mixed, 2, multCol, kT, confIsIden);
if (!twotracksconfigs.confUseMinqTcut) {
mixedEventMultContPP.fillMultNumDen(p2, p1, femto_universe_sh_container::EventType::mixed, 2, multCol, kT, confIsIden);
} else {
if (qTmin > twotracksconfigs.confMinqTcut) {
mixedEventMultContPP.fillMultNumDen(p2, p1, femto_universe_sh_container::EventType::mixed, 2, multCol, kT, confIsIden);
}
}
} else {
if (twotracksconfigs.confUse1stand3rd) {
if ((f3d[1] >= outsideref && f3d[2] >= outsideref) || (f3d[1] < outsideref && f3d[2] < outsideref)) {
Expand All @@ -1030,8 +1075,15 @@
case 3: {
if (rand > 0.5) {
f3d = FemtoUniverseMath::newpairfunc(p1, mass1, p2, mass2, confIsIden);
qTmin = std::sqrt(f3d[1] * f3d[1] + f3d[2] * f3d[2]);
if (!twotracksconfigs.confUseCCImCut) {
mixedEventMultContMM.fillMultNumDen(p1, p2, femto_universe_sh_container::EventType::mixed, 2, multCol, kT, confIsIden);
if (!twotracksconfigs.confUseMinqTcut) {
mixedEventMultContMM.fillMultNumDen(p1, p2, femto_universe_sh_container::EventType::mixed, 2, multCol, kT, confIsIden);
} else {
if (qTmin > twotracksconfigs.confMinqTcut) {
mixedEventMultContMM.fillMultNumDen(p1, p2, femto_universe_sh_container::EventType::mixed, 2, multCol, kT, confIsIden);
}
}
} else {
if (twotracksconfigs.confUse1stand3rd) {
if ((f3d[1] >= outsideref && f3d[2] >= outsideref) || (f3d[1] < outsideref && f3d[2] < outsideref)) {
Expand All @@ -1045,8 +1097,15 @@
}
} else {
f3d = FemtoUniverseMath::newpairfunc(p2, mass2, p1, mass1, confIsIden);
qTmin = std::sqrt(f3d[1] * f3d[1] + f3d[2] * f3d[2]);
if (!twotracksconfigs.confUseCCImCut) {
mixedEventMultContMM.fillMultNumDen(p2, p1, femto_universe_sh_container::EventType::mixed, 2, multCol, kT, confIsIden);
if (!twotracksconfigs.confUseMinqTcut) {
mixedEventMultContMM.fillMultNumDen(p2, p1, femto_universe_sh_container::EventType::mixed, 2, multCol, kT, confIsIden);
} else {
if (qTmin > twotracksconfigs.confMinqTcut) {
mixedEventMultContMM.fillMultNumDen(p2, p1, femto_universe_sh_container::EventType::mixed, 2, multCol, kT, confIsIden);
}
}
} else {
if (twotracksconfigs.confUse1stand3rd) {
if ((f3d[1] >= outsideref && f3d[2] >= outsideref) || (f3d[1] < outsideref && f3d[2] < outsideref)) {
Expand Down
Loading