Skip to content

[PWGCF] Fix radial vertex cut and code-check issues #17049

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

Open
hernasab wants to merge 1 commit into
base: master
Choose a base branch
from
+16 −9
Open

[PWGCF] Fix radial vertex cut and code-check issues #17049

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 16 additions & 9 deletions PWGCF/Flow/Tasks/flowZdcTask.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ using namespace o2::aod::mult;
using namespace o2::constants::math;
using namespace o2::aod::evsel;

#define O2_DEFINE_CONFIGURABLE(NAME, TYPE, DEFAULT, HELP) Configurable<TYPE> NAME{#NAME, DEFAULT, HELP};
#define O2_DEFINE_CONFIGURABLE(NAME, TYPE, DEFAULT, HELP) Configurable<TYPE> NAME{#NAME, (DEFAULT), (HELP)};

struct FlowZdcTask {
SliceCache cache;
Expand Down Expand Up @@ -160,7 +160,7 @@ struct FlowZdcTask {
// Begin Histogram Registry

HistogramRegistry histos{"histos", {}, OutputObjHandlingPolicy::AnalysisObject};
Service<ccdb::BasicCCDBManager> ccdb;
Service<ccdb::BasicCCDBManager> ccdb{};

void init(InitContext const&)
{
Expand Down Expand Up @@ -374,8 +374,9 @@ struct FlowZdcTask {
}
histos.fill(HIST("hEventCounter"), EvCutLabel::VtxZ);
if (isApplyRadialCut) {
if (std::fabs(col.posX()) > posXcut && (std::fabs(col.posY()) > posYcut))
if (std::fabs(col.posX()) > posXcut || std::fabs(col.posY()) > posYcut) {
return false;
}
}

return true;
Expand Down Expand Up @@ -541,8 +542,9 @@ struct FlowZdcTask {
histos.fill(HIST("ZPCVsFT0M"), (aT0A + aT0C) / 100., zpC);
histos.fill(HIST("ZPCVsNch"), glbTracks, zpC);
}
if (((tZNA >= minTdcZn) && (tZNA <= maxTdcZn)) && ((tZNC >= minTdcZn) && (tZNC <= maxTdcZn)))
if (((tZNA >= minTdcZn) && (tZNA <= maxTdcZn)) && ((tZNC >= minTdcZn) && (tZNC <= maxTdcZn))) {
histos.fill(HIST("ZNVsZEM"), sumZEMs, sumZNs);
}
if (((tZNA >= minTdcZn) && (tZNA <= maxTdcZn)) && ((tZNC >= minTdcZn) && (tZNC <= maxTdcZn))) {
histos.fill(HIST("ZNAVsZNC"), znC, znA);
histos.fill(HIST("CommonZNAVsZNC"), commonSumZnc, commonSumZna);
Expand Down Expand Up @@ -649,16 +651,21 @@ struct FlowZdcTask {
histos.fill(HIST("ampZpc"), zpC);
histos.fill(HIST("commonZpc"), commonSumZpc);
}
if (((tZNC >= minTdcZn) && (tZNC <= maxTdcZn)) && ((tZNA >= minTdcZn) && (tZNA <= maxTdcZn)))
if (((tZNC >= minTdcZn) && (tZNC <= maxTdcZn)) && ((tZNA >= minTdcZn) && (tZNA <= maxTdcZn))) {
histos.fill(HIST("ZnVsZem"), sumZEMs, znC + znA);
if (((tZNC >= minTdcZn) && (tZNC <= maxTdcZn)) && ((tZNA >= minTdcZn) && (tZNA <= maxTdcZn)))
}
if (((tZNC >= minTdcZn) && (tZNC <= maxTdcZn)) && ((tZNA >= minTdcZn) && (tZNA <= maxTdcZn))) {
histos.fill(HIST("ZnaVsZnc"), znA, znC);
if (((tZPC >= minTdcZp) && (tZPC <= maxTdcZp)) && ((tZPA >= minTdcZp) && (tZPA <= maxTdcZp)))
}
if (((tZPC >= minTdcZp) && (tZPC <= maxTdcZp)) && ((tZPA >= minTdcZp) && (tZPA <= maxTdcZp))) {
histos.fill(HIST("ZpaVsZpc"), zpA, zpC);
if ((tZNA >= minTdcZn) && (tZNA <= maxTdcZn) && ((tZPA >= minTdcZp) && (tZPA <= maxTdcZp)))
}
if ((tZNA >= minTdcZn) && (tZNA <= maxTdcZn) && ((tZPA >= minTdcZp) && (tZPA <= maxTdcZp))) {
histos.fill(HIST("ZnaVsZpa"), znA, zpA);
if ((tZNC >= minTdcZn) && (tZNC <= maxTdcZn) && ((tZPA >= minTdcZp) && (tZPA <= maxTdcZp)))
}
if ((tZNC >= minTdcZn) && (tZNC <= maxTdcZn) && ((tZPA >= minTdcZp) && (tZPA <= maxTdcZp))) {
histos.fill(HIST("ZncVsZpc"), znC, zpC);
}
} else {
histos.fill(HIST("ampZna"), znA);
histos.fill(HIST("ampZnc"), znC);
Expand Down
Loading