Skip to content

[PWGCF] FemtoUniverse V0 Task -- fixed bugs #14653

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Eloviyo wants to merge 1 commit into from
+21 −20
Closed

[PWGCF] FemtoUniverse V0 Task -- fixed bugs #14653

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
41 changes: 21 additions & 20 deletions PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackV0Extended.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@
continue;

if (ConfV0Selection.confUseStrangenessTOF) {
if (((ConfV0Selection.confV0Type1 == 0) && (part.pidCut() & 3) != 3) || ((ConfV0Selection.confV0Type1 == 1) && (part.pidCut() & 12) != 12) || ((ConfV0Selection.confV0Type1 == 2) && (part.pidCut() & 48) != 48))

Check failure on line 399 in PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackV0Extended.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.
continue;
} else {
if ((posChild.pidCut() & (8u << V0ChildTable[ConfV0Selection.confV0Type1][0])) == 0 || (negChild.pidCut() & (8u << V0ChildTable[ConfV0Selection.confV0Type1][1])) == 0)
Expand Down Expand Up @@ -474,7 +474,7 @@
continue;

if (ConfV0Selection.confUseStrangenessTOF) {
if (((ConfV0Selection.confV0Type1 == 0) && (p2.pidCut() & 3) != 3) || ((ConfV0Selection.confV0Type1 == 1) && (p2.pidCut() & 12) != 12) || ((ConfV0Selection.confV0Type1 == 2) && (p2.pidCut() & 48) != 48))

Check failure on line 477 in PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackV0Extended.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.
continue;
} else {
if ((posChild.pidCut() & (8u << V0ChildTable[ConfV0Selection.confV0Type1][0])) == 0 || (negChild.pidCut() & (8u << V0ChildTable[ConfV0Selection.confV0Type1][1])) == 0)
Expand Down Expand Up @@ -506,60 +506,61 @@
for (const auto& part : groupPartsTwo) {
if (!invMLambda(part.mLambda(), part.mAntiLambda()))
continue;
const auto& posChild = parts.iteratorAt(part.globalIndex() - 2 - parts.begin().globalIndex());
const auto& negChild = parts.iteratorAt(part.globalIndex() - 1 - parts.begin().globalIndex());

const auto& posChild1 = parts.iteratorAt(part.globalIndex() - 2 - parts.begin().globalIndex());
const auto& negChild1 = parts.iteratorAt(part.globalIndex() - 1 - parts.begin().globalIndex());
/// Check daughters of first V0 particle
if constexpr (std::experimental::is_detected<hasSigma, typename PartType::iterator>::value) {
if (!isParticleTPC(posChild, V0ChildTable[ConfV0Selection.confV0Type1][0]) || !isParticleTPC(negChild, V0ChildTable[ConfV0Selection.confV0Type1][1]))
if (!isParticleTPC(posChild1, V0ChildTable[ConfV0Selection.confV0Type1][0]) || !isParticleTPC(negChild1, V0ChildTable[ConfV0Selection.confV0Type1][1]))
continue;
if (!isParticleTOF(posChild, V0ChildTable[ConfV0Selection.confV0Type1][0]) || !isParticleTOF(negChild, V0ChildTable[ConfV0Selection.confV0Type1][1]))
if (!isParticleTOF(posChild1, V0ChildTable[ConfV0Selection.confV0Type1][0]) || !isParticleTOF(negChild1, V0ChildTable[ConfV0Selection.confV0Type1][1]))
continue;
trackHistoV0Type1.fillQABase<false, true>(part, HIST("V0Type1"));
posChildV0Type1.fillQABase<false, true>(posChild, HIST("posChildV0Type1"));
negChildV0Type1.fillQABase<false, true>(negChild, HIST("negChildV0Type1"));
posChildV0Type1.fillQABase<false, true>(posChild1, HIST("posChildV0Type1"));
negChildV0Type1.fillQABase<false, true>(negChild1, HIST("negChildV0Type1"));
} else {
if ((posChild.pidCut() & (1u << V0ChildTable[ConfV0Selection.confV0Type1][0])) == 0 || (negChild.pidCut() & (1u << V0ChildTable[ConfV0Selection.confV0Type1][1])) == 0)
if ((posChild1.pidCut() & (1u << V0ChildTable[ConfV0Selection.confV0Type1][0])) == 0 || (negChild1.pidCut() & (1u << V0ChildTable[ConfV0Selection.confV0Type1][1])) == 0)
continue;
if (ConfV0Selection.confUseStrangenessTOF) {
if (((ConfV0Selection.confV0Type1 == 0) && (part.pidCut() & 3) != 3) || ((ConfV0Selection.confV0Type1 == 1) && (part.pidCut() & 12) != 12) || ((ConfV0Selection.confV0Type1 == 2) && (part.pidCut() & 48) != 48))

Check failure on line 524 in PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackV0Extended.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.
continue;
} else {
if ((posChild.pidCut() & (8u << V0ChildTable[ConfV0Selection.confV0Type1][0])) == 0 || (negChild.pidCut() & (8u << V0ChildTable[ConfV0Selection.confV0Type1][1])) == 0)
if ((posChild1.pidCut() & (8u << V0ChildTable[ConfV0Selection.confV0Type1][0])) == 0 || (negChild1.pidCut() & (8u << V0ChildTable[ConfV0Selection.confV0Type1][1])) == 0)
continue;
}
trackHistoV0Type1.fillQABase<false, false>(part, HIST("V0Type1"));
posChildV0Type1.fillQABase<false, false>(posChild, HIST("posChildV0Type1"));
negChildV0Type1.fillQABase<false, false>(negChild, HIST("negChildV0Type1"));
posChildV0Type1.fillQABase<false, false>(posChild1, HIST("posChildV0Type1"));
negChildV0Type1.fillQABase<false, false>(negChild1, HIST("negChildV0Type1"));
}
qaRegistry.fill(HIST("V0Type1/hInvMassLambdaVsCent"), multCol, part.mLambda());
qaRegistry.fill(HIST("V0Type1/hInvMassAntiLambdaVsCent"), multCol, part.mAntiLambda());
if constexpr (isMC) {
effCorrection.fillRecoHist<ParticleNo::ONE, FilteredFDCollisions>(part, kLambda0);
}

const auto& posChild2 = parts.iteratorAt(part.globalIndex() - 2 - parts.begin().globalIndex());
const auto& negChild2 = parts.iteratorAt(part.globalIndex() - 1 - parts.begin().globalIndex());
/// Check daughters of second V0 particle
if constexpr (std::experimental::is_detected<hasSigma, typename PartType::iterator>::value) {
if (!isParticleTPC(posChild, V0ChildTable[ConfV0Selection.confV0Type2][0]) || !isParticleTPC(negChild, V0ChildTable[ConfV0Selection.confV0Type2][1]))
if (!isParticleTPC(posChild2, V0ChildTable[ConfV0Selection.confV0Type2][0]) || !isParticleTPC(negChild2, V0ChildTable[ConfV0Selection.confV0Type2][1]))
continue;
if (!isParticleTOF(posChild, V0ChildTable[ConfV0Selection.confV0Type2][0]) || !isParticleTOF(negChild, V0ChildTable[ConfV0Selection.confV0Type2][1]))
if (!isParticleTOF(posChild2, V0ChildTable[ConfV0Selection.confV0Type2][0]) || !isParticleTOF(negChild2, V0ChildTable[ConfV0Selection.confV0Type2][1]))
continue;
trackHistoV0Type2.fillQABase<false, true>(part, HIST("V0Type2"));
posChildV0Type2.fillQABase<false, true>(posChild, HIST("posChildV0Type2"));
negChildV0Type2.fillQABase<false, true>(negChild, HIST("negChildV0Type2"));
posChildV0Type2.fillQABase<false, true>(posChild2, HIST("posChildV0Type2"));
negChildV0Type2.fillQABase<false, true>(negChild2, HIST("negChildV0Type2"));
} else {
if ((posChild.pidCut() & (1u << V0ChildTable[ConfV0Selection.confV0Type1][0])) == 0 || (negChild.pidCut() & (1u << V0ChildTable[ConfV0Selection.confV0Type1][1])) == 0)
if ((posChild2.pidCut() & (1u << V0ChildTable[ConfV0Selection.confV0Type2][0])) == 0 || (negChild2.pidCut() & (1u << V0ChildTable[ConfV0Selection.confV0Type2][1])) == 0)
continue;
if (ConfV0Selection.confUseStrangenessTOF) {
if (((ConfV0Selection.confV0Type1 == 0) && (part.pidCut() & 3) != 3) || ((ConfV0Selection.confV0Type1 == 1) && (part.pidCut() & 12) != 12) || ((ConfV0Selection.confV0Type1 == 2) && (part.pidCut() & 48) != 48))
if (((ConfV0Selection.confV0Type2 == 0) && (part.pidCut() & 3) != 3) || ((ConfV0Selection.confV0Type2 == 1) && (part.pidCut() & 12) != 12) || ((ConfV0Selection.confV0Type2 == 2) && (part.pidCut() & 48) != 48))

Check failure on line 555 in PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackV0Extended.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.
continue;
} else {
if ((posChild.pidCut() & (8u << V0ChildTable[ConfV0Selection.confV0Type1][0])) == 0 || (negChild.pidCut() & (8u << V0ChildTable[ConfV0Selection.confV0Type1][1])) == 0)
if ((posChild2.pidCut() & (8u << V0ChildTable[ConfV0Selection.confV0Type2][0])) == 0 || (negChild2.pidCut() & (8u << V0ChildTable[ConfV0Selection.confV0Type2][1])) == 0)
continue;
}
trackHistoV0Type2.fillQABase<false, false>(part, HIST("V0Type2"));
posChildV0Type2.fillQABase<false, false>(posChild, HIST("posChildV0Type2"));
negChildV0Type2.fillQABase<false, false>(negChild, HIST("negChildV0Type2"));
posChildV0Type2.fillQABase<false, false>(posChild2, HIST("posChildV0Type2"));
negChildV0Type2.fillQABase<false, false>(negChild2, HIST("negChildV0Type2"));
}
qaRegistry.fill(HIST("V0Type2/hInvMassLambdaVsCent"), multCol, part.mLambda());
qaRegistry.fill(HIST("V0Type2/hInvMassAntiLambdaVsCent"), multCol, part.mAntiLambda());
Expand Down Expand Up @@ -611,7 +612,7 @@
if ((posChild1.pidCut() & (1u << V0ChildTable[ConfV0Selection.confV0Type1][0])) == 0 || (negChild1.pidCut() & (1u << V0ChildTable[ConfV0Selection.confV0Type1][1])) == 0)
return;
if (ConfV0Selection.confUseStrangenessTOF) {
if (((ConfV0Selection.confV0Type1 == 0) && (p1.pidCut() & 3) != 3) || ((ConfV0Selection.confV0Type1 == 1) && (p1.pidCut() & 12) != 12) || ((ConfV0Selection.confV0Type1 == 2) && (p1.pidCut() & 48) != 48))

Check failure on line 615 in PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackV0Extended.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;
} else {
if ((posChild1.pidCut() & (8u << V0ChildTable[ConfV0Selection.confV0Type1][0])) == 0 || (negChild1.pidCut() & (8u << V0ChildTable[ConfV0Selection.confV0Type1][1])) == 0)
Expand All @@ -631,7 +632,7 @@
if ((posChild2.pidCut() & (1u << V0ChildTable[ConfV0Selection.confV0Type2][0])) == 0 || (negChild2.pidCut() & (1u << V0ChildTable[ConfV0Selection.confV0Type2][1])) == 0)
return;
if (ConfV0Selection.confUseStrangenessTOF) {
if (((ConfV0Selection.confV0Type2 == 0) && (p2.pidCut() & 3) != 3) || ((ConfV0Selection.confV0Type2 == 1) && (p2.pidCut() & 12) != 12) || ((ConfV0Selection.confV0Type2 == 2) && (p2.pidCut() & 48) != 48))

Check failure on line 635 in PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackV0Extended.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;
} else {
if ((posChild2.pidCut() & (8u << V0ChildTable[ConfV0Selection.confV0Type2][0])) == 0 || (negChild2.pidCut() & (8u << V0ChildTable[ConfV0Selection.confV0Type2][1])) == 0)
Expand Down Expand Up @@ -860,7 +861,7 @@
if ((posChild.pidCut() & (1u << V0ChildTable[ConfV0Selection.confV0Type1][0])) == 0 || (negChild.pidCut() & (1u << V0ChildTable[ConfV0Selection.confV0Type1][1])) == 0)
continue;
if (ConfV0Selection.confUseStrangenessTOF) {
if (((ConfV0Selection.confV0Type1 == 0) && (p2.pidCut() & 3) != 3) || ((ConfV0Selection.confV0Type1 == 1) && (p2.pidCut() & 12) != 12) || ((ConfV0Selection.confV0Type1 == 2) && (p2.pidCut() & 48) != 48))

Check failure on line 864 in PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackV0Extended.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.
continue;
} else {
if ((posChild.pidCut() & (8u << V0ChildTable[ConfV0Selection.confV0Type1][0])) == 0 || (negChild.pidCut() & (8u << V0ChildTable[ConfV0Selection.confV0Type1][1])) == 0)
Expand Down Expand Up @@ -943,7 +944,7 @@
if ((posChild1.pidCut() & (1u << V0ChildTable[ConfV0Selection.confV0Type1][0])) == 0 || (negChild1.pidCut() & (1u << V0ChildTable[ConfV0Selection.confV0Type1][1])) == 0)
continue;
if (ConfV0Selection.confUseStrangenessTOF) {
if (((ConfV0Selection.confV0Type1 == 0) && (p1.pidCut() & 3) != 3) || ((ConfV0Selection.confV0Type1 == 1) && (p1.pidCut() & 12) != 12) || ((ConfV0Selection.confV0Type1 == 2) && (p1.pidCut() & 48) != 48))

Check failure on line 947 in PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackV0Extended.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.
continue;
} else {
if ((posChild1.pidCut() & (8u << V0ChildTable[ConfV0Selection.confV0Type1][0])) == 0 || (negChild1.pidCut() & (8u << V0ChildTable[ConfV0Selection.confV0Type1][1])) == 0)
Expand All @@ -963,7 +964,7 @@
if ((posChild2.pidCut() & (1u << V0ChildTable[ConfV0Selection.confV0Type2][0])) == 0 || (negChild2.pidCut() & (1u << V0ChildTable[ConfV0Selection.confV0Type2][1])) == 0)
continue;
if (ConfV0Selection.confUseStrangenessTOF) {
if (((ConfV0Selection.confV0Type2 == 0) && (p2.pidCut() & 3) != 3) || ((ConfV0Selection.confV0Type2 == 1) && (p2.pidCut() & 12) != 12) || ((ConfV0Selection.confV0Type2 == 2) && (p2.pidCut() & 48) != 48))

Check failure on line 967 in PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackV0Extended.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.
continue;
} else {
if ((posChild2.pidCut() & (8u << V0ChildTable[ConfV0Selection.confV0Type2][0])) == 0 || (negChild2.pidCut() & (8u << V0ChildTable[ConfV0Selection.confV0Type2][1])) == 0)
Expand Down
Loading