Skip to content

Commit 97f7d86

Browse files
committed
Please consider the following formatting changes
1 parent aab791a commit 97f7d86

2 files changed

Lines changed: 20 additions & 19 deletions

File tree

‎PWGCF/GenericFramework/DataModel/GfwDerived.h‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424

2525
#include <Framework/ASoA.h>
2626
#include <Framework/AnalysisDataModel.h>
27+
2728
#include <Rtypes.h>
2829

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

7980
/// Track-quality bits occupy 0-13. TPC PID bits occupy 14-22 and TOF PID bits occupy 23-31.
8081
/// Global-track, ITS-cluster, and ITS-chi2 requirements are applied by the producer and are not stored.

‎PWGCF/GenericFramework/Tasks/flowGfwV02.cxx‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -961,7 +961,7 @@ struct FlowGfwV02 {
961961
double v22npt = 0;
962962
double ptMeanMid = pidStates.hPtMid[PidCharged]->GetMean();
963963
double ptFractionMid = 0.;
964-
double dnxAB = fGFW->Calculate(corrconfigs.at(0), 0, kTRUE).real(); // V22 weight for AB
964+
double dnxAB = fGFW->Calculate(corrconfigs.at(0), 0, kTRUE).real(); // V22 weight for AB
965965
double dnxABAB = fGFW->Calculate(corrconfigs.at(1), 0, kTRUE).real(); // V22 weight for ABAB
966966

967967
// Check if the V22 weight is valid
@@ -1380,24 +1380,24 @@ struct FlowGfwV02 {
13801380
{
13811381
// Fill Nsigma QA. The derived tables store PID bits and have no nSigma columns.
13821382
if constexpr (requires { track.tpcNSigmaPi(); track.tofNSigmaPi(); }) {
1383-
if (!cfgUseItsPID) {
1384-
if (ft == kBefore) {
1385-
registry.fill(HIST("QA_PID/") + HIST(FillTimeName[ft]) + HIST("TofTpcNsigma_pions"), track.tpcNSigmaPi(), track.tofNSigmaPi(), track.pt());
1386-
registry.fill(HIST("QA_PID/") + HIST(FillTimeName[ft]) + HIST("TofTpcNsigma_kaons"), track.tpcNSigmaKa(), track.tofNSigmaKa(), track.pt());
1387-
registry.fill(HIST("QA_PID/") + HIST(FillTimeName[ft]) + HIST("TofTpcNsigma_protons"), track.tpcNSigmaPr(), track.tofNSigmaPr(), track.pt());
1388-
} else if (ft == kAfter) {
1389-
if (pid == PidPions) {
1383+
if (!cfgUseItsPID) {
1384+
if (ft == kBefore) {
13901385
registry.fill(HIST("QA_PID/") + HIST(FillTimeName[ft]) + HIST("TofTpcNsigma_pions"), track.tpcNSigmaPi(), track.tofNSigmaPi(), track.pt());
1391-
}
1392-
if (pid == PidKaons) {
13931386
registry.fill(HIST("QA_PID/") + HIST(FillTimeName[ft]) + HIST("TofTpcNsigma_kaons"), track.tpcNSigmaKa(), track.tofNSigmaKa(), track.pt());
1394-
}
1395-
if (pid == PidProtons) {
13961387
registry.fill(HIST("QA_PID/") + HIST(FillTimeName[ft]) + HIST("TofTpcNsigma_protons"), track.tpcNSigmaPr(), track.tofNSigmaPr(), track.pt());
1388+
} else if (ft == kAfter) {
1389+
if (pid == PidPions) {
1390+
registry.fill(HIST("QA_PID/") + HIST(FillTimeName[ft]) + HIST("TofTpcNsigma_pions"), track.tpcNSigmaPi(), track.tofNSigmaPi(), track.pt());
1391+
}
1392+
if (pid == PidKaons) {
1393+
registry.fill(HIST("QA_PID/") + HIST(FillTimeName[ft]) + HIST("TofTpcNsigma_kaons"), track.tpcNSigmaKa(), track.tofNSigmaKa(), track.pt());
1394+
}
1395+
if (pid == PidProtons) {
1396+
registry.fill(HIST("QA_PID/") + HIST(FillTimeName[ft]) + HIST("TofTpcNsigma_protons"), track.tpcNSigmaPr(), track.tofNSigmaPr(), track.pt());
1397+
}
13971398
}
1399+
fillPidDedxQA<ft>(track, pid);
13981400
}
1399-
fillPidDedxQA<ft>(track, pid);
1400-
}
14011401
}
14021402
}
14031403

0 commit comments

Comments
 (0)