From 97c75b49f3974d09c2bab955a904783f28912661 Mon Sep 17 00:00:00 2001 From: jikim1290 Date: Mon, 11 May 2026 14:53:13 +0900 Subject: [PATCH 1/5] adding eta axis --- PWGCF/JCorran/Tasks/jEPFlowAnalysis.cxx | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/PWGCF/JCorran/Tasks/jEPFlowAnalysis.cxx b/PWGCF/JCorran/Tasks/jEPFlowAnalysis.cxx index 0038553d347..69250721e11 100644 --- a/PWGCF/JCorran/Tasks/jEPFlowAnalysis.cxx +++ b/PWGCF/JCorran/Tasks/jEPFlowAnalysis.cxx @@ -114,6 +114,7 @@ struct jEPFlowAnalysis { ConfigurableAxis cfgAxisCent{"cfgAxisCent", {100, 0, 100}, ""}; ConfigurableAxis cfgAxisPt{"cfgAxisPt", {VARIABLE_WIDTH, 0.0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 1.0, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.7, 1.8, 1.9, 2.0, 2.2, 2.4, 2.6, 2.8, 3.0, 3.2, 3.5, 4.0, 4.5, 5.0, 6.0, 7.0, 8.0, 10.0, 12.0, 15.0, 30.0, 50.0, 70.0, 100.0}, ""}; + ConfigurableAxis cfgAxisEta{"cfgAxisEta", {20, -1, 1}, ""}; ConfigurableAxis cfgAxisCos{"cfgAxisCos", {102, -1.02, 1.02}, ""}; ConfigurableAxis cfgAxisQvec{"cfgAxisQvec", {200, -5.0, 5.0}, ""}; @@ -307,8 +308,8 @@ struct jEPFlowAnalysis { epFlowHistograms.fill(HIST("vncos"), i + 2, cent, track.pt(), vn, weight); epFlowHistograms.fill(HIST("vnsin"), i + 2, cent, track.pt(), vnSin, weight); - epFlowHistograms.fill(HIST("SPvnxx"), i + 2, cent, track.pt(), (std::cos(track.phi() * static_cast(i + 2)) * qx_shifted[0] + std::sin(track.phi() * static_cast(i + 2)) * qy_shifted[0]), weight); - epFlowHistograms.fill(HIST("SPvnxy"), i + 2, cent, track.pt(), (std::sin(track.phi() * static_cast(i + 2)) * qx_shifted[0] - std::cos(track.phi() * static_cast(i + 2)) * qy_shifted[0]), weight); + epFlowHistograms.fill(HIST("SPvnxx"), i + 2, cent, track.pt(), track.eta(), (std::cos(track.phi() * static_cast(i + 2)) * qx_shifted[0] + std::sin(track.phi() * static_cast(i + 2)) * qy_shifted[0]), weight); + epFlowHistograms.fill(HIST("SPvnxy"), i + 2, cent, track.pt(), track.eta(), (std::sin(track.phi() * static_cast(i + 2)) * qx_shifted[0] - std::cos(track.phi() * static_cast(i + 2)) * qy_shifted[0]), weight); } } } @@ -342,6 +343,7 @@ struct jEPFlowAnalysis { AxisSpec axisCent{cfgAxisCent, "cent"}; AxisSpec axisPt{cfgAxisPt, "pT"}; + AxisSpec axisEta{cfgAxisEta, "eta"}; AxisSpec axisCos{cfgAxisCos, "cos"}; AxisSpec axisQvec{cfgAxisQvec, "Qvec"}; @@ -369,8 +371,8 @@ struct jEPFlowAnalysis { epFlowHistograms.add("EpResQvecRefARefBxx", "", {HistType::kTH3F, {axisMod, axisCent, axisQvec}}); epFlowHistograms.add("EpResQvecRefARefBxy", "", {HistType::kTH3F, {axisMod, axisCent, axisQvec}}); - epFlowHistograms.add("SPvnxx", "", {HistType::kTHnSparseF, {axisMod, axisCent, axisPt, axisQvec}}); - epFlowHistograms.add("SPvnxy", "", {HistType::kTHnSparseF, {axisMod, axisCent, axisPt, axisQvec}}); + epFlowHistograms.add("SPvnxx", "", {HistType::kTHnSparseF, {axisMod, axisCent, axisPt, axisEta, axisQvec}}); + epFlowHistograms.add("SPvnxy", "", {HistType::kTHnSparseF, {axisMod, axisCent, axisPt, axisEta, axisQvec}}); epFlowHistograms.add("hCentrality", "", {HistType::kTH1F, {axisCent}}); epFlowHistograms.add("hVertex", "", {HistType::kTH1F, {axisVertex}}); From 6f4a8480f168b802a28cccbd8812f2f38dbcb711 Mon Sep 17 00:00:00 2001 From: jikim1290 Date: Tue, 12 May 2026 11:03:48 +0900 Subject: [PATCH 2/5] fix o2linter --- PWGCF/JCorran/Tasks/jEPFlowAnalysis.cxx | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/PWGCF/JCorran/Tasks/jEPFlowAnalysis.cxx b/PWGCF/JCorran/Tasks/jEPFlowAnalysis.cxx index 69250721e11..8e6c145fde4 100644 --- a/PWGCF/JCorran/Tasks/jEPFlowAnalysis.cxx +++ b/PWGCF/JCorran/Tasks/jEPFlowAnalysis.cxx @@ -37,10 +37,11 @@ #include #include #include +#include -#include #include #include +#include #include @@ -62,6 +63,8 @@ using MyTracksMC = soa::Join pdg; + HistogramRegistry epFlowHistograms{"EPFlow", {}, OutputObjHandlingPolicy::AnalysisObject, true, true}; EventPlaneHelper helperEP; FlowJHistManager histManager; @@ -70,9 +73,9 @@ struct jEPFlowAnalysis { o2::ccdb::CcdbApi ccdbApi; struct : ConfigurableGroup { - Configurable cfgURL{"cfgURL", + Configurable cfgUrl{"cfgUrl", "http://alice-ccdb.cern.ch", "Address of the CCDB to browse"}; - Configurable nolaterthan{"ccdb-no-later-than", + Configurable nolaterthan{"nolaterthan", std::chrono::duration_cast(std::chrono::system_clock::now().time_since_epoch()).count(), "Latest acceptable timestamp of creation for the object"}; } cfgCcdbParam; @@ -136,6 +139,8 @@ struct jEPFlowAnalysis { float cent; + float kMinQvecAmp = 1e-5; + float kMinChg = 0.1; std::vector shiftprofile{}; std::string fullCCDBShiftCorrPath; @@ -327,7 +332,7 @@ struct jEPFlowAnalysis { void init(InitContext const&) { - ccdb->setURL(cfgCcdbParam.cfgURL); + ccdb->setURL(cfgCcdbParam.cfgUrl); ccdbApi.init("http://alice-ccdb.cern.ch"); ccdb->setCaching(true); ccdb->setLocalObjectValidityChecking(); @@ -418,7 +423,7 @@ struct jEPFlowAnalysis { } } - if (coll.qvecAmp()[detId] < 1e-5 || coll.qvecAmp()[refAId] < 1e-5 || coll.qvecAmp()[refBId] < 1e-5) + if (coll.qvecAmp()[detId] < kMinQvecAmp || coll.qvecAmp()[refAId] < kMinQvecAmp || coll.qvecAmp()[refBId] < kMinQvecAmp) return; fillvn(coll, tracks); @@ -447,7 +452,7 @@ struct jEPFlowAnalysis { } } - for (auto trk : tracks) { + for (const auto& trk : tracks) { if (!trk.has_mcParticle()) { continue; } @@ -479,13 +484,13 @@ struct jEPFlowAnalysis { float cent = coll.centFT0C(); - for (auto& mcParticle : mcParticles) { + for (const auto& mcParticle : mcParticles) { if (std::abs(mcParticle.eta()) > cfgTrackCuts.cfgEtaMax) continue; - auto* p = TDatabasePDG::Instance()->GetParticle(mcParticle.pdgCode()); - if (p) { - if (std::abs(p->Charge()) < 1e-1) { + auto p = pdg->GetParticle(mcParticle.pdgCode()); + if (p != nullptr) { + if (std::abs(p->Charge()) < kMinChg) { continue; } } From 5bf10a0651609e848494b2a47c738848f49f9078 Mon Sep 17 00:00:00 2001 From: jikim1290 Date: Tue, 12 May 2026 19:19:34 +0900 Subject: [PATCH 3/5] fix var name --- PWGCF/JCorran/Tasks/jEPFlowAnalysis.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PWGCF/JCorran/Tasks/jEPFlowAnalysis.cxx b/PWGCF/JCorran/Tasks/jEPFlowAnalysis.cxx index 8e6c145fde4..07e87e14a09 100644 --- a/PWGCF/JCorran/Tasks/jEPFlowAnalysis.cxx +++ b/PWGCF/JCorran/Tasks/jEPFlowAnalysis.cxx @@ -139,8 +139,8 @@ struct jEPFlowAnalysis { float cent; - float kMinQvecAmp = 1e-5; - float kMinChg = 0.1; + float minQvecAmp = 1e-5; + float minChg = 0.1; std::vector shiftprofile{}; std::string fullCCDBShiftCorrPath; From 60a9f521b6d87c24e4e6a67584bdd9cc21518dd9 Mon Sep 17 00:00:00 2001 From: jikim1290 Date: Tue, 12 May 2026 19:22:41 +0900 Subject: [PATCH 4/5] fix var name --- PWGCF/JCorran/Tasks/jEPFlowAnalysis.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PWGCF/JCorran/Tasks/jEPFlowAnalysis.cxx b/PWGCF/JCorran/Tasks/jEPFlowAnalysis.cxx index 07e87e14a09..b9e4c977fc4 100644 --- a/PWGCF/JCorran/Tasks/jEPFlowAnalysis.cxx +++ b/PWGCF/JCorran/Tasks/jEPFlowAnalysis.cxx @@ -423,7 +423,7 @@ struct jEPFlowAnalysis { } } - if (coll.qvecAmp()[detId] < kMinQvecAmp || coll.qvecAmp()[refAId] < kMinQvecAmp || coll.qvecAmp()[refBId] < kMinQvecAmp) + if (coll.qvecAmp()[detId] < minQvecAmp || coll.qvecAmp()[refAId] < minQvecAmp || coll.qvecAmp()[refBId] < minQvecAmp) return; fillvn(coll, tracks); @@ -490,7 +490,7 @@ struct jEPFlowAnalysis { auto p = pdg->GetParticle(mcParticle.pdgCode()); if (p != nullptr) { - if (std::abs(p->Charge()) < kMinChg) { + if (std::abs(p->Charge()) < minChg) { continue; } } From 07dd422b46a3f988dc331e1e4009c2579eed6367 Mon Sep 17 00:00:00 2001 From: jikim1290 Date: Tue, 12 May 2026 20:54:51 +0900 Subject: [PATCH 5/5] fix struct name --- PWGCF/JCorran/Tasks/jEPFlowAnalysis.cxx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/PWGCF/JCorran/Tasks/jEPFlowAnalysis.cxx b/PWGCF/JCorran/Tasks/jEPFlowAnalysis.cxx index b9e4c977fc4..ed05872fee3 100644 --- a/PWGCF/JCorran/Tasks/jEPFlowAnalysis.cxx +++ b/PWGCF/JCorran/Tasks/jEPFlowAnalysis.cxx @@ -35,13 +35,13 @@ #include #include #include +#include #include #include -#include #include -#include #include +#include #include @@ -61,7 +61,7 @@ using MyTracks = soa::Join; using MyTracksMC = soa::Join; -struct jEPFlowAnalysis { +struct JEPFlowAnalysis { Service pdg; @@ -428,7 +428,7 @@ struct jEPFlowAnalysis { fillvn(coll, tracks); } - PROCESS_SWITCH(jEPFlowAnalysis, processDefault, "default process", true); + PROCESS_SWITCH(JEPFlowAnalysis, processDefault, "default process", true); void processMCRec(MyCollisionsMC::iterator const& coll, MyTracksMC const& tracks, aod::McParticles const& /*mcParticles*/, aod::McCollisions const& /*mcCollisions*/) { @@ -468,7 +468,7 @@ struct jEPFlowAnalysis { } } } - PROCESS_SWITCH(jEPFlowAnalysis, processMCRec, "process for MC", false); + PROCESS_SWITCH(JEPFlowAnalysis, processMCRec, "process for MC", false); void processMCGen(MyCollisionsMC::iterator const& coll, aod::McParticles const& mcParticles, aod::McCollisions const&) { @@ -501,11 +501,11 @@ struct jEPFlowAnalysis { epFlowHistograms.fill(HIST("MC/hPartGen"), cent, mcColl.posZ(), mcParticle.eta(), mcParticle.phi(), mcParticle.pt()); } } - PROCESS_SWITCH(jEPFlowAnalysis, processMCGen, "process for MC", false); + PROCESS_SWITCH(JEPFlowAnalysis, processMCGen, "process for MC", false); }; WorkflowSpec defineDataProcessing(ConfigContext const& cfgc) { return WorkflowSpec{ - adaptAnalysisTask(cfgc)}; + adaptAnalysisTask(cfgc)}; }