Skip to content

Commit

Permalink
Merge pull request #4 from alibuild/alibot-cleanup-ml-4585
Browse files Browse the repository at this point in the history 
[MegaLinter] Apply linters automatic fixes to #4585
  • Loading branch information
@iarsene
iarsene authored Feb 4, 2024
2 parents 05b3613 + aef6a12 commit 410bc6d
Show file tree
Hide file tree
Showing 2 changed files with 49 additions and 51 deletions.
94 changes: 47 additions & 47 deletions PWGDQ/DataModel/ReducedInfoTables.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,25 +39,25 @@ namespace reducedevent
{

// basic event information
DECLARE_SOA_BITMAP_COLUMN(Tag, tag, 64); //! Bit-field for storing event information (e.g. high level info, cut decisions)
DECLARE_SOA_COLUMN(Q2X0A, q2x0a, float); //! Q-vector x component, with event eta gap A (harmonic 2 and power 0)
DECLARE_SOA_COLUMN(Q2Y0A, q2y0a, float); //! Q-vector y component, with event eta gap A (harmonic 2 and power 0)
DECLARE_SOA_COLUMN(Q2X0B, q2x0b, float); //! Q-vector x component, with event eta gap B (harmonic 2 and power 0)
DECLARE_SOA_COLUMN(Q2Y0B, q2y0b, float); //! Q-vector y component, with event eta gap B (harmonic 2 and power 0)
DECLARE_SOA_COLUMN(Q2X0C, q2x0c, float); //! Q-vector x component, with event eta gap C (harmonic 2 and power 0)
DECLARE_SOA_COLUMN(Q2Y0C, q2y0c, float); //! Q-vector y component, with event eta gap C (harmonic 2 and power 0)
DECLARE_SOA_COLUMN(MultA, multa, float); //! Event multiplicity eta gap A
DECLARE_SOA_COLUMN(MultB, multb, float); //! Event multiplicity eta gap B
DECLARE_SOA_COLUMN(MultC, multc, float); //! Event multiplicity eta gap C
DECLARE_SOA_COLUMN(Q3X0A, q3x0a, float); //! Q-vector x component, with event eta gap A (harmonic 3 and power 0)
DECLARE_SOA_COLUMN(Q3Y0A, q3y0a, float); //!
DECLARE_SOA_COLUMN(Q3X0B, q3x0b, float); //!
DECLARE_SOA_COLUMN(Q3Y0B, q3y0b, float); //!
DECLARE_SOA_COLUMN(Q3X0C, q3x0c, float); //!
DECLARE_SOA_COLUMN(Q3Y0C, q3y0c, float); //!
DECLARE_SOA_COLUMN(MCPosX, mcPosX, float); //!
DECLARE_SOA_COLUMN(MCPosY, mcPosY, float); //!
DECLARE_SOA_COLUMN(MCPosZ, mcPosZ, float); //!
DECLARE_SOA_BITMAP_COLUMN(Tag, tag, 64); //! Bit-field for storing event information (e.g. high level info, cut decisions)
DECLARE_SOA_COLUMN(Q2X0A, q2x0a, float); //! Q-vector x component, with event eta gap A (harmonic 2 and power 0)
DECLARE_SOA_COLUMN(Q2Y0A, q2y0a, float); //! Q-vector y component, with event eta gap A (harmonic 2 and power 0)
DECLARE_SOA_COLUMN(Q2X0B, q2x0b, float); //! Q-vector x component, with event eta gap B (harmonic 2 and power 0)
DECLARE_SOA_COLUMN(Q2Y0B, q2y0b, float); //! Q-vector y component, with event eta gap B (harmonic 2 and power 0)
DECLARE_SOA_COLUMN(Q2X0C, q2x0c, float); //! Q-vector x component, with event eta gap C (harmonic 2 and power 0)
DECLARE_SOA_COLUMN(Q2Y0C, q2y0c, float); //! Q-vector y component, with event eta gap C (harmonic 2 and power 0)
DECLARE_SOA_COLUMN(MultA, multa, float); //! Event multiplicity eta gap A
DECLARE_SOA_COLUMN(MultB, multb, float); //! Event multiplicity eta gap B
DECLARE_SOA_COLUMN(MultC, multc, float); //! Event multiplicity eta gap C
DECLARE_SOA_COLUMN(Q3X0A, q3x0a, float); //! Q-vector x component, with event eta gap A (harmonic 3 and power 0)
DECLARE_SOA_COLUMN(Q3Y0A, q3y0a, float); //!
DECLARE_SOA_COLUMN(Q3X0B, q3x0b, float); //!
DECLARE_SOA_COLUMN(Q3Y0B, q3y0b, float); //!
DECLARE_SOA_COLUMN(Q3X0C, q3x0c, float); //!
DECLARE_SOA_COLUMN(Q3Y0C, q3y0c, float); //!
DECLARE_SOA_COLUMN(MCPosX, mcPosX, float); //!
DECLARE_SOA_COLUMN(MCPosY, mcPosY, float); //!
DECLARE_SOA_COLUMN(MCPosZ, mcPosZ, float); //!
} // namespace reducedevent

DECLARE_SOA_TABLE(ReducedEvents, "AOD", "REDUCEDEVENT", //! Main event information table
Expand Down Expand Up @@ -266,10 +266,10 @@ namespace reducedmft
DECLARE_SOA_INDEX_COLUMN(ReducedEvent, reducedevent); //!
DECLARE_SOA_COLUMN(FilteringFlags, filteringFlags, uint8_t); //!

DECLARE_SOA_COLUMN(Pt, pt, float); //!
DECLARE_SOA_COLUMN(Eta, eta, float); //!
DECLARE_SOA_COLUMN(Phi, phi, float); //!
DECLARE_SOA_COLUMN(Sign, sign, int); //!
DECLARE_SOA_COLUMN(Pt, pt, float); //!
DECLARE_SOA_COLUMN(Eta, eta, float); //!
DECLARE_SOA_COLUMN(Phi, phi, float); //!
DECLARE_SOA_COLUMN(Sign, sign, int); //!
DECLARE_SOA_COLUMN(FwdDcaX, fwdDcaX, float); //!
DECLARE_SOA_COLUMN(FwdDcaY, fwdDcaY, float); //!
DECLARE_SOA_COLUMN(MftClusterSizesAndTrackFlags, mftClusterSizesAndTrackFlags, uint64_t); //!
Expand Down Expand Up @@ -461,32 +461,32 @@ DECLARE_SOA_COLUMN(FwdDcaY2, fwdDcaY2, float); //! Y component of forward DCA
// pair information
namespace reducedpair
{
DECLARE_SOA_INDEX_COLUMN(ReducedEvent, reducedevent); //!
DECLARE_SOA_INDEX_COLUMN(ReducedEvent, reducedevent); //!
DECLARE_SOA_INDEX_COLUMN_FULL(Index0, index0, int, ReducedTracks, "_0"); //! Index to first prong
DECLARE_SOA_INDEX_COLUMN_FULL(Index1, index1, int, ReducedTracks, "_1"); //! Index to second prong
DECLARE_SOA_COLUMN(Mass, mass, float); //!
DECLARE_SOA_COLUMN(Pt, pt, float); //!
DECLARE_SOA_COLUMN(Eta, eta, float); //!
DECLARE_SOA_COLUMN(Phi, phi, float); //!
DECLARE_SOA_COLUMN(Sign, sign, int); //!
DECLARE_SOA_BITMAP_COLUMN(FilterMap, filterMap, 32); //!
DECLARE_SOA_COLUMN(McDecision, mcDecision, uint32_t); //!
DECLARE_SOA_COLUMN(Tauz, tauz, float); //! Longitudinal pseudo-proper time of lepton pair (in ns)
DECLARE_SOA_COLUMN(TauzErr, tauzErr, float); //! Error on longitudinal pseudo-proper time of lepton pair (in ns)
DECLARE_SOA_COLUMN(Tauxy, tauxy, float); //! Transverse pseudo-proper time of lepton pair (in ns)
DECLARE_SOA_COLUMN(TauxyErr, tauxyErr, float); //! Error on transverse pseudo-proper time of lepton pair (in ns)
DECLARE_SOA_COLUMN(Lz, lz, float); //! Longitudinal projection of decay length
DECLARE_SOA_COLUMN(Lxy, lxy, float); //! Transverse projection of decay length
DECLARE_SOA_COLUMN(Chi2pca, chi2pca, float); //! Chi2 for PCA of the dilepton
DECLARE_SOA_COLUMN(CosPointingAngle, cosPointingAngle, float); //! Cosine of the pointing angle
DECLARE_SOA_COLUMN(U2Q2, u2q2, float); //! Scalar product between unitary vector with event flow vector (harmonic 2)
DECLARE_SOA_COLUMN(U3Q3, u3q3, float); //! Scalar product between unitary vector with event flow vector (harmonic 3)
DECLARE_SOA_COLUMN(Cos2DeltaPhi, cos2deltaphi, float); //! Cosinus term using event plane angle (harmonic 2)
DECLARE_SOA_COLUMN(Cos3DeltaPhi, cos3deltaphi, float); //! Cosinus term using event plane angle (harmonic 3)
DECLARE_SOA_COLUMN(R2SP, r2sp, float); //! Event plane resolution for SP method
DECLARE_SOA_COLUMN(R2EP, r2ep, float); //! Event plane resolution for EP method
DECLARE_SOA_COLUMN(CentFT0C, centft0c, float); //! Centrality information from FT0C
DECLARE_SOA_COLUMN(CollisionId, collisionId, int); //!
DECLARE_SOA_COLUMN(Mass, mass, float); //!
DECLARE_SOA_COLUMN(Pt, pt, float); //!
DECLARE_SOA_COLUMN(Eta, eta, float); //!
DECLARE_SOA_COLUMN(Phi, phi, float); //!
DECLARE_SOA_COLUMN(Sign, sign, int); //!
DECLARE_SOA_BITMAP_COLUMN(FilterMap, filterMap, 32); //!
DECLARE_SOA_COLUMN(McDecision, mcDecision, uint32_t); //!
DECLARE_SOA_COLUMN(Tauz, tauz, float); //! Longitudinal pseudo-proper time of lepton pair (in ns)
DECLARE_SOA_COLUMN(TauzErr, tauzErr, float); //! Error on longitudinal pseudo-proper time of lepton pair (in ns)
DECLARE_SOA_COLUMN(Tauxy, tauxy, float); //! Transverse pseudo-proper time of lepton pair (in ns)
DECLARE_SOA_COLUMN(TauxyErr, tauxyErr, float); //! Error on transverse pseudo-proper time of lepton pair (in ns)
DECLARE_SOA_COLUMN(Lz, lz, float); //! Longitudinal projection of decay length
DECLARE_SOA_COLUMN(Lxy, lxy, float); //! Transverse projection of decay length
DECLARE_SOA_COLUMN(Chi2pca, chi2pca, float); //! Chi2 for PCA of the dilepton
DECLARE_SOA_COLUMN(CosPointingAngle, cosPointingAngle, float); //! Cosine of the pointing angle
DECLARE_SOA_COLUMN(U2Q2, u2q2, float); //! Scalar product between unitary vector with event flow vector (harmonic 2)
DECLARE_SOA_COLUMN(U3Q3, u3q3, float); //! Scalar product between unitary vector with event flow vector (harmonic 3)
DECLARE_SOA_COLUMN(Cos2DeltaPhi, cos2deltaphi, float); //! Cosinus term using event plane angle (harmonic 2)
DECLARE_SOA_COLUMN(Cos3DeltaPhi, cos3deltaphi, float); //! Cosinus term using event plane angle (harmonic 3)
DECLARE_SOA_COLUMN(R2SP, r2sp, float); //! Event plane resolution for SP method
DECLARE_SOA_COLUMN(R2EP, r2ep, float); //! Event plane resolution for EP method
DECLARE_SOA_COLUMN(CentFT0C, centft0c, float); //! Centrality information from FT0C
DECLARE_SOA_COLUMN(CollisionId, collisionId, int); //!
// DECLARE_SOA_INDEX_COLUMN(ReducedMuon, reducedmuon2); //!
DECLARE_SOA_DYNAMIC_COLUMN(Px, px, //!
[](float pt, float phi) -> float { return pt * std::cos(phi); });
Expand Down
6 changes: 2 additions & 4 deletions PWGLF/Tasks/QC/lfITSTPCMatchingQA.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,7 @@ struct lfmatchingqa {
histos.fill(HIST("thnDe"), signTPCMom, signGloMom, track.tpcInnerParam() - track.p(), track.dcaXY(), getITSClSize(track) * cosL, track.tpcSignal(), tpcNSigmaDeu, track.pidForTracking(), pidMC, genPMC);
}
if (abs(tpcNSigmaHe3) < 4) {
histos.fill(HIST("tpcNsigmaHe"), signTPCMom, signGloMom, tpcNSigmaHe3);
histos.fill(HIST("pidHypoHe"), signTPCMom, tpcNSigmaHe3, track.pidForTracking());
histos.fill(HIST("thnHe"), signTPCMom, signGloMom, track.tpcInnerParam() - track.p(), track.dcaXY(), getITSClSize(track) * cosL, track.tpcSignal(), tpcNSigmaHe3, track.pidForTracking(), pidMC, genPMC);
}
}

Expand Down Expand Up @@ -169,9 +168,8 @@ struct lfmatchingqa {
for (const auto& track : tracks) {
if (!selectTrack(track)) {
continue;

fillHistograms(track, -1, -999);
}
fillHistograms(track, -1, -999);
}
}
PROCESS_SWITCH(lfmatchingqa, processData, "Data analysis", true);
Expand Down

0 comments on commit 410bc6d

Please sign in to comment.