Skip to content

[PWGCF] Please consider the following formatting changes to #18495 #32

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
MaximVirta merged 1 commit into from
Oct 28, 2026
Merged

[PWGCF] Please consider the following formatting changes to #18495 #32

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
11 changes: 6 additions & 5 deletions PWGCF/GenericFramework/DataModel/GfwDerived.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@

#include <Framework/ASoA.h>
#include <Framework/AnalysisDataModel.h>

#include <Rtypes.h>

#include <cstdint>
Expand Down Expand Up @@ -70,11 +71,11 @@ using GfwCollision = GfwCollisions::iterator;
namespace gfwtrack
{
DECLARE_SOA_INDEX_COLUMN(GfwCollision, gfwCollision); //! Parent derived collision
DECLARE_SOA_COLUMN(Pt, pt, float); //! pT (GeV/c)
DECLARE_SOA_COLUMN(Eta, eta, float); //! Pseudorapidity
DECLARE_SOA_COLUMN(Phi, phi, float); //! Azimuthal angle
DECLARE_SOA_COLUMN(HasTOF, hasTOF, bool); //! Track has a TOF match
DECLARE_SOA_COLUMN(TrackSel, trackSel, uint32_t); //! Track and PID bitmask, see TrackSelection
DECLARE_SOA_COLUMN(Pt, pt, float); //! pT (GeV/c)
DECLARE_SOA_COLUMN(Eta, eta, float); //! Pseudorapidity
DECLARE_SOA_COLUMN(Phi, phi, float); //! Azimuthal angle
DECLARE_SOA_COLUMN(HasTOF, hasTOF, bool); //! Track has a TOF match
DECLARE_SOA_COLUMN(TrackSel, trackSel, uint32_t); //! Track and PID bitmask, see TrackSelection

/// Track-quality bits occupy 0-13. TPC PID bits occupy 14-22 and TOF PID bits occupy 23-31.
/// Global-track, ITS-cluster, and ITS-chi2 requirements are applied by the producer and are not stored.
Expand Down
28 changes: 14 additions & 14 deletions PWGCF/GenericFramework/Tasks/flowGfwV02.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -961,7 +961,7 @@ struct FlowGfwV02 {
double v22npt = 0;
double ptMeanMid = pidStates.hPtMid[PidCharged]->GetMean();
double ptFractionMid = 0.;
double dnxAB = fGFW->Calculate(corrconfigs.at(0), 0, kTRUE).real(); // V22 weight for AB
double dnxAB = fGFW->Calculate(corrconfigs.at(0), 0, kTRUE).real(); // V22 weight for AB
double dnxABAB = fGFW->Calculate(corrconfigs.at(1), 0, kTRUE).real(); // V22 weight for ABAB

// Check if the V22 weight is valid
Expand Down Expand Up @@ -1380,24 +1380,24 @@ struct FlowGfwV02 {
{
// Fill Nsigma QA. The derived tables store PID bits and have no nSigma columns.
if constexpr (requires { track.tpcNSigmaPi(); track.tofNSigmaPi(); }) {
if (!cfgUseItsPID) {
if (ft == kBefore) {
registry.fill(HIST("QA_PID/") + HIST(FillTimeName[ft]) + HIST("TofTpcNsigma_pions"), track.tpcNSigmaPi(), track.tofNSigmaPi(), track.pt());
registry.fill(HIST("QA_PID/") + HIST(FillTimeName[ft]) + HIST("TofTpcNsigma_kaons"), track.tpcNSigmaKa(), track.tofNSigmaKa(), track.pt());
registry.fill(HIST("QA_PID/") + HIST(FillTimeName[ft]) + HIST("TofTpcNsigma_protons"), track.tpcNSigmaPr(), track.tofNSigmaPr(), track.pt());
} else if (ft == kAfter) {
if (pid == PidPions) {
if (!cfgUseItsPID) {
if (ft == kBefore) {
registry.fill(HIST("QA_PID/") + HIST(FillTimeName[ft]) + HIST("TofTpcNsigma_pions"), track.tpcNSigmaPi(), track.tofNSigmaPi(), track.pt());
}
if (pid == PidKaons) {
registry.fill(HIST("QA_PID/") + HIST(FillTimeName[ft]) + HIST("TofTpcNsigma_kaons"), track.tpcNSigmaKa(), track.tofNSigmaKa(), track.pt());
}
if (pid == PidProtons) {
registry.fill(HIST("QA_PID/") + HIST(FillTimeName[ft]) + HIST("TofTpcNsigma_protons"), track.tpcNSigmaPr(), track.tofNSigmaPr(), track.pt());
} else if (ft == kAfter) {
if (pid == PidPions) {
registry.fill(HIST("QA_PID/") + HIST(FillTimeName[ft]) + HIST("TofTpcNsigma_pions"), track.tpcNSigmaPi(), track.tofNSigmaPi(), track.pt());
}
if (pid == PidKaons) {
registry.fill(HIST("QA_PID/") + HIST(FillTimeName[ft]) + HIST("TofTpcNsigma_kaons"), track.tpcNSigmaKa(), track.tofNSigmaKa(), track.pt());
}
if (pid == PidProtons) {
registry.fill(HIST("QA_PID/") + HIST(FillTimeName[ft]) + HIST("TofTpcNsigma_protons"), track.tpcNSigmaPr(), track.tofNSigmaPr(), track.pt());
}
}
fillPidDedxQA<ft>(track, pid);
}
fillPidDedxQA<ft>(track, pid);
}
}
}

Expand Down
Loading