From e95d63d73c7707924e6172e01bbfb0649a5ab340 Mon Sep 17 00:00:00 2001 From: josue-MiniPC-Ubuntu Date: Wed, 29 Oct 2025 14:43:29 -0600 Subject: [PATCH 1/8] taking off the NUA correction and adding new histos for correlation --- PWGUD/Tasks/upcPhotonuclearAnalysisJMG.cxx | 1 + 1 file changed, 1 insertion(+) diff --git a/PWGUD/Tasks/upcPhotonuclearAnalysisJMG.cxx b/PWGUD/Tasks/upcPhotonuclearAnalysisJMG.cxx index 0ae2035f93a..f9bbd2222ba 100644 --- a/PWGUD/Tasks/upcPhotonuclearAnalysisJMG.cxx +++ b/PWGUD/Tasks/upcPhotonuclearAnalysisJMG.cxx @@ -361,6 +361,7 @@ struct UpcPhotonuclearAnalysisJMG { // mixedGapSideA.setObject(new CorrelationContainer("mixedEventGapSideA", "mixedEventGapSideA", corrAxis, effAxis, {})); // sameGapSideC.setObject(new CorrelationContainer("sameEventGapSideC", "sameEventGapSideC", corrAxis, effAxis, {})); // mixedGapSideC.setObject(new CorrelationContainer("mixedEventGapSideC", "mixedEventGapSideC", corrAxis, effAxis, {})); + } std::vector vtxBinsEdges{VARIABLE_WIDTH, -10.0f, -7.0f, -5.0f, -2.5f, 0.0f, 2.5f, 5.0f, 7.0f, 10.0f}; From d8ec5d477513713cb64a13b4d795c8d43c83cc2a Mon Sep 17 00:00:00 2001 From: josue-MiniPC-Ubuntu Date: Wed, 29 Oct 2025 14:48:49 -0600 Subject: [PATCH 2/8] taking off the NUA correction and adding new histos for correlation --- PWGUD/Tasks/upcPhotonuclearAnalysisJMG.cxx | 1 - 1 file changed, 1 deletion(-) diff --git a/PWGUD/Tasks/upcPhotonuclearAnalysisJMG.cxx b/PWGUD/Tasks/upcPhotonuclearAnalysisJMG.cxx index f9bbd2222ba..0ae2035f93a 100644 --- a/PWGUD/Tasks/upcPhotonuclearAnalysisJMG.cxx +++ b/PWGUD/Tasks/upcPhotonuclearAnalysisJMG.cxx @@ -361,7 +361,6 @@ struct UpcPhotonuclearAnalysisJMG { // mixedGapSideA.setObject(new CorrelationContainer("mixedEventGapSideA", "mixedEventGapSideA", corrAxis, effAxis, {})); // sameGapSideC.setObject(new CorrelationContainer("sameEventGapSideC", "sameEventGapSideC", corrAxis, effAxis, {})); // mixedGapSideC.setObject(new CorrelationContainer("mixedEventGapSideC", "mixedEventGapSideC", corrAxis, effAxis, {})); - } std::vector vtxBinsEdges{VARIABLE_WIDTH, -10.0f, -7.0f, -5.0f, -2.5f, 0.0f, 2.5f, 5.0f, 7.0f, 10.0f}; From 9cc6a880e6c5943e3276a339b348701449d0c778 Mon Sep 17 00:00:00 2001 From: Josue Martinez Garcia Date: Fri, 7 Nov 2025 00:11:56 -0600 Subject: [PATCH 3/8] adding a basis task for two particle correlation for pp --- PWGCF/TwoParticleCorrelations/Tasks/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/PWGCF/TwoParticleCorrelations/Tasks/CMakeLists.txt b/PWGCF/TwoParticleCorrelations/Tasks/CMakeLists.txt index cc11633c634..893100527a0 100644 --- a/PWGCF/TwoParticleCorrelations/Tasks/CMakeLists.txt +++ b/PWGCF/TwoParticleCorrelations/Tasks/CMakeLists.txt @@ -79,7 +79,11 @@ o2physics_add_dpl_workflow(long-range-dihadron-cor COMPONENT_NAME Analysis) o2physics_add_dpl_workflow(two-particle-correlation-pp +<<<<<<< HEAD SOURCES twoParticleCorrelationPp.cxx +======= + SOURCES twoParticleCorrelationpp.cxx +>>>>>>> 60963c422 (adding a basis task for two particle correlation for pp) PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2Physics::PWGCFCore COMPONENT_NAME Analysis) From 8a5a87c64a229a35b00125585da6970b42ed35d1 Mon Sep 17 00:00:00 2001 From: Josue Martinez Garcia Date: Tue, 11 Nov 2025 01:01:22 -0600 Subject: [PATCH 4/8] resolving o2 linter issues --- PWGCF/TwoParticleCorrelations/Tasks/CMakeLists.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/PWGCF/TwoParticleCorrelations/Tasks/CMakeLists.txt b/PWGCF/TwoParticleCorrelations/Tasks/CMakeLists.txt index 893100527a0..cc11633c634 100644 --- a/PWGCF/TwoParticleCorrelations/Tasks/CMakeLists.txt +++ b/PWGCF/TwoParticleCorrelations/Tasks/CMakeLists.txt @@ -79,11 +79,7 @@ o2physics_add_dpl_workflow(long-range-dihadron-cor COMPONENT_NAME Analysis) o2physics_add_dpl_workflow(two-particle-correlation-pp -<<<<<<< HEAD SOURCES twoParticleCorrelationPp.cxx -======= - SOURCES twoParticleCorrelationpp.cxx ->>>>>>> 60963c422 (adding a basis task for two particle correlation for pp) PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2Physics::PWGCFCore COMPONENT_NAME Analysis) From 16aea8c48c58f9b1bf2efb7837d34383b9b4233c Mon Sep 17 00:00:00 2001 From: rolavick Date: Thu, 19 Mar 2026 09:34:03 +0100 Subject: [PATCH 5/8] Dummy commit to restart tests From 76324fc476f9bd2f6544ee336b67c906474ca2a2 Mon Sep 17 00:00:00 2001 From: Josue Martinez Garcia Date: Thu, 28 May 2026 22:16:36 -0600 Subject: [PATCH 6/8] adding PID checks --- PWGUD/Tasks/upcPhotonuclearAnalysisJMG.cxx | 99 +++++++++++++++++++--- 1 file changed, 85 insertions(+), 14 deletions(-) diff --git a/PWGUD/Tasks/upcPhotonuclearAnalysisJMG.cxx b/PWGUD/Tasks/upcPhotonuclearAnalysisJMG.cxx index 0ae2035f93a..65c510e1058 100644 --- a/PWGUD/Tasks/upcPhotonuclearAnalysisJMG.cxx +++ b/PWGUD/Tasks/upcPhotonuclearAnalysisJMG.cxx @@ -60,8 +60,11 @@ DECLARE_SOA_COLUMN(EnergyZNC, energyZNC, float); DECLARE_SOA_COLUMN(AmplitudeFV0A, amplitudeFV0A, float); DECLARE_SOA_COLUMN(Occupancy, occupancy, float); DECLARE_SOA_COLUMN(UPCMode, upcMode, float); +DECLARE_SOA_COLUMN(PVz, pvz, float); DECLARE_SOA_COLUMN(PtSideA, ptSideA, std::vector); -DECLARE_SOA_COLUMN(RapSideA, rapSideA, std::vector); +DECLARE_SOA_COLUMN(PSideA, pSideA, std::vector); +DECLARE_SOA_COLUMN(ChargeSideA, chargeSideA, std::vector); +DECLARE_SOA_COLUMN(PseudorapSideA, pseudorapSideA, std::vector); DECLARE_SOA_COLUMN(PhiSideA, phiSideA, std::vector); DECLARE_SOA_COLUMN(TpcSignalSideA, tpcSignalSideA, std::vector); DECLARE_SOA_COLUMN(TofSignalSideA, tofSignalSideA, std::vector); @@ -69,8 +72,14 @@ DECLARE_SOA_COLUMN(TpcNSigmaPiSideA, tpcNSigmaPiSideA, std::vector); DECLARE_SOA_COLUMN(TofNSigmaPiSideA, tofNSigmaPiSideA, std::vector); DECLARE_SOA_COLUMN(TpcNSigmaKaSideA, tpcNSigmaKaSideA, std::vector); DECLARE_SOA_COLUMN(TofNSigmaKaSideA, tofNSigmaKaSideA, std::vector); +DECLARE_SOA_COLUMN(TpcNSigmaProSideA, tpcNSigmaProSideA, std::vector); +DECLARE_SOA_COLUMN(TofNSigmaProSideA, tofNSigmaProSideA, std::vector); +DECLARE_SOA_COLUMN(TofBetaSideA, tofBetaSideA, std::vector); +DECLARE_SOA_COLUMN(TofBetaErrorSideA, tofBetaErrorSideA, std::vector); DECLARE_SOA_COLUMN(PtSideC, ptSideC, std::vector); -DECLARE_SOA_COLUMN(RapSideC, rapSideC, std::vector); +DECLARE_SOA_COLUMN(PSideC, pSideC, std::vector); +DECLARE_SOA_COLUMN(ChargeSideC, chargeSideC, std::vector); +DECLARE_SOA_COLUMN(PseudorapSideC, pseudorapSideC, std::vector); DECLARE_SOA_COLUMN(PhiSideC, phiSideC, std::vector); DECLARE_SOA_COLUMN(TpcSignalSideC, tpcSignalSideC, std::vector); DECLARE_SOA_COLUMN(TofSignalSideC, tofSignalSideC, std::vector); @@ -78,6 +87,10 @@ DECLARE_SOA_COLUMN(TpcNSigmaPiSideC, tpcNSigmaPiSideC, std::vector); DECLARE_SOA_COLUMN(TofNSigmaPiSideC, tofNSigmaPiSideC, std::vector); DECLARE_SOA_COLUMN(TpcNSigmaKaSideC, tpcNSigmaKaSideC, std::vector); DECLARE_SOA_COLUMN(TofNSigmaKaSideC, tofNSigmaKaSideC, std::vector); +DECLARE_SOA_COLUMN(TpcNSigmaProSideC, tpcNSigmaProSideC, std::vector); +DECLARE_SOA_COLUMN(TofNSigmaProSideC, tofNSigmaProSideC, std::vector); +DECLARE_SOA_COLUMN(TofBetaSideC, tofBetaSideC, std::vector); +DECLARE_SOA_COLUMN(TofBetaErrorSideC, tofBetaErrorSideC, std::vector); DECLARE_SOA_COLUMN(NchSideA, nchSideA, int); DECLARE_SOA_COLUMN(MultiplicitySideA, multiplicitySideA, int); DECLARE_SOA_COLUMN(NchSideC, nchSideC, int); @@ -97,8 +110,11 @@ DECLARE_SOA_TABLE(TREE, "AOD", "Tree", tree::AmplitudeFV0A, tree::Occupancy, tree::UPCMode, + tree::PVz, tree::PtSideA, - tree::RapSideA, + tree::PSideA, + tree::ChargeSideA, + tree::PseudorapSideA, tree::PhiSideA, tree::TpcSignalSideA, tree::TofSignalSideA, @@ -106,8 +122,14 @@ DECLARE_SOA_TABLE(TREE, "AOD", "Tree", tree::TofNSigmaPiSideA, tree::TpcNSigmaKaSideA, tree::TofNSigmaKaSideA, + tree::TpcNSigmaProSideA, + tree::TofNSigmaProSideA, + tree::TofBetaSideA, + tree::TofBetaErrorSideA, tree::PtSideC, - tree::RapSideC, + tree::PSideC, + tree::ChargeSideC, + tree::PseudorapSideC, tree::PhiSideC, tree::TpcSignalSideC, tree::TofSignalSideC, @@ -115,6 +137,10 @@ DECLARE_SOA_TABLE(TREE, "AOD", "Tree", tree::TofNSigmaPiSideC, tree::TpcNSigmaKaSideC, tree::TofNSigmaKaSideC, + tree::TpcNSigmaProSideC, + tree::TofNSigmaProSideC, + tree::TofBetaSideC, + tree::TofBetaErrorSideC, tree::NchSideA, tree::MultiplicitySideA, tree::NchSideC, @@ -286,6 +312,8 @@ struct UpcPhotonuclearAnalysisJMG { histos.add("Tracks/SGsideA/hTrackPhi", "#it{#phi} distribution; #it{#phi}; counts", kTH1F, {axisPhi}); histos.add("Tracks/SGsideA/hTrackEta", "#it{#eta} distribution; #it{#eta}; counts", kTH1F, {axisEta}); histos.add("Tracks/SGsideA/hTrackTPCSignnalP", "#it{TPC dE/dx vs p}; #it{p*charge}; #it{TPC dE/dx}", kTH2F, {axisP, axisTPCSignal}); + histos.add("Tracks/SGsideA/hTrackTPCSignnalPPiones", "#it{TPC dE/dx vs p}; #it{p*charge}; #it{TPC dE/dx}", kTH2F, {axisP, axisTPCSignal}); + histos.add("Tracks/SGsideA/hTrackTPCSignnalPKaones", "#it{TPC dE/dx vs p}; #it{p*charge}; #it{TPC dE/dx}", kTH2F, {axisP, axisTPCSignal}); histos.add("Tracks/SGsideA/hTrackTOFSignnalP", "#it{TOF signal vs p}; #it{p*charge}; #it{TOF signal}", kTH2F, {axisP, axisTPCSignal}); histos.add("Tracks/SGsideA/hTrackITSNCls", "#it{N Clusters ITS} distribution; #it{N Clusters ITS}; counts", kTH1F, {axisNCls}); histos.add("Tracks/SGsideA/hTrackITSChi2NCls", "#it{N Clusters Chi2 ITS} distribution; #it{N Clusters Chi2 ITS}; counts", kTH1F, {axisChi2NCls}); @@ -318,6 +346,8 @@ struct UpcPhotonuclearAnalysisJMG { histos.add("Tracks/SGsideC/hTrackPhi", "#it{#phi} distribution; #it{#phi}; counts", kTH1F, {axisPhi}); histos.add("Tracks/SGsideC/hTrackEta", "#it{#eta} distribution; #it{#eta}; counts", kTH1F, {axisEta}); histos.add("Tracks/SGsideC/hTrackTPCSignnalP", "#it{TPC dE/dx vs p}; #it{p*charge}; #it{TPC dE/dx}", kTH2F, {axisP, axisTPCSignal}); + histos.add("Tracks/SGsideC/hTrackTPCSignnalPPiones", "#it{TPC dE/dx vs p}; #it{p*charge}; #it{TPC dE/dx}", kTH2F, {axisP, axisTPCSignal}); + histos.add("Tracks/SGsideC/hTrackTPCSignnalPKaones", "#it{TPC dE/dx vs p}; #it{p*charge}; #it{TPC dE/dx}", kTH2F, {axisP, axisTPCSignal}); histos.add("Tracks/SGsideC/hTrackTOFSignnalP", "#it{TOF signal vs p}; #it{p*charge}; #it{TOF signal}", kTH2F, {axisP, axisTPCSignal}); histos.add("Tracks/SGsideC/hTrackITSNCls", "#it{N Clusters ITS} distribution; #it{N Clusters ITS}; counts", kTH1F, {axisNCls}); histos.add("Tracks/SGsideC/hTrackITSChi2NCls", "#it{N Clusters Chi2 ITS} distribution; #it{N Clusters Chi2 ITS}; counts", kTH1F, {axisChi2NCls}); @@ -627,8 +657,8 @@ struct UpcPhotonuclearAnalysisJMG { int nchPVGapSideC = 0; int nchGapSideA = 0; int nchGapSideC = 0; - std::vector vTrackPtSideA, vTrackEtaSideA, vTrackPhiSideA, vTrackTPCSignalSideA, vTrackTOFSignalSideA, vTrackTPCNSigmaPiSideA, vTrackTOFNSigmaPiSideA, vTrackTPCNSigmaKaSideA, vTrackTOFNSigmaKaSideA; - std::vector vTrackPtSideC, vTrackEtaSideC, vTrackPhiSideC, vTrackTPCSignalSideC, vTrackTOFSignalSideC, vTrackTPCNSigmaPiSideC, vTrackTOFNSigmaPiSideC, vTrackTPCNSigmaKaSideC, vTrackTOFNSigmaKaSideC; + std::vector vTrackPtSideA, vTrackPSideA, vTrackChargeSideA, vTrackEtaSideA, vTrackPhiSideA, vTrackTPCSignalSideA, vTrackTOFSignalSideA, vTrackTPCNSigmaPiSideA, vTrackTOFNSigmaPiSideA, vTrackTPCNSigmaKaSideA, vTrackTOFNSigmaKaSideA, vTrackTPCNSigmaProSideA, vTrackTOFNSigmaProSideA, vTrackTOFBetaSideA, vTrackTOFNBetaErrorSideA; + std::vector vTrackPtSideC, vTrackPSideC, vTrackChargeSideC, vTrackEtaSideC, vTrackPhiSideC, vTrackTPCSignalSideC, vTrackTOFSignalSideC, vTrackTPCNSigmaPiSideC, vTrackTOFNSigmaPiSideC, vTrackTPCNSigmaKaSideC, vTrackTOFNSigmaKaSideC, vTrackTPCNSigmaProSideC, vTrackTOFNSigmaProSideC, vTrackTOFBetaSideC, vTrackTOFNBetaErrorSideC; int nTracksChargedSideA(-222), nTracksChargedSideC(-222); int multiplicitySideA(-222), multiplicitySideC(-222); @@ -675,13 +705,23 @@ struct UpcPhotonuclearAnalysisJMG { nTracksCharged++; sumPt += track.pt(); float phiVal = RecoDecay::constrainAngle(phi(track.px(), track.py()), 0.f); + float pTotal = momentum(track.px(), track.py(), track.pz()) * track.sign(); + float etaVal = eta(track.px(), track.py(), track.pz()); histos.fill(HIST("Tracks/SGsideA/hTrackPt"), track.pt()); histos.fill(HIST("Tracks/SGsideA/hTrackPhi"), phiVal); - histos.fill(HIST("Tracks/SGsideA/hTrackEta"), eta(track.px(), track.py(), track.pz())); - histos.fill(HIST("Tracks/SGsideA/hTrackTPCSignnalP"), momentum(track.px(), track.py(), track.pz()) * track.sign(), track.tpcSignal()); - histos.fill(HIST("Tracks/SGsideA/hTrackTOFSignnalP"), momentum(track.px(), track.py(), track.pz()) * track.sign(), track.tofSignal()); + histos.fill(HIST("Tracks/SGsideA/hTrackEta"), etaVal); + histos.fill(HIST("Tracks/SGsideA/hTrackTPCSignnalP"), pTotal, track.tpcSignal()); + if(TMath::Sqrt(TMath::Power(track.tpcNSigmaPi(),2) + TMath::Power(track.tofNSigmaPi(),2)) < 3 && TMath::Sqrt(TMath::Power(tpcNSigmaKa(),2) + TMath::Power(tofNSigmaKa(),2)) > 3){ + histos.fill(HIST("Tracks/SGsideA/hTrackTPCSignnalPPiones"), pTotal, track.tpcSignal()); + } + if(TMath::Sqrt(TMath::Power(track.tpcNSigmaKa(),2) + TMath::Power(track.tofNSigmaKa(),2)) < 3 && TMath::Sqrt(TMath::Power(tpcNSigmaPi(),2) + TMath::Power(tofNSigmaPi(),2)) > 3){ + histos.fill(HIST("Tracks/SGsideA/hTrackTPCSignnalPKaones"), pTotal, track.tpcSignal()); + } + histos.fill(HIST("Tracks/SGsideA/hTrackTOFSignnalP"), pTotal, track.tofSignal()); vTrackPtSideA.push_back(track.pt()); - vTrackEtaSideA.push_back(eta(track.px(), track.py(), track.pz())); + vTrackPSideA.push_back(pTotal); + vTrackChargeSideA.push_back(track.sign()); + vTrackEtaSideA.push_back(etaVal); vTrackPhiSideA.push_back(phiVal); vTrackTPCSignalSideA.push_back(track.tpcSignal()); vTrackTOFSignalSideA.push_back(track.tofSignal()); @@ -689,6 +729,10 @@ struct UpcPhotonuclearAnalysisJMG { vTrackTOFNSigmaPiSideA.push_back(track.tofNSigmaPi()); vTrackTPCNSigmaKaSideA.push_back(track.tpcNSigmaKa()); vTrackTOFNSigmaKaSideA.push_back(track.tofNSigmaKa()); + vTrackTPCNSigmaProSideA.push_back(track.tpcNSigmaPr()); + vTrackTOFNSigmaProSideA.push_back(track.tofNSigmaPr()); + vTrackTOFBetaSideA.push_back(track.beta()); + vTrackTOFBetaErrorSideA.push_back(track.betaerror()); histos.fill(HIST("Tracks/SGsideA/hTrackITSNCls"), track.itsNCls()); histos.fill(HIST("Tracks/SGsideA/hTrackITSChi2NCls"), track.itsChi2NCl()); @@ -735,13 +779,23 @@ struct UpcPhotonuclearAnalysisJMG { nTracksCharged++; sumPt += track.pt(); float phiVal = RecoDecay::constrainAngle(phi(track.px(), track.py()), 0.f); + float pTotal = momentum(track.px(), track.py(), track.pz()) * track.sign(); + float etaVal = eta(track.px(), track.py(), track.pz()); histos.fill(HIST("Tracks/SGsideC/hTrackPt"), track.pt()); histos.fill(HIST("Tracks/SGsideC/hTrackPhi"), phiVal); - histos.fill(HIST("Tracks/SGsideC/hTrackEta"), eta(track.px(), track.py(), track.pz())); - histos.fill(HIST("Tracks/SGsideC/hTrackTPCSignnalP"), momentum(track.px(), track.py(), track.pz()) * track.sign(), track.tpcSignal()); - histos.fill(HIST("Tracks/SGsideC/hTrackTOFSignnalP"), momentum(track.px(), track.py(), track.pz()) * track.sign(), track.tofSignal()); + histos.fill(HIST("Tracks/SGsideC/hTrackEta"), etaVal); + histos.fill(HIST("Tracks/SGsideC/hTrackTPCSignnalP"), pTotal, track.tpcSignal()); + if(TMath::Sqrt(TMath::Power(track.tpcNSigmaPi(),2) + TMath::Power(track.tofNSigmaPi(),2)) < 3 && TMath::Sqrt(TMath::Power(tpcNSigmaKa(),2) + TMath::Power(tofNSigmaKa(),2)) > 3){ + histos.fill(HIST("Tracks/SGsideC/hTrackTPCSignnalPPiones"), pTotal, track.tpcSignal()); + } + if(TMath::Sqrt(TMath::Power(track.tpcNSigmaKa(),2) + TMath::Power(track.tofNSigmaKa(),2)) < 3 && TMath::Sqrt(TMath::Power(tpcNSigmaPi(),2) + TMath::Power(tofNSigmaPi(),2)) > 3){ + histos.fill(HIST("Tracks/SGsideC/hTrackTPCSignnalPKaones"), pTotal, track.tpcSignal()); + } + histos.fill(HIST("Tracks/SGsideC/hTrackTOFSignnalP"), pTotal, track.tofSignal()); vTrackPtSideC.push_back(track.pt()); - vTrackEtaSideC.push_back(eta(track.px(), track.py(), track.pz())); + vTrackPSideC.push_back(pTotal); + vTrackChargeSideC.push_back(track.sign()); + vTrackEtaSideC.push_back(etaVal); vTrackPhiSideC.push_back(phiVal); vTrackTPCSignalSideC.push_back(track.tpcSignal()); vTrackTOFSignalSideC.push_back(track.tofSignal()); @@ -749,6 +803,10 @@ struct UpcPhotonuclearAnalysisJMG { vTrackTOFNSigmaPiSideC.push_back(track.tofNSigmaPi()); vTrackTPCNSigmaKaSideC.push_back(track.tpcNSigmaKa()); vTrackTOFNSigmaKaSideC.push_back(track.tofNSigmaKa()); + vTrackTPCNSigmaProSideC.push_back(track.tpcNSigmaPr()); + vTrackTOFNSigmaProSideC.push_back(track.tofNSigmaPr()); + vTrackTOFBetaSideC.push_back(track.beta()); + vTrackTOFBetaErrorSideC.push_back(track.betaerror()); histos.fill(HIST("Tracks/SGsideC/hTrackITSNCls"), track.itsNCls()); histos.fill(HIST("Tracks/SGsideC/hTrackITSChi2NCls"), track.itsChi2NCl()); @@ -787,7 +845,10 @@ struct UpcPhotonuclearAnalysisJMG { reconstructedCollision.totalFV0AmplitudeA(), reconstructedCollision.occupancyInTime(), reconstructedCollision.flags(), + reconstructedCollision.posZ(), vTrackPtSideA, + vTrackPSideA, + vTrackChargeSideA, vTrackEtaSideA, vTrackPhiSideA, vTrackTPCSignalSideA, @@ -796,7 +857,13 @@ struct UpcPhotonuclearAnalysisJMG { vTrackTOFNSigmaPiSideA, vTrackTPCNSigmaKaSideA, vTrackTOFNSigmaKaSideA, + vTrackTPCNSigmaProSideA, + vTrackTOFNSigmaProSideA, + vTrackTOFBetaSideA, + vTrackTOFBetaErrorSideA, vTrackPtSideC, + vTrackPSideC, + vTrackChargeSideC, vTrackEtaSideC, vTrackPhiSideC, vTrackTPCSignalSideA, @@ -805,6 +872,10 @@ struct UpcPhotonuclearAnalysisJMG { vTrackTOFNSigmaPiSideA, vTrackTPCNSigmaKaSideA, vTrackTOFNSigmaKaSideA, + vTrackTPCNSigmaProSideA, + vTrackTOFNSigmaProSideA, + vTrackTOFBetaSideA, + vTrackTOFBetaErrorSideA, nTracksChargedSideA, multiplicitySideA, nTracksChargedSideC, From 0e65adcb7edc9da493f8828d0c4568209d83db45 Mon Sep 17 00:00:00 2001 From: Josue Martinez Garcia Date: Fri, 29 May 2026 09:22:49 -0600 Subject: [PATCH 7/8] fixing issues --- PWGUD/Tasks/upcPhotonuclearAnalysisJMG.cxx | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/PWGUD/Tasks/upcPhotonuclearAnalysisJMG.cxx b/PWGUD/Tasks/upcPhotonuclearAnalysisJMG.cxx index 65c510e1058..0a6a77bdfa9 100644 --- a/PWGUD/Tasks/upcPhotonuclearAnalysisJMG.cxx +++ b/PWGUD/Tasks/upcPhotonuclearAnalysisJMG.cxx @@ -657,8 +657,8 @@ struct UpcPhotonuclearAnalysisJMG { int nchPVGapSideC = 0; int nchGapSideA = 0; int nchGapSideC = 0; - std::vector vTrackPtSideA, vTrackPSideA, vTrackChargeSideA, vTrackEtaSideA, vTrackPhiSideA, vTrackTPCSignalSideA, vTrackTOFSignalSideA, vTrackTPCNSigmaPiSideA, vTrackTOFNSigmaPiSideA, vTrackTPCNSigmaKaSideA, vTrackTOFNSigmaKaSideA, vTrackTPCNSigmaProSideA, vTrackTOFNSigmaProSideA, vTrackTOFBetaSideA, vTrackTOFNBetaErrorSideA; - std::vector vTrackPtSideC, vTrackPSideC, vTrackChargeSideC, vTrackEtaSideC, vTrackPhiSideC, vTrackTPCSignalSideC, vTrackTOFSignalSideC, vTrackTPCNSigmaPiSideC, vTrackTOFNSigmaPiSideC, vTrackTPCNSigmaKaSideC, vTrackTOFNSigmaKaSideC, vTrackTPCNSigmaProSideC, vTrackTOFNSigmaProSideC, vTrackTOFBetaSideC, vTrackTOFNBetaErrorSideC; + std::vector vTrackPtSideA, vTrackPSideA, vTrackChargeSideA, vTrackEtaSideA, vTrackPhiSideA, vTrackTPCSignalSideA, vTrackTOFSignalSideA, vTrackTPCNSigmaPiSideA, vTrackTOFNSigmaPiSideA, vTrackTPCNSigmaKaSideA, vTrackTOFNSigmaKaSideA, vTrackTPCNSigmaProSideA, vTrackTOFNSigmaProSideA, vTrackTOFBetaSideA, vTrackTOFBetaErrorSideA; + std::vector vTrackPtSideC, vTrackPSideC, vTrackChargeSideC, vTrackEtaSideC, vTrackPhiSideC, vTrackTPCSignalSideC, vTrackTOFSignalSideC, vTrackTPCNSigmaPiSideC, vTrackTOFNSigmaPiSideC, vTrackTPCNSigmaKaSideC, vTrackTOFNSigmaKaSideC, vTrackTPCNSigmaProSideC, vTrackTOFNSigmaProSideC, vTrackTOFBetaSideC, vTrackTOFBetaErrorSideC; int nTracksChargedSideA(-222), nTracksChargedSideC(-222); int multiplicitySideA(-222), multiplicitySideC(-222); @@ -711,10 +711,12 @@ struct UpcPhotonuclearAnalysisJMG { histos.fill(HIST("Tracks/SGsideA/hTrackPhi"), phiVal); histos.fill(HIST("Tracks/SGsideA/hTrackEta"), etaVal); histos.fill(HIST("Tracks/SGsideA/hTrackTPCSignnalP"), pTotal, track.tpcSignal()); - if(TMath::Sqrt(TMath::Power(track.tpcNSigmaPi(),2) + TMath::Power(track.tofNSigmaPi(),2)) < 3 && TMath::Sqrt(TMath::Power(tpcNSigmaKa(),2) + TMath::Power(tofNSigmaKa(),2)) > 3){ + float nSigmaPi2 = track.tpcNSigmaPi() * track.tpcNSigmaPi() + track.tofNSigmaPi() * track.tofNSigmaPi(); + float nSigmaKa2 = track.tpcNSigmaKa() * track.tpcNSigmaKa() + track.tofNSigmaKa() * track.tofNSigmaKa(); + if (nSigmaPi2 < 9.0 && nSigmaKa2 > 9.0) { histos.fill(HIST("Tracks/SGsideA/hTrackTPCSignnalPPiones"), pTotal, track.tpcSignal()); } - if(TMath::Sqrt(TMath::Power(track.tpcNSigmaKa(),2) + TMath::Power(track.tofNSigmaKa(),2)) < 3 && TMath::Sqrt(TMath::Power(tpcNSigmaPi(),2) + TMath::Power(tofNSigmaPi(),2)) > 3){ + if (nSigmaKa2 < 9.0 && nSigmaPi2 > 9.0) { histos.fill(HIST("Tracks/SGsideA/hTrackTPCSignnalPKaones"), pTotal, track.tpcSignal()); } histos.fill(HIST("Tracks/SGsideA/hTrackTOFSignnalP"), pTotal, track.tofSignal()); @@ -785,10 +787,12 @@ struct UpcPhotonuclearAnalysisJMG { histos.fill(HIST("Tracks/SGsideC/hTrackPhi"), phiVal); histos.fill(HIST("Tracks/SGsideC/hTrackEta"), etaVal); histos.fill(HIST("Tracks/SGsideC/hTrackTPCSignnalP"), pTotal, track.tpcSignal()); - if(TMath::Sqrt(TMath::Power(track.tpcNSigmaPi(),2) + TMath::Power(track.tofNSigmaPi(),2)) < 3 && TMath::Sqrt(TMath::Power(tpcNSigmaKa(),2) + TMath::Power(tofNSigmaKa(),2)) > 3){ + float nSigmaPi2 = track.tpcNSigmaPi() * track.tpcNSigmaPi() + track.tofNSigmaPi() * track.tofNSigmaPi(); + float nSigmaKa2 = track.tpcNSigmaKa() * track.tpcNSigmaKa() + track.tofNSigmaKa() * track.tofNSigmaKa(); + if (nSigmaPi2 < 9.0 && nSigmaKa2 > 9.0) { histos.fill(HIST("Tracks/SGsideC/hTrackTPCSignnalPPiones"), pTotal, track.tpcSignal()); } - if(TMath::Sqrt(TMath::Power(track.tpcNSigmaKa(),2) + TMath::Power(track.tofNSigmaKa(),2)) < 3 && TMath::Sqrt(TMath::Power(tpcNSigmaPi(),2) + TMath::Power(tofNSigmaPi(),2)) > 3){ + if (nSigmaKa2 < 9.0 && nSigmaPi2 > 9.0) { histos.fill(HIST("Tracks/SGsideC/hTrackTPCSignnalPKaones"), pTotal, track.tpcSignal()); } histos.fill(HIST("Tracks/SGsideC/hTrackTOFSignnalP"), pTotal, track.tofSignal()); From 1d1b4bcba79d92875d1c39c36c5cf1496de79d79 Mon Sep 17 00:00:00 2001 From: Josue Martinez Garcia Date: Fri, 29 May 2026 16:05:30 -0600 Subject: [PATCH 8/8] fixing issues --- PWGUD/Tasks/upcPhotonuclearAnalysisJMG.cxx | 25 +++++++++++----------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/PWGUD/Tasks/upcPhotonuclearAnalysisJMG.cxx b/PWGUD/Tasks/upcPhotonuclearAnalysisJMG.cxx index 0a6a77bdfa9..25b8213263e 100644 --- a/PWGUD/Tasks/upcPhotonuclearAnalysisJMG.cxx +++ b/PWGUD/Tasks/upcPhotonuclearAnalysisJMG.cxx @@ -50,7 +50,7 @@ namespace tree DECLARE_SOA_COLUMN(GapSide, gapSide, float); DECLARE_SOA_COLUMN(GapSideTimeZN, gapSideTimeZN, float); DECLARE_SOA_COLUMN(Sbp, sbp, int); -DECLARE_SOA_COLUMN(ITSROFb, itsROFb, int); +DECLARE_SOA_COLUMN(ItsRofB, itsRofB, int); DECLARE_SOA_COLUMN(VtxITSTPCCut, vtxITSTPCCut, int); DECLARE_SOA_COLUMN(ZVtxFT0vsPvCut, zVtxFT0vsPvCut, int); DECLARE_SOA_COLUMN(TimeZNA, timeZNA, float); @@ -59,8 +59,8 @@ DECLARE_SOA_COLUMN(EnergyZNA, energyZNA, float); DECLARE_SOA_COLUMN(EnergyZNC, energyZNC, float); DECLARE_SOA_COLUMN(AmplitudeFV0A, amplitudeFV0A, float); DECLARE_SOA_COLUMN(Occupancy, occupancy, float); -DECLARE_SOA_COLUMN(UPCMode, upcMode, float); -DECLARE_SOA_COLUMN(PVz, pvz, float); +DECLARE_SOA_COLUMN(UpcMode, upcMode, float); +DECLARE_SOA_COLUMN(Pvz, pvz, float); DECLARE_SOA_COLUMN(PtSideA, ptSideA, std::vector); DECLARE_SOA_COLUMN(PSideA, pSideA, std::vector); DECLARE_SOA_COLUMN(ChargeSideA, chargeSideA, std::vector); @@ -100,7 +100,7 @@ DECLARE_SOA_TABLE(TREE, "AOD", "Tree", tree::GapSide, tree::GapSideTimeZN, tree::Sbp, - tree::ITSROFb, + tree::ItsRofB, tree::VtxITSTPCCut, tree::ZVtxFT0vsPvCut, tree::TimeZNA, @@ -109,8 +109,8 @@ DECLARE_SOA_TABLE(TREE, "AOD", "Tree", tree::EnergyZNC, tree::AmplitudeFV0A, tree::Occupancy, - tree::UPCMode, - tree::PVz, + tree::UpcMode, + tree::Pvz, tree::PtSideA, tree::PSideA, tree::ChargeSideA, @@ -148,7 +148,8 @@ DECLARE_SOA_TABLE(TREE, "AOD", "Tree", } // namespace o2::aod static constexpr float CFGPairCutDefaults[1][5] = {{-1, -1, -1, -1, -1}}; -constexpr float kThreeHalfPi = 1.5f * PI; +constexpr float KThreeHalfPi = 1.5f * PI; +constexpr float KMaxInSigmaPID = 9.0f; struct UpcPhotonuclearAnalysisJMG { @@ -226,7 +227,7 @@ struct UpcPhotonuclearAnalysisJMG { "Pair cuts on various particles"}; Configurable cfgTwoTrackCut{"cfgTwoTrackCut", -1, {"Two track cut"}}; ConfigurableAxis axisVertex{"axisVertex", {20, -10, 10}, "vertex axis for histograms"}; - ConfigurableAxis axisDeltaPhi{"axisDeltaPhi", {32, -PIHalf, kThreeHalfPi}, "delta phi axis for histograms"}; + ConfigurableAxis axisDeltaPhi{"axisDeltaPhi", {32, -PIHalf, KThreeHalfPi}, "delta phi axis for histograms"}; ConfigurableAxis axisDeltaEta{"axisDeltaEta", {32, -1.6, 1.6}, "delta eta axis for histograms"}; ConfigurableAxis axisPtTrigger{"axisPtTrigger", {VARIABLE_WIDTH, 0.5, 1.0, 1.5, 2.0, 3.0, 4.0, 6.0, 10.0}, "pt trigger axis for histograms"}; ConfigurableAxis axisPtAssoc{"axisPtAssoc", {VARIABLE_WIDTH, 0.5, 1.0, 1.5, 2.0, 3.0, 4.0, 6.0}, "pt associated axis for histograms"}; @@ -713,10 +714,10 @@ struct UpcPhotonuclearAnalysisJMG { histos.fill(HIST("Tracks/SGsideA/hTrackTPCSignnalP"), pTotal, track.tpcSignal()); float nSigmaPi2 = track.tpcNSigmaPi() * track.tpcNSigmaPi() + track.tofNSigmaPi() * track.tofNSigmaPi(); float nSigmaKa2 = track.tpcNSigmaKa() * track.tpcNSigmaKa() + track.tofNSigmaKa() * track.tofNSigmaKa(); - if (nSigmaPi2 < 9.0 && nSigmaKa2 > 9.0) { + if (nSigmaPi2 < KMaxInSigmaPID && nSigmaKa2 > KMaxInSigmaPID) { histos.fill(HIST("Tracks/SGsideA/hTrackTPCSignnalPPiones"), pTotal, track.tpcSignal()); } - if (nSigmaKa2 < 9.0 && nSigmaPi2 > 9.0) { + if (nSigmaKa2 < KMaxInSigmaPID && nSigmaPi2 > KMaxInSigmaPID) { histos.fill(HIST("Tracks/SGsideA/hTrackTPCSignnalPKaones"), pTotal, track.tpcSignal()); } histos.fill(HIST("Tracks/SGsideA/hTrackTOFSignnalP"), pTotal, track.tofSignal()); @@ -789,10 +790,10 @@ struct UpcPhotonuclearAnalysisJMG { histos.fill(HIST("Tracks/SGsideC/hTrackTPCSignnalP"), pTotal, track.tpcSignal()); float nSigmaPi2 = track.tpcNSigmaPi() * track.tpcNSigmaPi() + track.tofNSigmaPi() * track.tofNSigmaPi(); float nSigmaKa2 = track.tpcNSigmaKa() * track.tpcNSigmaKa() + track.tofNSigmaKa() * track.tofNSigmaKa(); - if (nSigmaPi2 < 9.0 && nSigmaKa2 > 9.0) { + if (nSigmaPi2 < KMaxInSigmaPID && nSigmaKa2 > KMaxInSigmaPID) { histos.fill(HIST("Tracks/SGsideC/hTrackTPCSignnalPPiones"), pTotal, track.tpcSignal()); } - if (nSigmaKa2 < 9.0 && nSigmaPi2 > 9.0) { + if (nSigmaKa2 < KMaxInSigmaPID && nSigmaPi2 > KMaxInSigmaPID) { histos.fill(HIST("Tracks/SGsideC/hTrackTPCSignnalPKaones"), pTotal, track.tpcSignal()); } histos.fill(HIST("Tracks/SGsideC/hTrackTOFSignnalP"), pTotal, track.tofSignal());