Skip to content

[PWGCF] SPC corrections added #14437

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
victor-gonzalez merged 4 commits into from
Jan 9, 2026
+31 −2
Merged

[PWGCF] SPC corrections added #14437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
136927a
[PWFCF] SPC update
MaximVirta Jan 8, 2026
a3d8fd3
Comment track charge fill for derived data
MaximVirta Jan 9, 2026
33a58f2
Please consider the following formatting changes
alibuild Jan 9, 2026
68051db
Merge pull request #19 from alibuild/alibot-cleanup-14437
MaximVirta Jan 9, 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
4 changes: 3 additions & 1 deletion PWGCF/JCorran/Core/FlowJHistManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ class FlowJHistManager
mHistRegistryQA->fill(HIST(MCentClasses[cBin]) + HIST(SubDir[mode]) + HIST("histPt"), track.pt());
mHistRegistryQA->fill(HIST(MCentClasses[cBin]) + HIST(SubDir[mode]) + HIST("histEta"), track.eta());
mHistRegistryQA->fill(HIST(MCentClasses[cBin]) + HIST(SubDir[mode]) + HIST("histPhi"), track.phi());
mHistRegistryQA->fill(HIST(MCentClasses[cBin]) + HIST(SubDir[mode]) + HIST("histCharge"), track.sign());
// mHistRegistryQA->fill(HIST(MCentClasses[cBin]) + HIST(SubDir[mode]) + HIST("histCharge"), track.sign());

if (mode == 1) { // 'Weight' distributions are defined only for After/.
mHistRegistryQA->fill(HIST(MCentClasses[cBin]) + HIST("After/histPtCorrected"),
Expand All @@ -257,6 +257,7 @@ class FlowJHistManager

if (mSaveAllQA) {
// TPC information.
/*
mHistRegistryQA->fill(HIST(MCentClasses[cBin]) + HIST(SubDir[mode]) + HIST("histTPCNClsFound"),
track.tpcNClsFound());
mHistRegistryQA->fill(HIST(MCentClasses[cBin]) + HIST(SubDir[mode]) + HIST("histTPCNClsCrossedRows"),
Expand All @@ -283,6 +284,7 @@ class FlowJHistManager
track.pt(), track.dcaXY());
mHistRegistryQA->fill(HIST(MCentClasses[cBin]) + HIST(SubDir[mode]) + HIST("histDCAz"),
track.dcaZ());
*/
}

if (mDebugLog) {
Expand Down
19 changes: 18 additions & 1 deletion PWGCF/JCorran/Core/FlowJSPCObservables.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ class FlowJSPCObservables
{0, 0, 0, 0, 0, 0, 0, 0}};
memcpy(harmonicArray, harmonicArray02, sizeof(int) * maxNrComb * 8);
} break;
case 3: {
case 2: {
LOGF(info, "Computing five and six harmonic SPC");
int harmonicArray03[maxNrComb][8] = {
{5, 3, 3, -2, -2, -2, 0, 0},
Expand All @@ -84,6 +84,23 @@ class FlowJSPCObservables
{0, 0, 0, 0, 0, 0, 0, 0}};
memcpy(harmonicArray, harmonicArray03, sizeof(int) * maxNrComb * 8);
} break;
case 3: {
LOGF(info, "Computing slected five harmonic SPC");
int harmonicArray04[maxNrComb][8] = {
{5, 3, 3, -2, -2, -2, 0, 0},
{0, 2, 2, -3, 4, -5, 0, 0},
{5, 2, 3, 3, -4, -4, 0, 0},
{0, 3, 3, 3, -4, -5, 0, 0},
{0, 2, 3, -4, 5, -6, 0, 0},
{0, 8, -2, -2, -2, -2, 0, 0},
{0, 2, 2, 2, 2, -4, -4, 0},
{0, 2, 3, 4, 4, -6, -7, 0},
{0, 2, 2, 2, 2, -3, -5, 0},
{0, 2, 2, 2, 3, -4, -5, 0},
{0, 2, 2, 3, 3, -4, -6, 0},
{0, 0, 0, 0, 0, 0, 0, 0}};
memcpy(harmonicArray, harmonicArray04, sizeof(int) * maxNrComb * 8);
} break;
default:
LOGF(error, "ERROR: Invalid configuration index. Skipping this element.");
}
Expand Down
10 changes: 10 additions & 0 deletions PWGCF/JCorran/Tasks/flowJSPCAnalysis.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2019-2020 CERN and copyright holders of ALICE O2.

Check failure on line 1 in PWGCF/JCorran/Tasks/flowJSPCAnalysis.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/workflow-file] 

Name of a workflow file must match the name of the main struct in it (without the PWG prefix). (Class implementation files should be in "Core" directories.)
// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
// All rights not expressly granted are reserved.
//
Expand Down Expand Up @@ -59,6 +59,8 @@
FlowJSPCAnalysis::JQVectorsT jqvecs;
template <class T>
using HasWeightNUA = decltype(std::declval<T&>().weightNUA());
template <class T>
using HasWeightEff = decltype(std::declval<T&>().weightEff());

HistogramRegistry qaHistRegistry{"qaHistRegistry", {}, OutputObjHandlingPolicy::AnalysisObject, true, true};
FlowJHistManager histManager;
Expand Down Expand Up @@ -111,17 +113,25 @@
return;

float cent = collision.multiplicity();
if (cent < 0. || cent > 100.) {

Check failure on line 116 in PWGCF/JCorran/Tasks/flowJSPCAnalysis.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
return;
}
int cBin = histManager.getCentBin(cent);
spcHistograms.fill(HIST("FullCentrality"), cent);
int nTracks = tracks.size();
double wNUA = 1.0;
double wEff = 1.0;
for (const auto& track : tracks) {
if (cfgFillQA) {
// histManager.FillTrackQA<0>(track, cBin, collision.posZ());

using JInputClassIter = typename TrackT::iterator;
if constexpr (std::experimental::is_detected<HasWeightNUA, const JInputClassIter>::value)
wNUA = track.weightNUA();
if constexpr (std::experimental::is_detected<HasWeightEff, const JInputClassIter>::value)
wEff = track.weightEff();
histManager.fillTrackQA<1>(track, cBin, wEff, wNUA, collision.posZ());

if constexpr (std::experimental::is_detected<HasWeightNUA, const JInputClassIter>::value) {
spcAnalysis.fillQAHistograms(cBin, track.phi(), 1. / track.weightNUA());
}
Expand Down
Loading