Skip to content

Commit 3262c09

Browse files
alibuildalibuild
committed
MegaLinter fixes
1 parent ca7314f commit 3262c09

File tree

6 files changed

+36
-41
lines changed

6 files changed

+36
-41
lines changed

‎PWGDQ/Core/HistogramsLibrary.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h
159159
hm->AddHistogram(histClass, "Psi2B_CentFT0C", "", false, 90, 0.0, 90.0, VarManager::kCentFT0C, 100, -2.0, 2.0, VarManager::kPsi2B);
160160
hm->AddHistogram(histClass, "Psi2C_CentFT0C", "", false, 90, 0.0, 90.0, VarManager::kCentFT0C, 100, -2.0, 2.0, VarManager::kPsi2C);
161161
}
162-
162+
163163
if (subGroupStr.Contains("res")) {
164164
hm->AddHistogram(histClass, "R2SP_CentV0M", "", true, 9, 0.0, 90.0, VarManager::kCentVZERO, 100, -1.0, 1.0, VarManager::kR2SP);
165165
hm->AddHistogram(histClass, "R3SP_CentV0M", "", true, 9, 0.0, 90.0, VarManager::kCentVZERO, 100, -1.0, 1.0, VarManager::kR3SP);

‎PWGDQ/Core/VarManager.h‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -649,8 +649,8 @@ class VarManager : public TObject
649649
static void FillDileptonCharmHadron(DQ const& dilepton, HF const& charmHadron, H hfHelper, T& bdtScoreCharmHad, float* values = nullptr);
650650
template <typename C, typename A>
651651
static void FillQVectorFromGFW(C const& collision, A const& compA2, A const& compB2, A const& compC2, A const& compA3, A const& compB3, A const& compC3, float normA = 1.0, float normB = 1.0, float normC = 1.0, float* values = nullptr);
652-
//static void FillEventPlaneABC(A const& EpA, A const& EpB, A const& EpC, float* values = nullptr);
653-
652+
// static void FillEventPlaneABC(A const& EpA, A const& EpB, A const& EpC, float* values = nullptr);
653+
654654
template <int pairType, typename T1, typename T2>
655655
static void FillPairVn(T1 const& t1, T2 const& t2, float* values = nullptr);
656656

@@ -1060,7 +1060,6 @@ void VarManager::FillEvent(T const& event, float* values)
10601060
values[kPsi2A] = getEventPlane(2, event.q2x0a(), event.q2y0a());
10611061
values[kPsi2B] = getEventPlane(2, event.q2x0b(), event.q2y0b());
10621062
values[kPsi2C] = getEventPlane(2, event.q2x0c(), event.q2y0c());
1063-
10641063
}
10651064

10661065
if constexpr ((fillMap & CollisionMC) > 0) {
@@ -2424,7 +2423,7 @@ void VarManager::FillQVectorFromGFW(C const& collision, A const& compA2, A const
24242423

24252424
// TODO: provide different computations for R
24262425
// Compute the R factor using the 2 sub-events technique for second and third harmonic
2427-
//Compute event planes
2426+
// Compute event planes
24282427
auto Psi2B = getEventPlane(2, values[kQ2X0B], values[kQ2Y0B]);
24292428
auto Psi3B = getEventPlane(3, values[kQ3X0B], values[kQ3Y0B]);
24302429
auto Psi2C = getEventPlane(2, values[kQ2X0C], values[kQ2Y0C]);
@@ -2480,7 +2479,7 @@ void VarManager::FillPairVn(T1 const& t1, T2 const& t2, float* values)
24802479
values[kU3Q3] = values[kQ3X0A] * std::cos(3 * v12.Phi()) + values[kQ3Y0A] * std::sin(3 * v12.Phi());
24812480
values[kCos2DeltaPhi] = std::cos(2 * (v12.Phi() - getEventPlane(2, values[kQ2X0A], values[kQ2Y0A])));
24822481
values[kCos3DeltaPhi] = std::cos(3 * (v12.Phi() - getEventPlane(3, values[kQ3X0A], values[kQ3Y0A])));
2483-
2482+
24842483
if (isnan(VarManager::fgValues[VarManager::kU2Q2]) == true) {
24852484
values[kU2Q2] = -999.;
24862485
values[kU3Q3] = -999.;

‎PWGDQ/DataModel/ReducedInfoTables.h‎

Lines changed: 29 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -267,10 +267,10 @@ namespace reducedmft
267267
DECLARE_SOA_INDEX_COLUMN(ReducedEvent, reducedevent); //!
268268
DECLARE_SOA_COLUMN(FilteringFlags, filteringFlags, uint8_t); //!
269269

270-
DECLARE_SOA_COLUMN(Pt, pt, float); //!
271-
DECLARE_SOA_COLUMN(Eta, eta, float); //!
272-
DECLARE_SOA_COLUMN(Phi, phi, float); //!
273-
DECLARE_SOA_COLUMN(Sign, sign, int); //!
270+
DECLARE_SOA_COLUMN(Pt, pt, float); //!
271+
DECLARE_SOA_COLUMN(Eta, eta, float); //!
272+
DECLARE_SOA_COLUMN(Phi, phi, float); //!
273+
DECLARE_SOA_COLUMN(Sign, sign, int); //!
274274
DECLARE_SOA_COLUMN(FwdDcaX, fwdDcaX, float); //!
275275
DECLARE_SOA_COLUMN(FwdDcaY, fwdDcaY, float); //!
276276
DECLARE_SOA_COLUMN(MftClusterSizesAndTrackFlags, mftClusterSizesAndTrackFlags, uint64_t); //!
@@ -442,30 +442,30 @@ DECLARE_SOA_COLUMN(FwdDcaY2, fwdDcaY2, float); //! Y component of forward DCA
442442
// pair information
443443
namespace reducedpair
444444
{
445-
DECLARE_SOA_INDEX_COLUMN(ReducedEvent, reducedevent); //!
446-
DECLARE_SOA_COLUMN(Mass, mass, float); //!
447-
DECLARE_SOA_COLUMN(Pt, pt, float); //!
448-
DECLARE_SOA_COLUMN(Eta, eta, float); //!
449-
DECLARE_SOA_COLUMN(Phi, phi, float); //!
450-
DECLARE_SOA_COLUMN(Sign, sign, int); //!
451-
DECLARE_SOA_COLUMN(FilterMap, filterMap, uint32_t); //!
452-
DECLARE_SOA_COLUMN(McDecision, mcDecision, uint32_t); //!
453-
DECLARE_SOA_COLUMN(Tauz, tauz, float); //! Longitudinal pseudo-proper time of lepton pair (in ns)
454-
DECLARE_SOA_COLUMN(TauzErr, tauzErr, float); //! Error on longitudinal pseudo-proper time of lepton pair (in ns)
455-
DECLARE_SOA_COLUMN(Tauxy, tauxy, float); //! Transverse pseudo-proper time of lepton pair (in ns)
456-
DECLARE_SOA_COLUMN(TauxyErr, tauxyErr, float); //! Error on transverse pseudo-proper time of lepton pair (in ns)
457-
DECLARE_SOA_COLUMN(Lz, lz, float); //! Longitudinal projection of decay length
458-
DECLARE_SOA_COLUMN(Lxy, lxy, float); //! Transverse projection of decay length
459-
DECLARE_SOA_COLUMN(Chi2pca, chi2pca, float); //! Chi2 for PCA of the dilepton
445+
DECLARE_SOA_INDEX_COLUMN(ReducedEvent, reducedevent); //!
446+
DECLARE_SOA_COLUMN(Mass, mass, float); //!
447+
DECLARE_SOA_COLUMN(Pt, pt, float); //!
448+
DECLARE_SOA_COLUMN(Eta, eta, float); //!
449+
DECLARE_SOA_COLUMN(Phi, phi, float); //!
450+
DECLARE_SOA_COLUMN(Sign, sign, int); //!
451+
DECLARE_SOA_COLUMN(FilterMap, filterMap, uint32_t); //!
452+
DECLARE_SOA_COLUMN(McDecision, mcDecision, uint32_t); //!
453+
DECLARE_SOA_COLUMN(Tauz, tauz, float); //! Longitudinal pseudo-proper time of lepton pair (in ns)
454+
DECLARE_SOA_COLUMN(TauzErr, tauzErr, float); //! Error on longitudinal pseudo-proper time of lepton pair (in ns)
455+
DECLARE_SOA_COLUMN(Tauxy, tauxy, float); //! Transverse pseudo-proper time of lepton pair (in ns)
456+
DECLARE_SOA_COLUMN(TauxyErr, tauxyErr, float); //! Error on transverse pseudo-proper time of lepton pair (in ns)
457+
DECLARE_SOA_COLUMN(Lz, lz, float); //! Longitudinal projection of decay length
458+
DECLARE_SOA_COLUMN(Lxy, lxy, float); //! Transverse projection of decay length
459+
DECLARE_SOA_COLUMN(Chi2pca, chi2pca, float); //! Chi2 for PCA of the dilepton
460460
DECLARE_SOA_COLUMN(CosPointingAngle, cosPointingAngle, float); //! Cosine of the pointing angle
461-
DECLARE_SOA_COLUMN(U2Q2, u2q2, float); //! Scalar product between unitary vector with event flow vector (harmonic 2)
462-
DECLARE_SOA_COLUMN(U3Q3, u3q3, float); //! Scalar product between unitary vector with event flow vector (harmonic 3)
463-
DECLARE_SOA_COLUMN(Cos2DeltaPhi, cos2deltaphi, float); //! Cosinus term using event plane angle (harmonic 2)
464-
DECLARE_SOA_COLUMN(Cos3DeltaPhi, cos3deltaphi, float); //! Cosinus term using event plane angle (harmonic 3)
465-
DECLARE_SOA_COLUMN(Psi2A, psi2a, float); //! Event plane for sub-sample A
466-
DECLARE_SOA_COLUMN(Psi2B, psi2b, float); //! Event plane for sub-sample B
467-
DECLARE_SOA_COLUMN(Psi2C, psi2c, float); //! Event plane for sub-sample C
468-
DECLARE_SOA_COLUMN(CollisionId, collisionId, int); //!
461+
DECLARE_SOA_COLUMN(U2Q2, u2q2, float); //! Scalar product between unitary vector with event flow vector (harmonic 2)
462+
DECLARE_SOA_COLUMN(U3Q3, u3q3, float); //! Scalar product between unitary vector with event flow vector (harmonic 3)
463+
DECLARE_SOA_COLUMN(Cos2DeltaPhi, cos2deltaphi, float); //! Cosinus term using event plane angle (harmonic 2)
464+
DECLARE_SOA_COLUMN(Cos3DeltaPhi, cos3deltaphi, float); //! Cosinus term using event plane angle (harmonic 3)
465+
DECLARE_SOA_COLUMN(Psi2A, psi2a, float); //! Event plane for sub-sample A
466+
DECLARE_SOA_COLUMN(Psi2B, psi2b, float); //! Event plane for sub-sample B
467+
DECLARE_SOA_COLUMN(Psi2C, psi2c, float); //! Event plane for sub-sample C
468+
DECLARE_SOA_COLUMN(CollisionId, collisionId, int); //!
469469
// DECLARE_SOA_INDEX_COLUMN(ReducedMuon, reducedmuon2); //!
470470
DECLARE_SOA_DYNAMIC_COLUMN(Px, px, //!
471471
[](float pt, float phi) -> float { return pt * std::cos(phi); });
@@ -504,8 +504,7 @@ DECLARE_SOA_TABLE(DileptonsFlow, "AOD", "RTDILEPTONFLOW", //!
504504
reducedpair::Cos3DeltaPhi,
505505
reducedpair::Psi2A,
506506
reducedpair::Psi2B,
507-
reducedpair::Psi2C
508-
);
507+
reducedpair::Psi2C);
509508

510509
// Dilepton collision information (joined with DileptonsExtra) allowing to connect different tables (cross PWGs)
511510
DECLARE_SOA_TABLE(DileptonsInfo, "AOD", "RTDILEPTONINFO",
@@ -538,8 +537,7 @@ DECLARE_SOA_TABLE(DimuonsAll, "AOD", "RTDIMUONALL", //!
538537
reducedpair::Cos3DeltaPhi,
539538
reducedpair::Psi2A,
540539
reducedpair::Psi2B,
541-
reducedpair::Psi2C
542-
);
540+
reducedpair::Psi2C);
543541

544542
using Dilepton = Dileptons::iterator;
545543
using DileptonExtra = DileptonsExtra::iterator;

‎PWGDQ/Tasks/dqEfficiency.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -797,7 +797,7 @@ struct AnalysisSameEventPairing {
797797
t2.reducedMCTrack().pt(), t2.reducedMCTrack().eta(), t2.reducedMCTrack().phi(), t2.reducedMCTrack().e(),
798798
t1.reducedMCTrack().vx(), t1.reducedMCTrack().vy(), t1.reducedMCTrack().vz(), t1.reducedMCTrack().vt(),
799799
t2.reducedMCTrack().vx(), t2.reducedMCTrack().vy(), t2.reducedMCTrack().vz(), t2.reducedMCTrack().vt(),
800-
t1.isAmbiguous(), t2.isAmbiguous(), -999., -999., -999., -999.,-999., -999., -999.);
800+
t1.isAmbiguous(), t2.isAmbiguous(), -999., -999., -999., -999., -999., -999., -999.);
801801
}
802802
}
803803

‎PWGDQ/Tasks/dqFlow.cxx‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -320,12 +320,10 @@ struct DQEventQvector {
320320
}
321321
}
322322

323-
324323
// Fill the tree for the reduced event table with Q vector quantities
325324
if (fEventCut->IsSelected(VarManager::fgValues)) {
326325
eventQvector(VarManager::fgValues[VarManager::kQ2X0A], VarManager::fgValues[VarManager::kQ2Y0A], VarManager::fgValues[VarManager::kQ2X0B], VarManager::fgValues[VarManager::kQ2Y0B], VarManager::fgValues[VarManager::kQ2X0C], VarManager::fgValues[VarManager::kQ2Y0C], VarManager::fgValues[VarManager::kMultA], VarManager::fgValues[VarManager::kMultC], VarManager::fgValues[VarManager::kMultC], VarManager::fgValues[VarManager::kQ3X0A], VarManager::fgValues[VarManager::kQ3Y0A], VarManager::fgValues[VarManager::kQ3X0B], VarManager::fgValues[VarManager::kQ3Y0B], VarManager::fgValues[VarManager::kQ3X0C], VarManager::fgValues[VarManager::kQ3Y0C]);
327326
}
328-
329327
}
330328

331329
// Process to fill Q vector using barrel tracks in a reduced event table for barrel/muon tracks flow related analyses Run 2

‎PWGDQ/Tasks/tableReader.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1058,7 +1058,7 @@ struct AnalysisSameEventPairing {
10581058
}
10591059

10601060
if constexpr (eventHasQvector) {
1061-
dileptonFlowList(VarManager::fgValues[VarManager::kU2Q2], VarManager::fgValues[VarManager::kU3Q3], VarManager::fgValues[VarManager::kCos2DeltaPhi], VarManager::fgValues[VarManager::kCos3DeltaPhi],VarManager::fgValues[VarManager::kPsi2A],VarManager::fgValues[VarManager::kPsi2B],VarManager::fgValues[VarManager::kPsi2C]);
1061+
dileptonFlowList(VarManager::fgValues[VarManager::kU2Q2], VarManager::fgValues[VarManager::kU3Q3], VarManager::fgValues[VarManager::kCos2DeltaPhi], VarManager::fgValues[VarManager::kCos3DeltaPhi], VarManager::fgValues[VarManager::kPsi2A], VarManager::fgValues[VarManager::kPsi2B], VarManager::fgValues[VarManager::kPsi2C]);
10621062
}
10631063

10641064
int iCut = 0;

0 commit comments

Comments
 (0)