From bf214989a9bafb5c66945ad578d81d31f18161a8 Mon Sep 17 00:00:00 2001 From: Zuzanna Chochulska Date: Thu, 24 Aug 2023 14:27:17 +0200 Subject: [PATCH 1/4] Fixing clang --- .../Tasks/femtoUniversePairTaskTrackTrackMcTruth.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackMcTruth.cxx b/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackMcTruth.cxx index a7dab8bc872..71cbb349b22 100644 --- a/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackMcTruth.cxx +++ b/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackMcTruth.cxx @@ -189,7 +189,7 @@ struct femtoUniversePairTaskTrackTrackMcTruth { auto thegroupPartsOne = partsOne->sliceByCached(aod::femtouniverseparticle::fdCollisionId, col.globalIndex(), cache); auto thegroupPartsTwo = partsTwo->sliceByCached(aod::femtouniverseparticle::fdCollisionId, col.globalIndex(), cache); - doSameEvent(thegroupPartsOne, thegroupPartsTwo, parts, col.magField(), col.multNtr()); + doSameEvent(thegroupPartsOne, thegroupPartsTwo, parts, col.magField(), col.multNtr()); } PROCESS_SWITCH(femtoUniversePairTaskTrackTrackMcTruth, processSameEvent, "Enable processing same event", true); @@ -236,7 +236,7 @@ struct femtoUniversePairTaskTrackTrackMcTruth { /// \todo before mixing we should check whether both collisions contain a pair of particles! // if (partsOne.size() == 0 || nPart2Evt1 == 0 || nPart1Evt2 == 0 || partsTwo.size() == 0 ) continue; - doMixedEvent(groupPartsOne, groupPartsTwo, parts, magFieldTesla1, multiplicityCol); + doMixedEvent(groupPartsOne, groupPartsTwo, parts, magFieldTesla1, multiplicityCol); } } PROCESS_SWITCH(femtoUniversePairTaskTrackTrackMcTruth, processMixedEvent, "Enable processing mixed events", true); From bcb41d370372ec9d59c39702fca146cb7379ca43 Mon Sep 17 00:00:00 2001 From: Zuzanna Chochulska Date: Thu, 24 Aug 2023 14:29:31 +0200 Subject: [PATCH 2/4] Fixing clang (2) --- .../Tasks/femtoUniversePairTaskTrackTrackMcTruth.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackMcTruth.cxx b/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackMcTruth.cxx index 71cbb349b22..a7dab8bc872 100644 --- a/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackMcTruth.cxx +++ b/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackMcTruth.cxx @@ -189,7 +189,7 @@ struct femtoUniversePairTaskTrackTrackMcTruth { auto thegroupPartsOne = partsOne->sliceByCached(aod::femtouniverseparticle::fdCollisionId, col.globalIndex(), cache); auto thegroupPartsTwo = partsTwo->sliceByCached(aod::femtouniverseparticle::fdCollisionId, col.globalIndex(), cache); - doSameEvent(thegroupPartsOne, thegroupPartsTwo, parts, col.magField(), col.multNtr()); + doSameEvent(thegroupPartsOne, thegroupPartsTwo, parts, col.magField(), col.multNtr()); } PROCESS_SWITCH(femtoUniversePairTaskTrackTrackMcTruth, processSameEvent, "Enable processing same event", true); @@ -236,7 +236,7 @@ struct femtoUniversePairTaskTrackTrackMcTruth { /// \todo before mixing we should check whether both collisions contain a pair of particles! // if (partsOne.size() == 0 || nPart2Evt1 == 0 || nPart1Evt2 == 0 || partsTwo.size() == 0 ) continue; - doMixedEvent(groupPartsOne, groupPartsTwo, parts, magFieldTesla1, multiplicityCol); + doMixedEvent(groupPartsOne, groupPartsTwo, parts, magFieldTesla1, multiplicityCol); } } PROCESS_SWITCH(femtoUniversePairTaskTrackTrackMcTruth, processMixedEvent, "Enable processing mixed events", true); From ce6ef31e10a757ac29317373422bc41eb283591a Mon Sep 17 00:00:00 2001 From: Zuzanna Chochulska Date: Mon, 4 Sep 2023 09:18:41 +0200 Subject: [PATCH 3/4] Cut on charge of the daughters --- .../femtoUniverseProducerTask.cxx | 4 +++ .../Tasks/femtoUniversePairTaskTrackPhi.cxx | 28 +++++++++---------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/PWGCF/FemtoUniverse/TableProducer/femtoUniverseProducerTask.cxx b/PWGCF/FemtoUniverse/TableProducer/femtoUniverseProducerTask.cxx index de72f829bc4..935ac131339 100644 --- a/PWGCF/FemtoUniverse/TableProducer/femtoUniverseProducerTask.cxx +++ b/PWGCF/FemtoUniverse/TableProducer/femtoUniverseProducerTask.cxx @@ -691,6 +691,10 @@ struct femtoUniverseProducerTask { if (!(IsKaonNSigma(p2.pt(), trackCuts.getNsigmaTPC(p2, o2::track::PID::Kaon), trackCuts.getNsigmaTOF(p2, o2::track::PID::Kaon)))) { continue; } + else if((!(p1.sign() == 1)) || (!(p2.sign() == -1))){ + continue; + } + TLorentzVector part1Vec; TLorentzVector part2Vec; diff --git a/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackPhi.cxx b/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackPhi.cxx index 214b1dc9f2d..53572357f23 100644 --- a/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackPhi.cxx +++ b/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackPhi.cxx @@ -376,17 +376,17 @@ struct femtoUniversePairTaskTrackPhi { continue; } } - // Close Pair Rejection - if (ConfIsCPR.value) { - if (pairCloseRejection.isClosePair(track, phicandidate, parts, magFieldTesla)) { - continue; - } - } + // // Close Pair Rejection + // if (ConfIsCPR.value) { + // if (pairCloseRejection.isClosePair(track, phicandidate, parts, magFieldTesla)) { + // continue; + // } + // } - // Track Cleaning - if (!pairCleaner.isCleanPair(track, phicandidate, parts)) { - continue; - } + // // Track Cleaning + // if (!pairCleaner.isCleanPair(track, phicandidate, parts)) { + // continue; + // } sameEventFemtoCont.setPair(track, phicandidate, multCol, ConfBothTracks.ConfUse3D); sameEventAngularCont.setPair(track, phicandidate, multCol, ConfBothTracks.ConfUse3D); } @@ -465,10 +465,10 @@ struct femtoUniversePairTaskTrackPhi { continue; } } - // // if (ConfIsCPR.value) { - if (pairCloseRejection.isClosePair(track, phicandidate, parts, magFieldTesla)) { - continue; - } + // if (ConfIsCPR.value) { + // if (pairCloseRejection.isClosePair(track, phicandidate, parts, magFieldTesla)) { + // continue; + // } // } mixedEventFemtoCont.setPair(track, phicandidate, multCol, ConfBothTracks.ConfUse3D); From f77c7a6fd855543b6978bff450e801d99f4e3081 Mon Sep 17 00:00:00 2001 From: Zuzanna Chochulska Date: Mon, 4 Sep 2023 09:24:12 +0200 Subject: [PATCH 4/4] Fix clang --- .../FemtoUniverse/TableProducer/femtoUniverseProducerTask.cxx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/PWGCF/FemtoUniverse/TableProducer/femtoUniverseProducerTask.cxx b/PWGCF/FemtoUniverse/TableProducer/femtoUniverseProducerTask.cxx index 935ac131339..3f95a44f8ea 100644 --- a/PWGCF/FemtoUniverse/TableProducer/femtoUniverseProducerTask.cxx +++ b/PWGCF/FemtoUniverse/TableProducer/femtoUniverseProducerTask.cxx @@ -690,11 +690,9 @@ struct femtoUniverseProducerTask { } if (!(IsKaonNSigma(p2.pt(), trackCuts.getNsigmaTPC(p2, o2::track::PID::Kaon), trackCuts.getNsigmaTOF(p2, o2::track::PID::Kaon)))) { continue; - } - else if((!(p1.sign() == 1)) || (!(p2.sign() == -1))){ + } else if ((!(p1.sign() == 1)) || (!(p2.sign() == -1))) { continue; } - TLorentzVector part1Vec; TLorentzVector part2Vec;