From c0fa75dbd3807e407d445056a19c1439011e245c Mon Sep 17 00:00:00 2001 From: josue-MiniPC-Ubuntu Date: Wed, 29 Oct 2025 14:43:29 -0600 Subject: [PATCH 1/9] 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 16a473cc0b0..3c94599273e 100644 --- a/PWGUD/Tasks/upcPhotonuclearAnalysisJMG.cxx +++ b/PWGUD/Tasks/upcPhotonuclearAnalysisJMG.cxx @@ -392,6 +392,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 864ea6f4c1feb215905bdf4c71a03c3e1a985091 Mon Sep 17 00:00:00 2001 From: josue-MiniPC-Ubuntu Date: Wed, 29 Oct 2025 14:48:49 -0600 Subject: [PATCH 2/9] 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 3c94599273e..16a473cc0b0 100644 --- a/PWGUD/Tasks/upcPhotonuclearAnalysisJMG.cxx +++ b/PWGUD/Tasks/upcPhotonuclearAnalysisJMG.cxx @@ -392,7 +392,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 c4a93b4885bf232fdf3b6f6f31a8646062c78e16 Mon Sep 17 00:00:00 2001 From: Josue Martinez Garcia Date: Fri, 7 Nov 2025 00:11:56 -0600 Subject: [PATCH 3/9] 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 61531e9f56e..09b72615246 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 377d91780ac3ca11dc1bc0ff8b48b1b7a18783ed Mon Sep 17 00:00:00 2001 From: Josue Martinez Garcia Date: Tue, 11 Nov 2025 01:01:22 -0600 Subject: [PATCH 4/9] 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 09b72615246..61531e9f56e 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 dec0478e3dc396f9c194bddaed7287b2e852e933 Mon Sep 17 00:00:00 2001 From: rolavick Date: Thu, 19 Mar 2026 09:34:03 +0100 Subject: [PATCH 5/9] Dummy commit to restart tests From 5eb92decd1e71bbbdca86ee5795ec4bbaa86d730 Mon Sep 17 00:00:00 2001 From: Josue Martinez Garcia Date: Wed, 7 Oct 2026 17:05:10 -0600 Subject: [PATCH 6/9] resolving PID issues --- PWGUD/Tasks/upcPhotonuclearAnalysisJMG.cxx | 28 +++++++++++----------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/PWGUD/Tasks/upcPhotonuclearAnalysisJMG.cxx b/PWGUD/Tasks/upcPhotonuclearAnalysisJMG.cxx index 16a473cc0b0..2ba1b060961 100644 --- a/PWGUD/Tasks/upcPhotonuclearAnalysisJMG.cxx +++ b/PWGUD/Tasks/upcPhotonuclearAnalysisJMG.cxx @@ -706,7 +706,7 @@ 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 pTotal = momentum(track.px(), track.py(), track.pz()); float etaVal = eta(track.px(), track.py(), track.pz()); histos.fill(HIST("Tracks/SGsideA/hTrackPt"), track.pt()); histos.fill(HIST("Tracks/SGsideA/hTrackPhi"), phiVal); @@ -782,7 +782,7 @@ 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 pTotal = momentum(track.px(), track.py(), track.pz()); float etaVal = eta(track.px(), track.py(), track.pz()); histos.fill(HIST("Tracks/SGsideC/hTrackPt"), track.pt()); histos.fill(HIST("Tracks/SGsideC/hTrackPhi"), phiVal); @@ -871,18 +871,18 @@ struct UpcPhotonuclearAnalysisJMG { vTrackChargeSideC, vTrackEtaSideC, vTrackPhiSideC, - vTrackTPCSignalSideA, - vTrackTOFSignalSideA, - vTrackTPCNSigmaPiSideA, - vTrackTOFNSigmaPiSideA, - vTrackTPCNSigmaKaSideA, - vTrackTOFNSigmaKaSideA, - vTrackTPCNSigmaProSideA, - vTrackTOFNSigmaProSideA, - vTrackTOFBetaSideA, - vTrackTOFBetaErrorSideA, - nTracksChargedSideA, - multiplicitySideA, + vTrackTPCSignalSideC, + vTrackTOFSignalSideC, + vTrackTPCNSigmaPiSideC, + vTrackTOFNSigmaPiSideC, + vTrackTPCNSigmaKaSideC, + vTrackTOFNSigmaKaSideC, + vTrackTPCNSigmaProSideC, + vTrackTOFNSigmaProSideC, + vTrackTOFBetaSideC, + vTrackTOFBetaErrorSideC, + nTracksChargedSideC, + multiplicitySideC, nTracksChargedSideC, multiplicitySideC); // nTracksChargedSideA = nTracksChargedSideC = multiplicitySideA = multiplicitySideC = 0; From eb1d92c47a6033e4e1182b5bdca4dc70269026c3 Mon Sep 17 00:00:00 2001 From: Josue Martinez Garcia Date: Wed, 7 Oct 2026 17:53:29 -0600 Subject: [PATCH 7/9] resolving MegaLinter issues --- PWGUD/Tasks/upcPhotonuclearAnalysisJMG.cxx | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/PWGUD/Tasks/upcPhotonuclearAnalysisJMG.cxx b/PWGUD/Tasks/upcPhotonuclearAnalysisJMG.cxx index 2ba1b060961..887bcbdfd79 100644 --- a/PWGUD/Tasks/upcPhotonuclearAnalysisJMG.cxx +++ b/PWGUD/Tasks/upcPhotonuclearAnalysisJMG.cxx @@ -395,7 +395,7 @@ struct UpcPhotonuclearAnalysisJMG { } std::vector vtxBinsEdges{VARIABLE_WIDTH, -10.0f, -7.0f, -5.0f, -2.5f, 0.0f, 2.5f, 5.0f, 7.0f, 10.0f}; - std::vector gapSideBinsEdges{VARIABLE_WIDTH, -0.5, 0.5, 1.5}; + // std::vector gapSideBinsEdges{VARIABLE_WIDTH, -0.5, 0.5, 1.5}; enum EventType { SameEvent = 1, @@ -924,9 +924,10 @@ struct UpcPhotonuclearAnalysisJMG { ++multiplicity; } // multiplicity = tracks1.size(); - if (fillCollisionUD(mixed, multiplicity) == false) { - return; - } + // if (fillCollisionUD(mixed, multiplicity) == false) { + // return; + // } + fillCollisionUD(mixed, multiplicity); histos.fill(HIST("Events/hCountCollisionsMixed"), 2); // histos.fill(HIST("eventcount"), bindingOnVtx.getBin({collision1.posZ()})); // histos.fill(HIST("eventcount"), bindingOnVtx.getBin({collision1.posZ(), collision1.gapSide()})); @@ -1122,9 +1123,10 @@ struct UpcPhotonuclearAnalysisJMG { ++multiplicity; } // multiplicity = reconstructedTracks.size(); - if (fillCollisionUD(same, multiplicity) == false) { - return; - } + // if (fillCollisionUD(same, multiplicity) == false) { + // return; + // } + fillCollisionUD(same, multiplicity) // LOGF(debug, "Filling same events"); histos.fill(HIST("eventcount"), -2); if (minMultiplicity <= multiplicity && multiplicity <= range1Max) { From 5d293f0e57fb9618989e9f3434e19b4f37fb422f Mon Sep 17 00:00:00 2001 From: Josue Martinez Garcia Date: Wed, 7 Oct 2026 18:12:39 -0600 Subject: [PATCH 8/9] resolving Formating issues --- PWGUD/Tasks/upcPhotonuclearAnalysisJMG.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PWGUD/Tasks/upcPhotonuclearAnalysisJMG.cxx b/PWGUD/Tasks/upcPhotonuclearAnalysisJMG.cxx index 887bcbdfd79..803746bde48 100644 --- a/PWGUD/Tasks/upcPhotonuclearAnalysisJMG.cxx +++ b/PWGUD/Tasks/upcPhotonuclearAnalysisJMG.cxx @@ -1126,7 +1126,7 @@ struct UpcPhotonuclearAnalysisJMG { // if (fillCollisionUD(same, multiplicity) == false) { // return; // } - fillCollisionUD(same, multiplicity) + fillCollisionUD(same, multiplicity); // LOGF(debug, "Filling same events"); histos.fill(HIST("eventcount"), -2); if (minMultiplicity <= multiplicity && multiplicity <= range1Max) { From ac17143255f3bb4cf94fb18e1db22d1a2e232ba1 Mon Sep 17 00:00:00 2001 From: Josue Martinez Garcia Date: Fri, 9 Oct 2026 14:12:54 -0600 Subject: [PATCH 9/9] resolving code check issues --- PWGUD/Tasks/upcPhotonuclearAnalysisJMG.cxx | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/PWGUD/Tasks/upcPhotonuclearAnalysisJMG.cxx b/PWGUD/Tasks/upcPhotonuclearAnalysisJMG.cxx index 803746bde48..6503f39c085 100644 --- a/PWGUD/Tasks/upcPhotonuclearAnalysisJMG.cxx +++ b/PWGUD/Tasks/upcPhotonuclearAnalysisJMG.cxx @@ -755,7 +755,6 @@ struct UpcPhotonuclearAnalysisJMG { histos.fill(HIST("Events/SGsideA/hTrackPV"), nchPVGapSideA, nchGapSideA); nTracksChargedSideA = nTracksCharged; multiplicitySideA = reconstructedTracks.size(); - nTracksCharged = sumPt = 0; break; case 1: // gap for side C if (isCollisionCutSG(reconstructedCollision, 1) == false) { @@ -831,7 +830,6 @@ struct UpcPhotonuclearAnalysisJMG { histos.fill(HIST("Events/SGsideC/hTrackPV"), nchPVGapSideC, nchGapSideC); nTracksChargedSideC = nTracksCharged; multiplicitySideC = reconstructedTracks.size(); - nTracksCharged = sumPt = 0; break; default: return; @@ -881,8 +879,8 @@ struct UpcPhotonuclearAnalysisJMG { vTrackTOFNSigmaProSideC, vTrackTOFBetaSideC, vTrackTOFBetaErrorSideC, - nTracksChargedSideC, - multiplicitySideC, + nTracksChargedSideA, + multiplicitySideA, nTracksChargedSideC, multiplicitySideC); // nTracksChargedSideA = nTracksChargedSideC = multiplicitySideA = multiplicitySideC = 0;