Skip to content

[PWGCF] jEPFlowAnalysis.cxx: fix bug for initialization #17583

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wenyaCern merged 5 commits into from
Aug 25, 2026
+82 −51
Merged

[PWGCF] jEPFlowAnalysis.cxx: fix bug for initialization #17583

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d7b8010
fix bug for initialization
jikim1290 Aug 24, 2026
ddcd2a1
fix bug for initialization
jikim1290 Aug 25, 2026
d3deb6e
fix code checker
jikim1290 Aug 25, 2026
20a28e3
fix code checker
jikim1290 Aug 25, 2026
3336ec0
fix code checker
jikim1290 Aug 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
133 changes: 82 additions & 51 deletions PWGCF/JCorran/Tasks/jEPFlowAnalysis.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
#include <RtypesCore.h>

#include <algorithm>
#include <array>
#include <chrono>
#include <cmath>
#include <cstddef>
Expand Down Expand Up @@ -79,15 +80,15 @@ struct JEPFlowAnalysis {
kHistsel
};

Service<o2::framework::O2DatabasePDG> pdg;
Service<o2::framework::O2DatabasePDG> pdg{};

HistogramRegistry epFlowHistograms{"EPFlow", {}, OutputObjHandlingPolicy::AnalysisObject, true, true};
EventPlaneHelper helperEP;
o2::ft0::Geometry ft0geom;
o2::fv0::Geometry* fv0geom = nullptr;
FlowJHistManager histManager;
bool debug = kFALSE;
Service<o2::ccdb::BasicCCDBManager> ccdb;
Service<o2::ccdb::BasicCCDBManager> ccdb{};
o2::ccdb::CcdbApi ccdbApi;

struct : ConfigurableGroup {
Expand Down Expand Up @@ -204,7 +205,7 @@ struct JEPFlowAnalysis {
float subleadingPhi = -999.;
float subleadingEta = -999.;

std::vector<TProfile3D*> shiftprofile{};
std::vector<TProfile3D*> shiftprofile;
std::string fullCCDBShiftCorrPath;

THn* effMap = nullptr;
Expand All @@ -215,8 +216,8 @@ struct JEPFlowAnalysis {
int nHighPt = 0;
int minnHighPt = 2;

std::vector<float> ft0RelGainConst{};
std::vector<float> fv0RelGainConst{};
std::vector<float> ft0RelGainConst;
std::vector<float> fv0RelGainConst;

bool q2sel(float q2, bool isHigh)
{
Expand All @@ -226,74 +227,89 @@ struct JEPFlowAnalysis {
if (idx < 0) {
idx = 0;
}

if (isHigh) {
if (idx >= static_cast<int>(cfgMultq2high->size())) {
idx = cfgMultq2high->size() - 1;
}
float sel = cfgMultq2high->at(idx);
return q2 > sel;
} else {
if (idx >= static_cast<int>(cfgMultq2low->size())) {
idx = cfgMultq2low->size() - 1;
}
float sel = cfgMultq2low->at(idx);
return q2 < sel;
}

if (idx >= static_cast<int>(cfgMultq2low->size())) {
idx = cfgMultq2low->size() - 1;
}
float sel = cfgMultq2low->at(idx);
return q2 < sel;
}

template <typename T>
int getdetId(const T& name)
{
if (name.value == "FT0C") {
return 0;
} else if (name.value == "FT0A") {
}
if (name.value == "FT0A") {
return 1;
} else if (name.value == "FT0M") {
}
if (name.value == "FT0M") {
return 2;
} else if (name.value == "FV0A") {
}
if (name.value == "FV0A") {
return 3;
} else if (name.value == "TPCPos") {
}
if (name.value == "TPCPos") {
return 4;
} else if (name.value == "TPCNeg") {
}
if (name.value == "TPCNeg") {
return 5;
} else if (name.value == "TPCTot") {
}
if (name.value == "TPCTot") {
return 6;
} else {
return 0;
}
return 0;
}

template <typename Col>
bool eventSel(const Col& coll)
{
if (std::abs(coll.posZ()) > cfgVertexZ)
if (std::abs(coll.posZ()) > cfgVertexZ) {
return false;
}

switch (cfgEvtSel) {
case 0: // Sel8
if (!coll.sel8())
if (!coll.sel8()) {
return false;
}
break;
case 1: // PbPb standard
if (!coll.sel8() || !coll.selection_bit(aod::evsel::kIsGoodZvtxFT0vsPV) || !coll.selection_bit(aod::evsel::kNoSameBunchPileup))
if (!coll.sel8() || !coll.selection_bit(aod::evsel::kIsGoodZvtxFT0vsPV) || !coll.selection_bit(aod::evsel::kNoSameBunchPileup)) {
return false;
}
break;
case 2: // PbPb with pileup
if (!coll.sel8() || !coll.selection_bit(o2::aod::evsel::kNoCollInTimeRangeStandard) ||
!coll.selection_bit(aod::evsel::kIsGoodZvtxFT0vsPV) || !coll.selection_bit(aod::evsel::kNoSameBunchPileup))
!coll.selection_bit(aod::evsel::kIsGoodZvtxFT0vsPV) || !coll.selection_bit(aod::evsel::kNoSameBunchPileup)) {
return false;
}
break;
case 3: // Small systems (OO, NeNe, pp)
if (!coll.sel8() || !coll.selection_bit(aod::evsel::kNoSameBunchPileup))
if (!coll.sel8() || !coll.selection_bit(aod::evsel::kNoSameBunchPileup)) {
return false;
}
break;

default:
return false;
}
// Check occupancy
if (coll.trackOccupancyInTimeRange() > cfgMaxOccupancy || coll.trackOccupancyInTimeRange() < cfgMinOccupancy)
if (coll.trackOccupancyInTimeRange() > cfgMaxOccupancy || coll.trackOccupancyInTimeRange() < cfgMinOccupancy) {
return false;

if (rctCut.requireRCTFlagChecker && !rctChecker(coll))
}
if (rctCut.requireRCTFlagChecker && !rctChecker(coll)) {
return false;

}
return true;
}

Expand Down Expand Up @@ -371,9 +387,9 @@ struct JEPFlowAnalysis {
template <typename Col, typename Trk>
void fillvn(const Col& coll, const Trk& tracks)
{
float eps[3] = {0.};
float qx_shifted[3] = {0.};
float qy_shifted[3] = {0.};
std::array<float, 3> eps{};
std::array<float, 3> qx_shifted{};
std::array<float, 3> qy_shifted{};

for (int i = 0; i < cfgnMode; i++) { // loop over different harmonic orders
harmInd = cfgnTotalSystem * 4 * (i) + 3; // harmonic index to access corresponding Q-vector as all Q-vectors are in same vector
Expand Down Expand Up @@ -431,7 +447,7 @@ struct JEPFlowAnalysis {
q2selLow = q2Map->GetBinContent(q2Map->GetXaxis()->FindBin(i + 2), q2Map->GetYaxis()->FindBin(cent), q2Map->GetZaxis()->FindBin(1. - cfgQ2SelFrac));
}

if (cfgSelEvtTwoHP && i == 0) {
if (i == 0) {
leadingPt = 0.0;
leadingPhi = 0.0;
leadingEta = 0.0;
Expand All @@ -441,9 +457,13 @@ struct JEPFlowAnalysis {
subleadingEta = 0.0;

nHighPt = 0;
}

if (cfgSelEvtTwoHP && i == 0) {
for (const auto& track : tracks) {
if (cfgTrkSelFlag && trackSel(track))
if (cfgTrkSelFlag && trackSel(track) != 0) {
continue;
}

if (leadingPt < track.pt()) {
subleadingPt = leadingPt;
Expand All @@ -459,19 +479,23 @@ struct JEPFlowAnalysis {
subleadingEta = track.eta();
}

if (track.pt() > cfgHighPtSel)
if (track.pt() > cfgHighPtSel) {
nHighPt++;
}
}
}

if (cfgSelEvtTwoHP && nHighPt < minnHighPt)
if (cfgSelEvtTwoHP && nHighPt < minnHighPt) {
continue;
}

if (std::abs(RecoDecay::constrainAngle(leadingPhi - subleadingPhi, 0) - constants::math::PI) > cfgTwoLPAngle)
if (cfgSelEvtTwoHP && std::abs(RecoDecay::constrainAngle(leadingPhi - subleadingPhi, 0) - constants::math::PI) > cfgTwoLPAngle) {
continue;
}

if (std::abs(leadingEta + subleadingEta) > cfgEtaBalancing)
if (cfgSelEvtTwoHP && std::abs(leadingEta + subleadingEta) > cfgEtaBalancing) {
continue;
}

epFlowHistograms.fill(HIST("EpDet"), i + 2, cent, eps[0]);
epFlowHistograms.fill(HIST("EpRefA"), i + 2, cent, eps[1]);
Expand Down Expand Up @@ -526,8 +550,9 @@ struct JEPFlowAnalysis {
leadingPhi = 0.0;
leadingEta = 0.0;
for (const auto& track : tracks) {
if (cfgTrkSelFlag && trackSel(track))
if (cfgTrkSelFlag && trackSel(track) != 0) {
continue;
}

if (cfgEffCor) {
weight = getEfficiencyCorrection(effMap, track.eta(), track.pt(), cent, coll.posZ());
Expand Down Expand Up @@ -571,13 +596,13 @@ struct JEPFlowAnalysis {

double getEfficiencyCorrection(THn* eff, float eta, float pt, float multiplicity, float posZ)
{
int effVars[4];
std::array<int, 4> effVars{};
effVars[0] = eff->GetAxis(0)->FindBin(eta);
effVars[1] = eff->GetAxis(1)->FindBin(pt);
effVars[2] = eff->GetAxis(2)->FindBin(multiplicity);
effVars[3] = eff->GetAxis(3)->FindBin(posZ);

return eff->GetBinContent(effVars);
return eff->GetBinContent(effVars.data());
}

void init(InitContext const&)
Expand Down Expand Up @@ -652,7 +677,7 @@ struct JEPFlowAnalysis {
epFlowHistograms.add("EpResQvecEvslDetRefBxx", "", {HistType::kTH3F, {axisMod, axisCent, axisQvec}});
epFlowHistograms.add("EpResQvecEvslRefARefBxx", "", {HistType::kTH3F, {axisMod, axisCent, axisQvec}});

if (cfgq2analysis) {
if (cfgq2analysis != 0) {
epFlowHistograms.add("EpResQvecDetRefAxx_q2high", "", {HistType::kTH3F, {axisMod, axisCent, axisQvec}});
epFlowHistograms.add("EpResQvecDetRefBxx_q2high", "", {HistType::kTH3F, {axisMod, axisCent, axisQvec}});
epFlowHistograms.add("EpResQvecRefARefBxx_q2high", "", {HistType::kTH3F, {axisMod, axisCent, axisQvec}});
Expand All @@ -663,7 +688,7 @@ struct JEPFlowAnalysis {

epFlowHistograms.add("SPvnxx", "", {HistType::kTHnSparseF, {axisMod, axisCent, axisPt, axisEta, axisQvec}});
epFlowHistograms.add("SPvnxy", "", {HistType::kTHnSparseF, {axisMod, axisCent, axisPt, axisEta, axisQvec}});
if (cfgq2analysis) {
if (cfgq2analysis != 0) {
epFlowHistograms.add("SPvnxx_q2high", "", {HistType::kTHnSparseF, {axisMod, axisCent, axisPt, axisEta, axisQvec}});
epFlowHistograms.add("SPvnxx_q2low", "", {HistType::kTHnSparseF, {axisMod, axisCent, axisPt, axisEta, axisQvec}});
}
Expand All @@ -679,8 +704,9 @@ struct JEPFlowAnalysis {
void processDefault(MyCollisions::iterator const& coll, soa::Filtered<MyTracks> const& tracks, aod::BCsWithTimestamps const&, aod::FT0s const&)
{
if (cfgAddEvtSel) {
if (!eventSel(coll))
if (!eventSel(coll)) {
return;
}
}

if (cfgEffCor) {
Expand Down Expand Up @@ -762,21 +788,22 @@ struct JEPFlowAnalysis {
}
}

if (coll.qvecAmp()[detId] < minQvecAmp || coll.qvecAmp()[refAId] < minQvecAmp || coll.qvecAmp()[refBId] < minQvecAmp)
if (coll.qvecAmp()[detId] < minQvecAmp || coll.qvecAmp()[refAId] < minQvecAmp || coll.qvecAmp()[refBId] < minQvecAmp) {
return;
}

qOvecM = calcFT0CRawQVecMag(coll, 2) / coll.qvecAmp()[detId]; // second order
activity = calcFT0CLocalActivity(coll);

epFlowHistograms.fill(HIST("hQoverMCnt"), cent, qOvecM);
epFlowHistograms.fill(HIST("hActivityCnt"), cent, activity);

if (cfgJetSubEvtSel & 1) {
if ((cfgJetSubEvtSel & 1) != 0) {
if (cfgJetSubEvlSelVar->at(0) < qOvecM) {
return;
}
}
if (cfgJetSubEvtSel & 2) {
if ((cfgJetSubEvtSel & 2) != 0) {
if (cfgJetSubEvlSelVar->at(1) < activity) {
return;
}
Expand All @@ -792,8 +819,9 @@ struct JEPFlowAnalysis {
}

if (cfgAddEvtSel) {
if (!eventSel(coll))
if (!eventSel(coll)) {
return;
}
}

cent = coll.centFT0C();
Expand All @@ -812,7 +840,7 @@ struct JEPFlowAnalysis {
continue;
}

if (trackSel(trk)) {
if (trackSel(trk) != 0) {
continue;
}

Expand All @@ -827,8 +855,9 @@ struct JEPFlowAnalysis {

void processMCGen(MyCollisionsMC::iterator const& coll, aod::McParticles const& mcParticles, aod::McCollisions const&)
{
if (!coll.has_mcCollision())
if (!coll.has_mcCollision()) {
return;
}
const auto mcColl = coll.mcCollision();

if (cfgAddEvtSel) {
Expand All @@ -840,8 +869,9 @@ struct JEPFlowAnalysis {
cent = coll.centFT0C();

for (const auto& mcParticle : mcParticles) {
if (std::abs(mcParticle.eta()) > cfgTrackCuts.cfgEtaMax)
if (std::abs(mcParticle.eta()) > cfgTrackCuts.cfgEtaMax) {
continue;
}

auto p = pdg->GetParticle(mcParticle.pdgCode());
if (p != nullptr) {
Expand All @@ -850,8 +880,9 @@ struct JEPFlowAnalysis {
}
}

if (!mcParticle.isPhysicalPrimary())
if (!mcParticle.isPhysicalPrimary()) {
continue;
}

epFlowHistograms.fill(HIST("MC/hPartGen"), cent, mcColl.posZ(), mcParticle.eta(), mcParticle.phi(), mcParticle.pt());
}
Expand Down
Loading