From 41081df71e53351c6b2760bffca7554f4c062cad Mon Sep 17 00:00:00 2001 From: josue-MiniPC-Ubuntu Date: Wed, 29 Oct 2025 14:43:29 -0600 Subject: [PATCH 1/6] 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 c1ba0124327..325b12984d0 100644 --- a/PWGUD/Tasks/upcPhotonuclearAnalysisJMG.cxx +++ b/PWGUD/Tasks/upcPhotonuclearAnalysisJMG.cxx @@ -359,6 +359,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 2c8c07eda3bfcca5e4081f5f56b1f14732d7a5fb Mon Sep 17 00:00:00 2001 From: josue-MiniPC-Ubuntu Date: Wed, 29 Oct 2025 14:48:49 -0600 Subject: [PATCH 2/6] 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 325b12984d0..c1ba0124327 100644 --- a/PWGUD/Tasks/upcPhotonuclearAnalysisJMG.cxx +++ b/PWGUD/Tasks/upcPhotonuclearAnalysisJMG.cxx @@ -359,7 +359,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 de6c55dc22c969e10c289d8c89aeb96c055507b2 Mon Sep 17 00:00:00 2001 From: Josue Martinez Garcia Date: Fri, 7 Nov 2025 00:11:56 -0600 Subject: [PATCH 3/6] 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 7584e824e6a..28cffe8a61a 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 415f17f5d6cb94193468360a4903f53306e0ab42 Mon Sep 17 00:00:00 2001 From: Josue Martinez Garcia Date: Tue, 11 Nov 2025 01:01:22 -0600 Subject: [PATCH 4/6] 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 28cffe8a61a..7584e824e6a 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 740c7579e1da74e52466a612083f58286ddf19c2 Mon Sep 17 00:00:00 2001 From: rolavick Date: Thu, 19 Mar 2026 09:34:03 +0100 Subject: [PATCH 5/6] Dummy commit to restart tests From a3ee9961274af6e6abc69af90747f5607f1f7222 Mon Sep 17 00:00:00 2001 From: Josue Martinez Garcia Date: Sun, 22 Mar 2026 17:12:05 -0600 Subject: [PATCH 6/6] adding selection criteria on FT0 amplitude --- PWGUD/Tasks/upcPhotonuclearAnalysisJMG.cxx | 39 +++++++++++++--------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/PWGUD/Tasks/upcPhotonuclearAnalysisJMG.cxx b/PWGUD/Tasks/upcPhotonuclearAnalysisJMG.cxx index c1ba0124327..68f9c1698e1 100644 --- a/PWGUD/Tasks/upcPhotonuclearAnalysisJMG.cxx +++ b/PWGUD/Tasks/upcPhotonuclearAnalysisJMG.cxx @@ -161,16 +161,18 @@ struct UpcPhotonuclearAnalysisJMG { Configurable cutGapATimeZNA{"cutGapATimeZNA", 2., {"My collision cut. Gap Side A"}}; Configurable cutGapATimeZNC{"cutGapATimeZNC", 2., {"My collision cut. Gap Side A"}}; Configurable cutGapAMyEnergyZNA{"cutGapAMyEnergyZNA", 0., {"My collision cut. Gap Side A"}}; - // Configurable cutAGapMyAmplitudeFT0AMax{"cutAGapMyAmplitudeFT0AMax", 200., {"My collision cut. A Gap"}}; + Configurable useFT0AGapA{"useFT0AGapA", false, {"My collision cut. Gap Side A"}}; + Configurable cutGapAMyAmplitudeFT0A{"cutGapAMyAmplitudeFT0A", 100., {"My collision cut. A Gap"}}; Configurable cutGapAMyEnergyZNC{"cutGapAMyEnergyZNC", 1., {"My collision cut. Gap Side A"}}; - Configurable useFV0{"useFV0", false, {"My collision cut. Gap Side A"}}; + Configurable useFV0{"useFV0", false, {"My collision cut. Gap Side A"}}; Configurable cutGapAFV0Amplitude{"cutGapAFV0Amplitude", 50, {"My collision cut. Gap Side A"}}; // Configurable cutAGapMyAmplitudeFT0CMin{"cutAGapMyAmplitudeFT0CMin", 0., {"My collision cut. A Gap"}}; // Declare configurables on side C gap Configurable cutGapCTimeZNA{"cutGapCTimeZNA", 2., {"My collision cut. Gap Side C"}}; Configurable cutGapCTimeZNC{"cutGapCTimeZNC", 2., {"My collision cut. Gap Side C"}}; Configurable cutGapCMyEnergyZNA{"cutGapCMyEnergyZNA", 1., {"My collision cut. Gap Side C"}}; - // Configurable cutCGapMyAmplitudeFT0AMin{"cutCGapMyAmplitudeFT0AMin", 0., {"My collision cut. A Gap"}}; + Configurable useFT0CGapC{"useFT0CGapC", false, {"My collision cut. Gap Side A"}}; + Configurable cutGapCMyAmplitudeFT0C{"cutGapCMyAmplitudeFT0C", 50., {"My collision cut. A Gap"}}; Configurable cutGapCMyEnergyZNC{"cutGapCMyEnergyZNC", 0., {"My collision cut. Gap Side C"}}; // Configurable cutCGapMyAmplitudeFT0CMax{"cutCGapMyAmplitudeFT0CMax", 200., {"My collision cut. A Gap"}}; // Declare configurables on tracks @@ -230,7 +232,7 @@ struct UpcPhotonuclearAnalysisJMG { void init(InitContext const&) { const AxisSpec axisCollision{4, -0.5, 3.5}; - const AxisSpec axisCollisionFlow{12, -0.5, 11.5}; + const AxisSpec axisCollisionFlow{13, -0.5, 12.5}; const AxisSpec axisZvtx{20, -10., 10.}; const AxisSpec axisPt{402, -0.05, 20.05}; const AxisSpec axisP{402, -10.05, 10.05}; @@ -411,7 +413,7 @@ struct UpcPhotonuclearAnalysisJMG { if (!(std::abs(collision.timeZNA()) > cutGapATimeZNA && std::abs(collision.timeZNC()) < cutGapATimeZNC)) { return false; } - if (useEnergyZN && ((collision.energyCommonZNA() < cutGapAMyEnergyZNA) && (collision.energyCommonZNC() >= cutGapAMyEnergyZNC))) { + if (useEnergyZN && !((collision.energyCommonZNA() < cutGapAMyEnergyZNA) && (collision.energyCommonZNC() >= cutGapAMyEnergyZNC))) { return false; } // 0n - A side && Xn - C Side if (useGapSideVariable && collision.gapSide() != uint8_t(0)) { @@ -420,23 +422,23 @@ struct UpcPhotonuclearAnalysisJMG { if (useFV0 && collision.totalFV0AmplitudeA() > cutGapAFV0Amplitude) { return false; } - // if ((collision.totalFT0AmplitudeA() < cutAGapMyAmplitudeFT0AMax && collision.totalFT0AmplitudeC() >= cutAGapMyAmplitudeFT0CMin) == false) { - // return false; - // } + if (useFT0AGapA && (collision.totalFT0AmplitudeA() > cutGapAMyAmplitudeFT0A)) { + return false; + } break; case 1: // Gap in C side if (!(std::abs(collision.timeZNA()) < cutGapCTimeZNA && std::abs(collision.timeZNC()) > cutGapCTimeZNC)) { return false; } - if (useEnergyZN && ((collision.energyCommonZNA() >= cutGapCMyEnergyZNA) && (collision.energyCommonZNC() < cutGapCMyEnergyZNC))) { + if (useEnergyZN && !((collision.energyCommonZNA() >= cutGapCMyEnergyZNA) && (collision.energyCommonZNC() < cutGapCMyEnergyZNC))) { return false; } // Xn - A side && 0n - C Side if (useGapSideVariable && collision.gapSide() != uint8_t(1)) { return false; } - // if ((collision.totalFT0AmplitudeA() >= cutCGapMyAmplitudeFT0AMin && collision.totalFT0AmplitudeC() < cutCGapMyAmplitudeFT0CMax) == false) { - // return false; - // } + if (useFT0CGapC && (collision.totalFT0AmplitudeC() > cutGapCMyAmplitudeFT0C)) { + return false; + } break; default: return false; @@ -875,7 +877,8 @@ struct UpcPhotonuclearAnalysisJMG { hEventFlow->GetXaxis()->SetBinLabel(9, "Time ZN"); hEventFlow->GetXaxis()->SetBinLabel(10, "Energy ZN"); hEventFlow->GetXaxis()->SetBinLabel(11, "FV0-A Amplitude"); - hEventFlow->GetXaxis()->SetBinLabel(12, "GapSide Variable"); + hEventFlow->GetXaxis()->SetBinLabel(12, "FT0 Amplitude"); + hEventFlow->GetXaxis()->SetBinLabel(13, "GapSide Variable"); histos.fill(HIST("Events/hCollisionsFlow"), 0); if (std::abs(reconstructedCollision.posZ()) > myZVtxCut) { @@ -915,7 +918,7 @@ struct UpcPhotonuclearAnalysisJMG { bool isGapAMyEnergyZN = useEnergyZN && ((reconstructedCollision.energyCommonZNA() < cutGapAMyEnergyZNA) && (reconstructedCollision.energyCommonZNC() >= cutGapAMyEnergyZNC)); bool isGapCMyEnergyZN = useEnergyZN && ((reconstructedCollision.energyCommonZNA() >= cutGapCMyEnergyZNA) && (reconstructedCollision.energyCommonZNC() < cutGapCMyEnergyZNC)); - if (isGapAMyEnergyZN || isGapCMyEnergyZN) { + if (useEnergyZN && !(isGapAMyEnergyZN || isGapCMyEnergyZN)) { return; } histos.fill(HIST("Events/hCollisionsFlow"), 9); @@ -923,12 +926,18 @@ struct UpcPhotonuclearAnalysisJMG { return; } histos.fill(HIST("Events/hCollisionsFlow"), 10); + bool cutFT0AGapA = useFT0AGapA && reconstructedCollision.totalFT0AmplitudeA() > cutGapAMyAmplitudeFT0A; + bool cutFT0CGapC = useFT0CGapC && reconstructedCollision.totalFT0AmplitudeC() > cutGapCMyAmplitudeFT0C; + if (cutFT0AGapA || cutFT0CGapC) { + return; + } + histos.fill(HIST("Events/hCollisionsFlow"), 11); bool cutGapSideAVariable = useGapSideVariable && reconstructedCollision.gapSide() != uint8_t(0); bool cutGapSideCVariable = useGapSideVariable && reconstructedCollision.gapSide() != uint8_t(1); if (cutGapSideAVariable || cutGapSideCVariable) { return; } - histos.fill(HIST("Events/hCollisionsFlow"), 11); + histos.fill(HIST("Events/hCollisionsFlow"), 12); if (isCollisionCutSG(reconstructedCollision) == false) { return;