From eea454e9b7a012aad37602e470709ede592aad1a Mon Sep 17 00:00:00 2001 From: Zuzanna Chochulska Date: Fri, 17 Jan 2025 13:58:15 +0000 Subject: [PATCH 1/2] Fix of the delta phi wraping --- PWGCF/FemtoUniverse/Core/FemtoUniverseContainer.h | 7 ++++++- .../FemtoUniverse/Tasks/femtoUniversePairTaskTrackPhi.cxx | 8 ++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/PWGCF/FemtoUniverse/Core/FemtoUniverseContainer.h b/PWGCF/FemtoUniverse/Core/FemtoUniverseContainer.h index ceacc7fbf3e..bd6484abcd7 100644 --- a/PWGCF/FemtoUniverse/Core/FemtoUniverseContainer.h +++ b/PWGCF/FemtoUniverse/Core/FemtoUniverseContainer.h @@ -175,7 +175,12 @@ class FemtoUniverseContainer deltaEta = part1.eta() - part2.eta(); deltaPhi = part1.phi() - part2.phi(); - deltaPhi = RecoDecay::constrainAngle(deltaPhi, 0); + while (deltaPhi < mPhiLow) { + deltaPhi += o2::constants::math::TwoPI; + } + while (deltaPhi > mPhiHigh) { + deltaPhi -= o2::constants::math::TwoPI; + } mHistogramRegistry->fill(HIST(FolderSuffix[EventType]) + HIST(o2::aod::femtouniverse_mc_particle::MCTypeName[mc]) + HIST("/relPairDist"), femtoObs, weight); mHistogramRegistry->fill(HIST(FolderSuffix[EventType]) + HIST(o2::aod::femtouniverse_mc_particle::MCTypeName[mc]) + HIST("/relPairkT"), kT, weight); diff --git a/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackPhi.cxx b/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackPhi.cxx index 1e6ac733864..7840c216d04 100644 --- a/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackPhi.cxx +++ b/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackPhi.cxx @@ -454,14 +454,14 @@ struct FemtoUniversePairTaskTrackPhi { registryMCreco.add("MCrecoPpos", "MC reco proton;#it{p}_{T} (GeV/c); #eta", {HistType::kTH2F, {{500, 0, 5}, {400, -1.0, 1.0}}}); registryMCreco.add("MCrecoPneg", "MC reco antiproton;#it{p}_{T} (GeV/c); #eta", {HistType::kTH2F, {{500, 0, 5}, {400, -1.0, 1.0}}}); - trackHistoPartPhi.init(&qaRegistry, confBinsTempFitVarpT.value, confBinsTempFitVarInvMass.value, ConfBothTracks.confIsMC.value, 333); - trackHistoPartTrack.init(&qaRegistry, confBinsTempFitVarpT.value, confBinsTempFitVar.value, ConfBothTracks.confIsMC.value, ConfTrack.confTrackPDGCode.value); + trackHistoPartPhi.init(&qaRegistry, confBinsTempFitVarpT, confBinsTempFitVarInvMass, ConfBothTracks.confIsMC.value, 333); + trackHistoPartTrack.init(&qaRegistry, confBinsTempFitVarpT, confBinsTempFitVar, ConfBothTracks.confIsMC.value, ConfTrack.confTrackPDGCode.value); mixQaRegistry.add("MixingQA/hSECollisionBins", ";bin;Entries", kTH1F, {{120, -0.5, 119.5}}); mixQaRegistry.add("MixingQA/hMECollisionBins", ";bin;Entries", kTH1F, {{120, -0.5, 119.5}}); - sameEventAngularCont.init(&resultRegistry, confBinskstar.value, confBinsMult.value, confBinskT.value, confBinsmT.value, confBins3Dmult.value, confBins3DmT.value, ConfBothTracks.confBinsEta.value, ConfBothTracks.confBinsPhi.value, ConfBothTracks.confIsMC.value, ConfBothTracks.confUse3D.value); - mixedEventAngularCont.init(&resultRegistry, confBinskstar.value, confBinsMult.value, confBinskT.value, confBinsmT.value, confBins3Dmult.value, confBins3DmT.value, ConfBothTracks.confBinsEta.value, ConfBothTracks.confBinsPhi.value, ConfBothTracks.confIsMC.value, ConfBothTracks.confUse3D.value); + sameEventAngularCont.init(&resultRegistry, confBinskstar, confBinsMult, confBinskT, confBinsmT, confBins3Dmult, confBins3DmT, ConfBothTracks.confBinsEta, ConfBothTracks.confBinsPhi, ConfBothTracks.confIsMC, ConfBothTracks.confUse3D); + mixedEventAngularCont.init(&resultRegistry, confBinskstar, confBinsMult, confBinskT, confBinsmT, confBins3Dmult, confBins3DmT, ConfBothTracks.confBinsEta, ConfBothTracks.confBinsPhi, ConfBothTracks.confIsMC, ConfBothTracks.confUse3D); sameEventAngularCont.setPDGCodes(333, ConfTrack.confTrackPDGCode.value); mixedEventAngularCont.setPDGCodes(333, ConfTrack.confTrackPDGCode.value); From 459a823f71e0eea3a897e9eda4aa0bab3f673266 Mon Sep 17 00:00:00 2001 From: Zuzanna Chochulska Date: Sat, 18 Jan 2025 19:32:12 +0000 Subject: [PATCH 2/2] fix --- PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackPhi.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackPhi.cxx b/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackPhi.cxx index 7840c216d04..a2f290f6fd5 100644 --- a/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackPhi.cxx +++ b/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackPhi.cxx @@ -63,9 +63,9 @@ struct FemtoUniversePairTaskTrackPhi { Service pdgMC; - using FemtoFullParticles = soa::Join; - Filter trackCutFilter = requireGlobalTrackInFilter(); - using FilteredFemtoFullParticles = soa::Filtered; + // using FemtoFullParticles = soa::Join; + // Filter trackCutFilter = requireGlobalTrackInFilter(); + using FilteredFemtoFullParticles = soa::Join; SliceCache cache; Preslice perCol = aod::femtouniverseparticle::fdCollisionId;