From 4cbc4d41ec461d995351a2d38821031ddfdc8027 Mon Sep 17 00:00:00 2001 From: sarjeeta gami Date: Fri, 8 May 2026 11:11:54 +0530 Subject: [PATCH 1/5] [PWGLF] bug fix in phi analysis --- PWGLF/Tasks/Resonances/phianalysisrun3_PbPb.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PWGLF/Tasks/Resonances/phianalysisrun3_PbPb.cxx b/PWGLF/Tasks/Resonances/phianalysisrun3_PbPb.cxx index 9787970f588..ba25047a46d 100644 --- a/PWGLF/Tasks/Resonances/phianalysisrun3_PbPb.cxx +++ b/PWGLF/Tasks/Resonances/phianalysisrun3_PbPb.cxx @@ -124,7 +124,7 @@ struct phianalysisrun3_PbPb { Configurable centestimator{"centestimator", 0, "Select multiplicity estimator: 0 - FT0C, 1 - FT0A, 2 - FT0M, 3 - FV0A, 4 - PVTracks"}; ConfigurableAxis binsMult{"binsMult", {500, 0.0f, +500.0f}, ""}; Configurable isApplyCentFT0C{"isApplyCentFT0C", true, "Centrality based on FT0C"}; - Configurable isApplyCentFT0M{"isApplyCentFV0M", false, "Centrality based on FT0M"}; + Configurable isApplyCentFT0M{"isApplyCentFT0M", false, "Centrality based on FT0M"}; Configurable isApplyInelgt0{"isApplyInelgt0", false, "Enable INEL > 0 condition"}; Configurable isApplyTVX{"isApplyTVX", false, "Enable TVX trigger sel"}; Configurable genacceptancecut{"genacceptancecut", true, "use acceptance cut for generated"}; @@ -1771,7 +1771,7 @@ struct phianalysisrun3_PbPb { multiplicity = collision.centFV0A(); } histos.fill(HIST("Centgen1"), multiplicity); - selectedEvents[nevts++] = collision.mcCollision_as().globalIndex(); + selectedEvents[nevts++] = collision.mcCollision_as().globalIndex(); } selectedEvents.resize(nevts); const auto evtReconstructedAndSelected = std::find(selectedEvents.begin(), selectedEvents.end(), mcCollision.globalIndex()) != selectedEvents.end(); From e3d42fba6f17306c5158d180a44eb9954afc5079 Mon Sep 17 00:00:00 2001 From: sarjeeta gami Date: Sat, 9 May 2026 18:36:25 +0530 Subject: [PATCH 2/5] [PWGLF] bug fix in phi analysis --- PWGLF/Tasks/Resonances/CMakeLists.txt | 2 +- ...srun3_PbPb.cxx => phianalysisrun3pbpb.cxx} | 36 +++++++++---------- 2 files changed, 19 insertions(+), 19 deletions(-) rename PWGLF/Tasks/Resonances/{phianalysisrun3_PbPb.cxx => phianalysisrun3pbpb.cxx} (98%) diff --git a/PWGLF/Tasks/Resonances/CMakeLists.txt b/PWGLF/Tasks/Resonances/CMakeLists.txt index 03bc8d9a45f..6a8ef220bc1 100644 --- a/PWGLF/Tasks/Resonances/CMakeLists.txt +++ b/PWGLF/Tasks/Resonances/CMakeLists.txt @@ -135,7 +135,7 @@ o2physics_add_dpl_workflow(phipbpb COMPONENT_NAME Analysis) o2physics_add_dpl_workflow(phianalysisrun3pbpb - SOURCES phianalysisrun3_PbPb.cxx + SOURCES phianalysisrun3pbpb.cxx PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore COMPONENT_NAME Analysis) diff --git a/PWGLF/Tasks/Resonances/phianalysisrun3_PbPb.cxx b/PWGLF/Tasks/Resonances/phianalysisrun3pbpb.cxx similarity index 98% rename from PWGLF/Tasks/Resonances/phianalysisrun3_PbPb.cxx rename to PWGLF/Tasks/Resonances/phianalysisrun3pbpb.cxx index ba25047a46d..1189291fa0e 100644 --- a/PWGLF/Tasks/Resonances/phianalysisrun3_PbPb.cxx +++ b/PWGLF/Tasks/Resonances/phianalysisrun3pbpb.cxx @@ -8,7 +8,7 @@ // In applying this license CERN does not waive the privileges and immunities // granted to it by virtue of its status as an Intergovernmental Organization // or submit itself to any jurisdiction. -/// \file phianalysisrun3_PbPb.cxx +/// \file Phianalysisrun3pbpb.cxx /// \brief Code for phi resonance without resonance initializer /// \author Sarjeeta Gami @@ -55,7 +55,7 @@ using namespace o2::framework::expressions; using std::array; using namespace o2::aod::rctsel; -struct phianalysisrun3_PbPb { +struct Phianalysisrun3pbpb { struct : ConfigurableGroup { Configurable requireRCTFlagChecker{"requireRCTFlagChecker", true, "Check event quality in run condition table"}; Configurable cfgEvtRCTFlagCheckerLabel{"cfgEvtRCTFlagCheckerLabel", "CBT_hadronPID", "Evt sel: RCT flag checker label"}; @@ -664,7 +664,7 @@ struct phianalysisrun3_PbPb { } } - PROCESS_SWITCH(phianalysisrun3_PbPb, processSameEvent, "Process Same event", false); + PROCESS_SWITCH(Phianalysisrun3pbpb, processSameEvent, "Process Same event", false); void processMixedEvent1(EventCandidates const& collisions, TrackCandidates const& tracks) { auto tracksTuple = std::make_tuple(tracks); @@ -740,7 +740,7 @@ struct phianalysisrun3_PbPb { } } } - PROCESS_SWITCH(phianalysisrun3_PbPb, processMixedEvent1, "Process Mixed event", false); + PROCESS_SWITCH(Phianalysisrun3pbpb, processMixedEvent1, "Process Mixed event", false); void processMixedEvent2(EventCandidates const& collisions, TrackCandidates const& tracks) { auto tracksTuple = std::make_tuple(tracks); @@ -817,7 +817,7 @@ struct phianalysisrun3_PbPb { } } - PROCESS_SWITCH(phianalysisrun3_PbPb, processMixedEvent2, "Process Mixed event", false); + PROCESS_SWITCH(Phianalysisrun3pbpb, processMixedEvent2, "Process Mixed event", false); void processMixedEvent3(EventCandidates const& collisions, TrackCandidates const& tracks) { auto tracksTuple = std::make_tuple(tracks); @@ -894,7 +894,7 @@ struct phianalysisrun3_PbPb { } } - PROCESS_SWITCH(phianalysisrun3_PbPb, processMixedEvent3, "Process Mixed event", false); + PROCESS_SWITCH(Phianalysisrun3pbpb, processMixedEvent3, "Process Mixed event", false); void processMixedEvent4(EventCandidates const& collisions, TrackCandidates const& tracks) { auto tracksTuple = std::make_tuple(tracks); @@ -971,7 +971,7 @@ struct phianalysisrun3_PbPb { } } - PROCESS_SWITCH(phianalysisrun3_PbPb, processMixedEvent4, "Process Mixed event", false); + PROCESS_SWITCH(Phianalysisrun3pbpb, processMixedEvent4, "Process Mixed event", false); void processRotEvent(EventCandidates::iterator const& collision, TrackCandidates const& tracks, aod::BCs const&) { if (!collision.sel8()) { @@ -1057,7 +1057,7 @@ struct phianalysisrun3_PbPb { } } - PROCESS_SWITCH(phianalysisrun3_PbPb, processRotEvent, "Process Rot event", false); + PROCESS_SWITCH(Phianalysisrun3pbpb, processRotEvent, "Process Rot event", false); void processMC(CollisionMCTrueTable::iterator const& /*TrueCollision*/, CollisionMCRecTableCentFT0C const& RecCollisions, TrackMCTrueTable const& GenParticles, FilTrackMCRecTable const& RecTracks) { histos.fill(HIST("hMC"), 0); @@ -1270,7 +1270,7 @@ struct phianalysisrun3_PbPb { } // rec collision loop } // process MC - PROCESS_SWITCH(phianalysisrun3_PbPb, processMC, "Process Reconstructed", false); + PROCESS_SWITCH(Phianalysisrun3pbpb, processMC, "Process Reconstructed", false); void processGen(aod::McCollision const& mcCollision, aod::McParticles const& mcParticles, const soa::SmallGroups& collisions) { @@ -1358,7 +1358,7 @@ struct phianalysisrun3_PbPb { } } } - PROCESS_SWITCH(phianalysisrun3_PbPb, processGen, "Process Generated", false); + PROCESS_SWITCH(Phianalysisrun3pbpb, processGen, "Process Generated", false); void processRec(EventCandidatesMC::iterator const& collision, TrackCandidatesMC const& tracks, aod::McParticles const& /*mcParticles*/, aod::McCollisions const& /*mcCollisions*/) { if (!collision.has_mcCollision()) { @@ -1487,7 +1487,7 @@ struct phianalysisrun3_PbPb { } } - PROCESS_SWITCH(phianalysisrun3_PbPb, processRec, "Process Reconstructed", false); + PROCESS_SWITCH(Phianalysisrun3pbpb, processRec, "Process Reconstructed", false); void processSameEventMC(EventCandidatesMC::iterator const& collision, TrackCandidatesMC const& tracks, aod::McParticles const& /*mcParticles*/, aod::McCollisions const& /*mcCollisions*/) { if (!collision.sel8()) { @@ -1599,7 +1599,7 @@ struct phianalysisrun3_PbPb { } } - PROCESS_SWITCH(phianalysisrun3_PbPb, processSameEventMC, "Process Same event", false); + PROCESS_SWITCH(Phianalysisrun3pbpb, processSameEventMC, "Process Same event", false); void processMixedEventMC(EventCandidatesMC const& recCollisions, TrackCandidatesMC const& RecTracks, aod::McParticles const&) { @@ -1684,7 +1684,7 @@ struct phianalysisrun3_PbPb { } } } - PROCESS_SWITCH(phianalysisrun3_PbPb, processMixedEventMC, "Process Mixed event MC", true); + PROCESS_SWITCH(Phianalysisrun3pbpb, processMixedEventMC, "Process Mixed event MC", true); void processGen1(McCollisionMults::iterator const& mcCollision, aod::McParticles const& mcParticles, const soa::SmallGroups& collisions) { // all events @@ -1815,7 +1815,7 @@ struct phianalysisrun3_PbPb { } } - PROCESS_SWITCH(phianalysisrun3_PbPb, processGen1, "Process Generated", false); + PROCESS_SWITCH(Phianalysisrun3pbpb, processGen1, "Process Generated", false); void processRec1(EventCandidatesMC::iterator const& collision, TrackCandidatesMC const& tracks, aod::McParticles const& /*mcParticles*/, aod::McCollisions const& /*mcCollisions*/) { if (!collision.has_mcCollision()) { @@ -1964,7 +1964,7 @@ struct phianalysisrun3_PbPb { } } - PROCESS_SWITCH(phianalysisrun3_PbPb, processRec1, "Process Reconstructed", false); + PROCESS_SWITCH(Phianalysisrun3pbpb, processRec1, "Process Reconstructed", false); void processEvtLossSigLossMC(McCollisionMults::iterator const& mcCollision, aod::McParticles const& mcParticles, const soa::SmallGroups& recCollisions) { @@ -2040,7 +2040,7 @@ struct phianalysisrun3_PbPb { } } // end loop on gen particles } - PROCESS_SWITCH(phianalysisrun3_PbPb, processEvtLossSigLossMC, "Process Signal Loss, Event Loss", false); + PROCESS_SWITCH(Phianalysisrun3pbpb, processEvtLossSigLossMC, "Process Signal Loss, Event Loss", false); void processEvtLossSigLossMC1(McCollisionMults::iterator const& mcCollision, soa::SmallGroups const& collisions, aod::McParticles const& GenParticles) { if (selectionConfig.cutvzgen && @@ -2126,10 +2126,10 @@ struct phianalysisrun3_PbPb { } } } - PROCESS_SWITCH(phianalysisrun3_PbPb, processEvtLossSigLossMC1, "Process Signal Loss, Event Loss", false); + PROCESS_SWITCH(Phianalysisrun3pbpb, processEvtLossSigLossMC1, "Process Signal Loss, Event Loss", false); }; WorkflowSpec defineDataProcessing(ConfigContext const& cfgc) { return WorkflowSpec{ - adaptAnalysisTask(cfgc, TaskName{"phianalysisrun3_PbPb"})}; + adaptAnalysisTask(cfgc)}; } From a6425b79da626f62b6563209023833159e724801 Mon Sep 17 00:00:00 2001 From: sarjeeta gami Date: Sat, 9 May 2026 18:38:11 +0530 Subject: [PATCH 3/5] [PWGLF] bug fix in phi analysis --- PWGLF/Tasks/Resonances/phianalysisrun3pbpb.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PWGLF/Tasks/Resonances/phianalysisrun3pbpb.cxx b/PWGLF/Tasks/Resonances/phianalysisrun3pbpb.cxx index 1189291fa0e..6a9f4a5f3b0 100644 --- a/PWGLF/Tasks/Resonances/phianalysisrun3pbpb.cxx +++ b/PWGLF/Tasks/Resonances/phianalysisrun3pbpb.cxx @@ -2131,5 +2131,5 @@ struct Phianalysisrun3pbpb { WorkflowSpec defineDataProcessing(ConfigContext const& cfgc) { return WorkflowSpec{ - adaptAnalysisTask(cfgc)}; + adaptAnalysisTask(cfgc)}; } From 983cd0dcc2f05da949ef8448d33ce869e71bfbc7 Mon Sep 17 00:00:00 2001 From: sarjeeta gami Date: Sat, 9 May 2026 18:52:52 +0530 Subject: [PATCH 4/5] [PWGLF] bug fix in phi analysis --- PWGLF/Tasks/Resonances/phianalysisrun3pbpb.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PWGLF/Tasks/Resonances/phianalysisrun3pbpb.cxx b/PWGLF/Tasks/Resonances/phianalysisrun3pbpb.cxx index 6a9f4a5f3b0..4f7c77112d2 100644 --- a/PWGLF/Tasks/Resonances/phianalysisrun3pbpb.cxx +++ b/PWGLF/Tasks/Resonances/phianalysisrun3pbpb.cxx @@ -8,7 +8,7 @@ // In applying this license CERN does not waive the privileges and immunities // granted to it by virtue of its status as an Intergovernmental Organization // or submit itself to any jurisdiction. -/// \file Phianalysisrun3pbpb.cxx +/// \file phianalysisrun3pbpb.cxx /// \brief Code for phi resonance without resonance initializer /// \author Sarjeeta Gami From c63ec16c7c530ce05c1c29b5b03a933b5557a2fd Mon Sep 17 00:00:00 2001 From: sarjeeta gami Date: Sun, 10 May 2026 15:00:55 +0530 Subject: [PATCH 5/5] [PWGLF] bug fix in phi analysis --- PWGLF/Tasks/Resonances/phianalysisrun3pbpb.cxx | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/PWGLF/Tasks/Resonances/phianalysisrun3pbpb.cxx b/PWGLF/Tasks/Resonances/phianalysisrun3pbpb.cxx index 4f7c77112d2..803a534fca0 100644 --- a/PWGLF/Tasks/Resonances/phianalysisrun3pbpb.cxx +++ b/PWGLF/Tasks/Resonances/phianalysisrun3pbpb.cxx @@ -8,6 +8,7 @@ // In applying this license CERN does not waive the privileges and immunities // granted to it by virtue of its status as an Intergovernmental Organization // or submit itself to any jurisdiction. + /// \file phianalysisrun3pbpb.cxx /// \brief Code for phi resonance without resonance initializer /// \author Sarjeeta Gami @@ -349,11 +350,11 @@ struct Phianalysisrun3pbpb { return false; } else if (pid == 1) { - constexpr double kPtThresholdForTOF = 0.5; - if (candidate.pt() < kPtThresholdForTOF && std::abs(candidate.tpcNSigmaKa()) < selectionConfig.nsigmacutTPC) { + constexpr double PtThresholdForTOF = 0.5; + if (candidate.pt() < PtThresholdForTOF && std::abs(candidate.tpcNSigmaKa()) < selectionConfig.nsigmacutTPC) { return true; } - if (candidate.pt() >= kPtThresholdForTOF && candidate.hasTOF() && candidate.beta() > cfgCutTOFBeta && + if (candidate.pt() >= PtThresholdForTOF && candidate.hasTOF() && candidate.beta() > cfgCutTOFBeta && std::abs(candidate.tpcNSigmaKa()) < selectionConfig.nsigmacutTPC && std::abs(candidate.tofNSigmaKa()) < selectionConfig.nsigmacutTOF) { return true; } @@ -461,10 +462,10 @@ struct Phianalysisrun3pbpb { candidate1.pz() + candidate2.pz()}, mass); - constexpr int kOppositeCharge = 0; + constexpr int OppositeCharge = 0; // default filling - if (rapidity > rapiditycut1 && rapidity < rapiditycut2 && track1Sign * track2Sign < kOppositeCharge) { + if (rapidity > rapiditycut1 && rapidity < rapiditycut2 && track1Sign * track2Sign < OppositeCharge) { if (unlike) { histos.fill(HIST("h3PhiInvMassUnlikeSign"), multiplicity, pT, mass); histos.fill(HIST("h2PhiRapidity"), pT, rapidity); @@ -2092,8 +2093,8 @@ struct Phianalysisrun3pbpb { continue; auto daughters = particle.daughters_as(); - static constexpr int kPhiNDaughters = 2; - if (daughters.size() != kPhiNDaughters) + static constexpr int PhiNDaughters = 2; + if (daughters.size() != PhiNDaughters) continue; bool daup = false, daun = false;