Skip to content

Commit a18bf34

Browse files
committed
Fix cpplint errors
Fixes errors from the following categories: - `readability/inheritance` - `readability/braces` - `readability/multiline_comment` - `whitespace/newline` - `whitespace/empty_if_body` - `build/include_what_you_use` - `build/header_guard`
1 parent 1d577c5 commit a18bf34

15 files changed

Lines changed: 75 additions & 76 deletions

‎PWGCF/Core/PWGCFCoreLinkDef.h‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
// In applying this license CERN does not waive the privileges and immunities
99
// granted to it by virtue of its status as an Intergovernmental Organization
1010
// or submit itself to any jurisdiction.
11-
#ifndef PWGCF_CORE_PWGCFCORELINKDEF_H_
12-
#define PWGCF_CORE_PWGCFCORELINKDEF_H_
11+
12+
// NOLINT(build/header_guard)
1313

1414
#pragma link off all globals;
1515
#pragma link off all classes;
@@ -23,4 +23,3 @@
2323
#pragma link C++ class o2::analysis::TrackSelectionPIDCfg + ;
2424
#pragma link C++ class o2::analysis::SimpleInclusiveCut + ;
2525
#pragma link C++ class CorrelationContainer + ;
26-
#endif // PWGCF_CORE_PWGCFCORELINKDEF_H_

‎PWGCF/EbyEFluctuations/Tasks/NetProtonCumulants.cxx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
#include <cmath>
3939
#include <cstdint>
4040
#include <memory>
41+
#include <string>
4142
#include <vector>
4243

4344
#include <math.h>
@@ -69,7 +70,7 @@ struct NetProtonCumulants_Table_QA {
6970

7071
// Filter command***********
7172
Filter collisionFilter = nabs(aod::collision::posZ) < cfgCutVertex;
72-
Filter trackFilter = (nabs(aod::track::eta) < 0.8f) && (aod::track::pt > cfgCutPtLower) && (aod::track::pt < 5.0f) && ((requireGlobalTrackInFilter()) || (aod::track::isGlobalTrackSDD == (uint8_t) true)) && (aod::track::tpcChi2NCl < cfgCutTpcChi2NCl);
73+
Filter trackFilter = (nabs(aod::track::eta) < 0.8f) && (aod::track::pt > cfgCutPtLower) && (aod::track::pt < 5.0f) && ((requireGlobalTrackInFilter()) || (aod::track::isGlobalTrackSDD == (uint8_t)true)) && (aod::track::tpcChi2NCl < cfgCutTpcChi2NCl);
7374

7475
// Connect to ccdb
7576
Service<ccdb::BasicCCDBManager> ccdb;

‎PWGCF/Femto3D/Tasks/multEstimator.cxx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545

4646
#include <array>
4747
#include <cmath>
48+
#include <memory>
4849
#include <string>
4950
#include <utility>
5051
#include <vector>

‎PWGCF/FemtoWorld/Core/FemtoWorldTrackSelection.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ class FemtoWorldTrackSelection : public FemtoWorldObjectSelection<float, femtoWo
9696
dcaXYMax(-9999999.),
9797
dcaZMax(-9999999.),
9898
dcaMin(9999999.),
99-
nSigmaPIDMax(9999999.) {};
99+
nSigmaPIDMax(9999999.) {}
100100

101101
/// Initializes histograms for the task
102102
/// \tparam part Type of the particle for proper naming of the folders for QA

‎PWGCF/FemtoWorld/Core/FemtoWorldV0Selection.h‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ class FemtoWorldV0Selection : public FemtoWorldObjectSelection<float, femtoWorld
8888
fInvMassUpLimit(1.3),
8989
fRejectKaon(false),
9090
fInvMassKaonLowLimit(0.48),
91-
fInvMassKaonUpLimit(0.515) {};
91+
fInvMassKaonUpLimit(0.515) {}
9292
/// Initializes histograms for the task
9393
template <o2::aod::femtoworldparticle::ParticleType part, o2::aod::femtoworldparticle::ParticleType daugh, typename cutContainerType>
9494
void init(o2::framework::HistogramRegistry* registry);
@@ -472,9 +472,7 @@ std::array<cutContainerType, 5> FemtoWorldV0Selection::getCutContainer(C const&
472472
sign = -1.;
473473
} else if (abs(nSigmaPrPos) < nSigmaPIDMax && abs(nSigmaPiNeg) < nSigmaPIDMax && diffAntiLambda < diffLambda) {
474474
sign = 1.;
475-
}
476-
// if it happens that none of these are true, ignore the invariant mass
477-
else {
475+
} else { // if it happens that none of these are true, ignore the invariant mass
478476
if (abs(nSigmaPrNeg) < nSigmaPIDMax && abs(nSigmaPiPos) < nSigmaPIDMax) {
479477
sign = -1.;
480478
} else if (abs(nSigmaPrPos) < nSigmaPIDMax && abs(nSigmaPiNeg) < nSigmaPIDMax) {

‎PWGCF/FemtoWorld/TableProducer/femtoWorldProducerReducedTask.cxx‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@
3737
#include <Math/Vector4D.h>
3838
#include <TMath.h>
3939

40+
#include <vector>
41+
4042
using namespace o2;
4143
using namespace o2::analysis::femtoWorld;
4244
using namespace o2::framework;

‎PWGCF/FemtoWorld/TableProducer/femtoWorldProducerTaskV0Only.cxx‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,12 @@
3535
#include <Framework/runDataProcessing.h>
3636
#include <ReconstructionDataFormats/Track.h>
3737

38-
#include <Math/Vector4D.h>
38+
#include <Math/Vector4D.h> // IWYU pragma: keep (do not replace with Math/Vector4Dfwd.h)
39+
#include <Math/Vector4Dfwd.h>
3940
#include <TMath.h>
4041

42+
#include <vector>
43+
4144
using namespace o2;
4245
using namespace o2::analysis::femtoWorld;
4346
using namespace o2::framework;

‎PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskTrackTrack.cxx‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -214,32 +214,39 @@ struct femtoWorldPairTaskTrackTrack {
214214
if (mom > 0.5) {
215215
// if (TMath::Hypot( nsigmaTOFP, nsigmaTPCP )/TMath::Sqrt(2) < 3.0)
216216
if (mom < 2.0) {
217-
if (TMath::Hypot(nsigmaTOFK, nsigmaTPCK) < fNsigma)
217+
if (TMath::Hypot(nsigmaTOFK, nsigmaTPCK) < fNsigma) {
218218
return true;
219-
} else if (TMath::Hypot(nsigmaTOFK, nsigmaTPCK) < fNsigma2)
219+
}
220+
} else if (TMath::Hypot(nsigmaTOFK, nsigmaTPCK) < fNsigma2) {
220221
return true;
222+
}
221223
} else {
222-
if (TMath::Abs(nsigmaTPCK) < fNsigma)
224+
if (TMath::Abs(nsigmaTPCK) < fNsigma) {
223225
return true;
226+
}
224227
}
225228
} else {
226-
227229
if (mom < 0.4) {
228230
if (nsigmaTOFK < -999.) {
229-
if (TMath::Abs(nsigmaTPCK) < 2.0)
231+
if (TMath::Abs(nsigmaTPCK) < 2.0) {
230232
return true;
231-
} else if (TMath::Abs(nsigmaTOFK) < 3.0 && TMath::Abs(nsigmaTPCK) < 3.0)
233+
}
234+
} else if (TMath::Abs(nsigmaTOFK) < 3.0 && TMath::Abs(nsigmaTPCK) < 3.0) {
232235
return true;
236+
}
233237
} else if (mom >= 0.4 && mom <= 0.6) {
234238
if (nsigmaTOFK < -999.) {
235-
if (TMath::Abs(nsigmaTPCK) < 2.0)
239+
if (TMath::Abs(nsigmaTPCK) < 2.0) {
236240
return true;
237-
} else if (TMath::Abs(nsigmaTOFK) < 3.0 && TMath::Abs(nsigmaTPCK) < 3.0)
241+
}
242+
} else if (TMath::Abs(nsigmaTOFK) < 3.0 && TMath::Abs(nsigmaTPCK) < 3.0) {
238243
return true;
244+
}
239245
} else if (nsigmaTOFK < -999.) {
240246
return false;
241-
} else if (TMath::Abs(nsigmaTOFK) < 3.0 && TMath::Abs(nsigmaTPCK) < 3.0)
247+
} else if (TMath::Abs(nsigmaTOFK) < 3.0 && TMath::Abs(nsigmaTPCK) < 3.0) {
242248
return true;
249+
}
243250
}
244251
return false;
245252
}

‎PWGCF/GenericFramework/Core/GenericFrameworkLinkDef.h‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
// granted to it by virtue of its status as an Intergovernmental Organization
1010
// or submit itself to any jurisdiction.
1111

12-
#ifndef PWGCF_GENERICFRAMEWORK_CORE_GENERICFRAMEWORKLINKDEF_H_
13-
#define PWGCF_GENERICFRAMEWORK_CORE_GENERICFRAMEWORKLINKDEF_H_
12+
// NOLINT(build/header_guard)
1413

1514
#pragma link off all globals;
1615
#pragma link off all classes;
@@ -28,5 +27,3 @@
2827
#pragma link C++ class o2::analysis::genericframework::GFWBinningCuts + ;
2928
#pragma link C++ class o2::analysis::genericframework::GFWRegions + ;
3029
#pragma link C++ class o2::analysis::genericframework::GFWCorrConfigs + ;
31-
32-
#endif // PWGCF_GENERICFRAMEWORK_CORE_GENERICFRAMEWORKLINKDEF_H_

‎PWGCF/JCorran/Core/JCORRANLinkDef.h‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
// granted to it by virtue of its status as an Intergovernmental Organization
1010
// or submit itself to any jurisdiction.
1111

12-
#ifndef PWGCF_JCORRAN_CORE_JCORRANLINKDEF_H_
13-
#define PWGCF_JCORRAN_CORE_JCORRANLINKDEF_H_
12+
// NOLINT(build/header_guard)
1413

1514
#pragma link off all globals;
1615
#pragma link off all classes;
@@ -22,5 +21,3 @@
2221
#pragma link C++ class FlowJSPCAnalysis + ;
2322
#pragma link C++ class FlowJSPCObservables + ;
2423
#pragma link C++ class JEPFlowAnalysis + ;
25-
26-
#endif // PWGCF_JCORRAN_CORE_JCORRANLINKDEF_H_

0 commit comments

Comments
 (0)