Skip to content

[PWGCF] Please consider the following formatting changes to #10965 #51

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
cnkoster merged 1 commit into from
Apr 25, 2025
Merged

[PWGCF] Please consider the following formatting changes to #10965 #51

Show file tree
Hide file tree
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
23 changes: 11 additions & 12 deletions PWGCF/Flow/TableProducer/zdcQVectors.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ struct ZdcQVectors {
registry.add<TProfile>("QA/before/ZNA_Qy_noEq", "ZNA_Qy_noEq", kTProfile, {{1, 0, 1.}});
registry.add<TProfile>("QA/before/ZNC_Qx_noEq", "ZNC_Qx_noEq", kTProfile, {{1, 0, 1.}});
registry.add<TProfile>("QA/before/ZNC_Qy_noEq", "ZNC_Qy_noEq", kTProfile, {{1, 0, 1.}});

registry.addClone("QA/before/", "QA/after/");
}

Expand Down Expand Up @@ -429,8 +429,8 @@ struct ZdcQVectors {
cal.calibList[cm] = ccdb->getForTimeStamp<TList>(ccdb_dir, timestamp);
cal.calibfilesLoaded[cm] = true;
LOGF(info, "Loaded calibration histos from %s", ccdb_dir.c_str());
if(cm == kRec){
cal.atStep = 5;
if (cm == kRec) {
cal.atStep = 5;
cal.atIteration = 5;
}
} else {
Expand Down Expand Up @@ -714,7 +714,7 @@ struct ZdcQVectors {
q[i * 2] = xEnZN[i] / sumZN[i]; // for QXA[0] and QXC[2]
q[i * 2 + 1] = yEnZN[i] / sumZN[i]; // for QYA[1] and QYC[3]
}
if(sumZN_noEq[i] > 0) {
if (sumZN_noEq[i] > 0) {
qNoEq[i * 2] = xEnZN_noEq[i] / sumZN_noEq[i]; // for QXA[0] and QXC[2]
qNoEq[i * 2 + 1] = yEnZN_noEq[i] / sumZN_noEq[i]; // for QYA[1] and QYC[3]
}
Expand Down Expand Up @@ -743,9 +743,9 @@ struct ZdcQVectors {
registry.get<TProfile>(HIST("QA/before/ZNC_Qy_noEq"))->Fill(Form("%d", runnumber), qNoEq[3]);

if (cal.atIteration == 0) {
if (isSelected && cfgFillCommonRegistry)
fillCommonRegistry<kBefore>(q[0], q[1], q[2], q[3], v, centrality);
if (isSelected && cfgFillCommonRegistry)
fillCommonRegistry<kBefore>(q[0], q[1], q[2], q[3], v, centrality);

spTableZDC(runnumber, centrality, v[0], v[1], v[2], q[0], q[1], q[2], q[3], isSelected, 0, 0);
counter++;
return;
Expand All @@ -772,10 +772,10 @@ struct ZdcQVectors {
pb++;

for (int step = 2; step <= nSteps; step++) {
corrQxA.push_back(getCorrection<TProfile, kRec>(names[step-1][0].Data(), it, step));
corrQyA.push_back(getCorrection<TProfile, kRec>(names[step-1][1].Data(), it, step));
corrQxC.push_back(getCorrection<TProfile, kRec>(names[step-1][2].Data(), it, step));
corrQyC.push_back(getCorrection<TProfile, kRec>(names[step-1][3].Data(), it, step));
corrQxA.push_back(getCorrection<TProfile, kRec>(names[step - 1][0].Data(), it, step));
corrQyA.push_back(getCorrection<TProfile, kRec>(names[step - 1][1].Data(), it, step));
corrQxC.push_back(getCorrection<TProfile, kRec>(names[step - 1][2].Data(), it, step));
corrQyC.push_back(getCorrection<TProfile, kRec>(names[step - 1][3].Data(), it, step));
pb++;
}
}
Expand All @@ -794,7 +794,6 @@ struct ZdcQVectors {
registry.get<TProfile>(HIST("QA/after/ZNA_Qy"))->Fill(Form("%d", runnumber), qRec[1]);
registry.get<TProfile>(HIST("QA/after/ZNC_Qx"))->Fill(Form("%d", runnumber), qRec[2]);
registry.get<TProfile>(HIST("QA/after/ZNC_Qy"))->Fill(Form("%d", runnumber), qRec[3]);

}

spTableZDC(runnumber, centrality, v[0], v[1], v[2], qRec[0], qRec[1], qRec[2], qRec[3], isSelected, cal.atIteration, cal.atStep);
Expand Down
12 changes: 6 additions & 6 deletions PWGCF/Flow/Tasks/flowSP.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,9 @@ struct FlowSP {
O2_DEFINE_CONFIGURABLE(cfgTrackSelsUseAdditionalTrackCut, bool, true, "Bool to enable Additional Track Cut");
O2_DEFINE_CONFIGURABLE(cfgTrackSelsDoubleTrackFunction, bool, true, "Include track cut at low pt");
O2_DEFINE_CONFIGURABLE(cfgTrackSelsTrackCutSize, float, 0.06, "Spread of track cut");
O2_DEFINE_CONFIGURABLE(cfgTrackSelsDoDCApt , bool, true, "Apply Pt dependent DCAz cut");
O2_DEFINE_CONFIGURABLE(cfgTrackSelsDCApt1 , float, 0.1, "DcaZ < a * b / pt^1.1 -> this sets a");
O2_DEFINE_CONFIGURABLE(cfgTrackSelsDCApt2 , float, 0.035, "DcaZ < a * b / pt^1.1 -> this sets b");
O2_DEFINE_CONFIGURABLE(cfgTrackSelsDoDCApt, bool, true, "Apply Pt dependent DCAz cut");
O2_DEFINE_CONFIGURABLE(cfgTrackSelsDCApt1, float, 0.1, "DcaZ < a * b / pt^1.1 -> this sets a");
O2_DEFINE_CONFIGURABLE(cfgTrackSelsDCApt2, float, 0.035, "DcaZ < a * b / pt^1.1 -> this sets b");
// Additional event selections
O2_DEFINE_CONFIGURABLE(cfgEvSelsUseAdditionalEventCut, bool, true, "Bool to enable Additional Event Cut");
O2_DEFINE_CONFIGURABLE(cfgEvSelsnSigmaMultCuts, int, 1, "Sigma cut on Additional event cut: 1 (default), 2 or 3 sigma available");
Expand Down Expand Up @@ -767,10 +767,10 @@ struct FlowSP {
if (track.dcaZ() > cfgTrackSelsDCAz)
return false;

if (cfgTrackSelsDoDCApt && std::fabs(track.dcaZ()) > (cfgTrackSelsDCApt1 * cfgTrackSelsDCApt2)/(std::pow(track.pt(),1.1)))
if (cfgTrackSelsDoDCApt && std::fabs(track.dcaZ()) > (cfgTrackSelsDCApt1 * cfgTrackSelsDCApt2) / (std::pow(track.pt(), 1.1)))
return false;
registry.fill(HIST("hTrackCount"), trackSel_DCAz);

registry.fill(HIST("hTrackCount"), trackSel_DCAz);

// registry.fill(HIST("hTrackCount"), trackSel_GlobalTracks);

Expand Down
Loading