Skip to content

Commit 5c104cc

Browse files
committed
linter
1 parent 2f2de75 commit 5c104cc

1 file changed

Lines changed: 16 additions & 14 deletions

File tree

PWGCF/TwoParticleCorrelations/Tasks/twoParticleCorrelationsMpi.cxx

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

12-
/// \file twoParticleCorrelationsMPI.cxx
12+
/// \file twoParticleCorrelationsMpi.cxx
1313
/// \brief task for the MPI-proxy classification of correlation calculations with CF-filtered tracks for O2 analysis
1414
/// \author Emil Gorm Dahlbæk Nielsen <emil.gorm.nielsen@cern.ch>
1515

@@ -75,7 +75,7 @@ using namespace constants::math;
7575

7676
static constexpr float kCfgPairCutDefaults[1][5] = {{-1, -1, -1, -1, -1}};
7777

78-
struct twoParticleCorrelationsMPI {
78+
struct twoParticleCorrelationsMpi {
7979
SliceCache cache;
8080

8181
// Configuration
@@ -770,7 +770,8 @@ struct twoParticleCorrelationsMPI {
770770
{
771771
const AxisSpec multAxis(axisMultiplicity);
772772
const auto& edges = multAxis.binEdges;
773-
if (edges.size() < 2 || multiplicity < edges.front() || multiplicity >= edges.back()) {
773+
const int minEdges = 2;
774+
if (edges.size() < minEdges || multiplicity < edges.front() || multiplicity >= edges.back()) {
774775
return -1;
775776
}
776777

@@ -780,7 +781,8 @@ struct twoParticleCorrelationsMPI {
780781

781782
int classify(double s) const
782783
{
783-
if (ec.quantileBoundaries.size() < 2) {
784+
const int minEdges = 2;
785+
if (ec.quantileBoundaries.size() < minEdges) {
784786
return -1;
785787
}
786788

@@ -862,7 +864,7 @@ struct twoParticleCorrelationsMPI {
862864
fillQA(collision, multiplicity, tracks);
863865
fillCorrelations<CorrelationContainer::kCFStepReconstructed>(same, tracks, tracks, multiplicity, collision.posZ(), getMagneticField(bc.timestamp()), 1.0f);
864866
}
865-
PROCESS_SWITCH(twoParticleCorrelationsMPI, processSameAOD, "Process same event on AOD", true);
867+
PROCESS_SWITCH(twoParticleCorrelationsMpi, processSameAOD, "Process same event on AOD", true);
866868

867869
template <class CollType, class TTracks1, class TTracks2>
868870
void processSameDerivedT(CollType const& collision, TTracks1 const& tracks1, TTracks2 const& tracks2)
@@ -906,15 +908,15 @@ struct twoParticleCorrelationsMPI {
906908
{
907909
processSameDerivedT(collision, tracks, tracks);
908910
}
909-
PROCESS_SWITCH(twoParticleCorrelationsMPI, processSameDerived, "Process same event on derived data", false);
911+
PROCESS_SWITCH(twoParticleCorrelationsMpi, processSameDerived, "Process same event on derived data", false);
910912

911913
void processSameDerivedMultSet(soa::Filtered<soa::Join<aod::CFCollisions, aod::CFMultSets>>::iterator const& collision, soa::Filtered<aod::CFTracks> const& tracks)
912914
{
913915
if (!passOutlier(collision))
914916
return;
915917
processSameDerivedT(collision, tracks, tracks);
916918
}
917-
PROCESS_SWITCH(twoParticleCorrelationsMPI, processSameDerivedMultSet, "Process same event on derived data with multiplicity sets", false);
919+
PROCESS_SWITCH(twoParticleCorrelationsMpi, processSameDerivedMultSet, "Process same event on derived data with multiplicity sets", false);
918920

919921
using BinningTypeAOD = ColumnBinningPolicy<aod::collision::PosZ, aod::cent::CentRun2V0M>;
920922
void processMixedAOD(AodCollisions const& collisions, AodTracks const& tracks, aod::BCsWithTimestamps const&)
@@ -957,7 +959,7 @@ struct twoParticleCorrelationsMPI {
957959
fillCorrelations<CorrelationContainer::kCFStepReconstructed>(mixed, tracks1, tracks2, collision1.centRun2V0M(), collision1.posZ(), getMagneticField(bc.timestamp()), 1.0f / it.currentWindowNeighbours());
958960
}
959961
}
960-
PROCESS_SWITCH(twoParticleCorrelationsMPI, processMixedAOD, "Process mixed events on AOD", false);
962+
PROCESS_SWITCH(twoParticleCorrelationsMpi, processMixedAOD, "Process mixed events on AOD", false);
961963

962964
template <class CollType, typename... TrackTypes>
963965
void processMixedDerivedT(CollType const& collisions, TrackTypes&&... tracks)
@@ -1029,13 +1031,13 @@ struct twoParticleCorrelationsMPI {
10291031
{
10301032
processMixedDerivedT(collisions, tracks);
10311033
}
1032-
PROCESS_SWITCH(twoParticleCorrelationsMPI, processMixedDerived, "Process mixed events on derived data", false);
1034+
PROCESS_SWITCH(twoParticleCorrelationsMpi, processMixedDerived, "Process mixed events on derived data", false);
10331035

10341036
void processMixedDerivedMultSet(soa::Filtered<soa::Join<aod::CFCollisions, aod::CFMultSets>> const& collisions, DerivedTracks const& tracks)
10351037
{
10361038
processMixedDerivedT(collisions, tracks);
10371039
}
1038-
PROCESS_SWITCH(twoParticleCorrelationsMPI, processMixedDerivedMultSet, "Process mixed events on derived data with multiplicity sets", false);
1040+
PROCESS_SWITCH(twoParticleCorrelationsMpi, processMixedDerivedMultSet, "Process mixed events on derived data with multiplicity sets", false);
10391041

10401042
int getSpecies(int pdgCode)
10411043
{
@@ -1103,7 +1105,7 @@ struct twoParticleCorrelationsMPI {
11031105
}
11041106
}
11051107
}
1106-
PROCESS_SWITCH(twoParticleCorrelationsMPI, processMCEfficiency, "MC: Extract efficiencies", false);
1108+
PROCESS_SWITCH(twoParticleCorrelationsMpi, processMCEfficiency, "MC: Extract efficiencies", false);
11071109

11081110
template <class Particles1, class Particles2>
11091111
void processMCSameDerivedT(soa::Filtered<aod::CFMcCollisions>::iterator const& mcCollision, Particles1 const& mcParticles1, Particles2 const& mcParticles2, soa::SmallGroups<aod::CFCollisionsWithLabel> const& collisions)
@@ -1154,7 +1156,7 @@ struct twoParticleCorrelationsMPI {
11541156
{
11551157
processMCSameDerivedT(mcCollision, mcParticles, mcParticles, collisions);
11561158
}
1157-
PROCESS_SWITCH(twoParticleCorrelationsMPI, processMCSameDerived, "Process MC same event on derived data", false);
1159+
PROCESS_SWITCH(twoParticleCorrelationsMpi, processMCSameDerived, "Process MC same event on derived data", false);
11581160

11591161
PresliceUnsorted<aod::CFCollisionsWithLabel> collisionPerMCCollision = aod::cfcollision::cfMcCollisionId;
11601162
template <typename... ParticleTypes>
@@ -1223,12 +1225,12 @@ struct twoParticleCorrelationsMPI {
12231225
{
12241226
processMCMixedDerivedT(mcCollisions, collisions, mcParticles);
12251227
}
1226-
PROCESS_SWITCH(twoParticleCorrelationsMPI, processMCMixedDerived,
1228+
PROCESS_SWITCH(twoParticleCorrelationsMpi, processMCMixedDerived,
12271229
"Process MC mixed events on derived data", false);
12281230
};
12291231

12301232
WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
12311233
{
12321234
return WorkflowSpec{
1233-
adaptAnalysisTask<twoParticleCorrelationsMPI>(cfgc)};
1235+
adaptAnalysisTask<twoParticleCorrelationsMpi>(cfgc)};
12341236
}

0 commit comments

Comments
 (0)