Skip to content

Commit f8c2ff3

Browse files
wenyaCernwenyaCern
authored
Merge pull request #2 from alibuild/alibot-cleanup-12690
[PWGCF] Please consider the following formatting changes to AliceO2Group#12690
2 parents 60b0dc7 + c10bd99 commit f8c2ff3

File tree

7 files changed

+133
-137
lines changed

7 files changed

+133
-137
lines changed

‎PWGCF/Femto/Core/FemtoFlowAngularContainer.h‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,12 @@
2525

2626
#include "Common/Core/RecoDecay.h"
2727

28-
#include "Framework/HistogramRegistry.h"
29-
30-
#include "Math/Vector4D.h"
3128
#include "Framework/ASoAHelpers.h"
32-
#include "Framework/O2DatabasePDGPlugin.h"
3329
#include "Framework/AnalysisTask.h"
30+
#include "Framework/HistogramRegistry.h"
31+
#include "Framework/O2DatabasePDGPlugin.h"
3432

33+
#include "Math/Vector4D.h"
3534
#include "TMath.h"
3635

3736
#include <fairlogger/Logger.h>
@@ -156,8 +155,6 @@ class FemtoFlowAngularContainer
156155
mPDGTwo = pdg2;
157156
}
158157

159-
160-
161158
/// Pass a pair to the container and compute all the relevant observables
162159
/// Called by setPair both in case of data/ and Monte Carlo reconstructed and for Monte Carlo truth
163160
/// \tparam T type of the femtoflowparticle
@@ -174,7 +171,7 @@ class FemtoFlowAngularContainer
174171
deltaPhi = part1.phi() - part2.phi();
175172

176173
deltaPhi = RecoDecay::constrainAngle(deltaPhi, mPhiLow, 1);
177-
174+
178175
// while (deltaPhi < mPhiLow) {
179176
// deltaPhi += o2::constants::math::TwoPI;
180177
// }
@@ -246,7 +243,7 @@ class FemtoFlowAngularContainer
246243
}
247244

248245
protected:
249-
o2::framework::HistogramRegistry* mHistogramRegistry = nullptr; ///< For QA output
246+
o2::framework::HistogramRegistry* mHistogramRegistry = nullptr; ///< For QA output
250247
static constexpr std::string_view FolderSuffix[2] = {"SameEvent", "MixedEvent"}; ///< Folder naming for the output according to EventType
251248
static constexpr femto_flow_angular_container::Observable FemtoObs = obs; ///< Femtoscopic observable to be computed (according to femto_flow_angular_container::Observable)
252249
static constexpr int EventType = eventType; ///< Type of the event (same/mixed, according to femto_flow_angular_container::EventType)

‎PWGCF/Femto/Core/FemtoFlowCollisionSelection.h‎

Lines changed: 108 additions & 109 deletions
Large diffs are not rendered by default.

‎PWGCF/Femto/Core/FemtoFlowDetaDphiStar.h‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,18 @@
2121

2222
#include "PWGCF/Femto/Core/FemtoFlowAngularContainer.h"
2323
#include "PWGCF/Femto/Core/FemtoFlowFemtoContainer.h"
24+
#include "PWGCF/Femto/Core/FemtoFlowTrackSelection.h"
2425
#include "PWGCF/Femto/DataModel/FemtoDerived.h"
26+
2527
#include "Common/Core/RecoDecay.h"
2628

29+
#include "Framework/HistogramRegistry.h"
30+
2731
#include "TMath.h"
2832

2933
#include <memory>
3034
#include <string>
3135
#include <vector>
32-
#include "PWGCF/Femto/Core/FemtoFlowTrackSelection.h"
33-
34-
#include "Framework/HistogramRegistry.h"
3536

3637
namespace o2::analysis
3738
{
@@ -173,7 +174,7 @@ class FemtoFlowDetaDphiStar
173174
magfield = lmagfield;
174175

175176
const int numEvtType = 2;
176-
177+
177178
if constexpr (kPartOneType == o2::aod::femtoflowparticle::ParticleType::kTrack && kPartTwoType == o2::aod::femtoflowparticle::ParticleType::kTrack) {
178179
/// Track-Track combination
179180
// check if provided particles are in agreement with the class instantiation
@@ -299,7 +300,7 @@ class FemtoFlowDetaDphiStar
299300
auto daughter = particles.begin() + indexOfDaughter;
300301
auto deta = part1.eta() - daughter.eta();
301302
auto dphiAvg = averagePhiStar(part1, *daughter, i); // auto dphiAvg = calculateDphiStar(part1, *daughter);
302-
dphiAvg = RecoDecay::constrainAngle(dphiAvg, -1*o2::constants::math::PI, 1);
303+
dphiAvg = RecoDecay::constrainAngle(dphiAvg, -1 * o2::constants::math::PI, 1);
303304
if (ChosenEventType == femto_flow_femto_container::EventType::same) {
304305
histdetadpisame[i][0]->Fill(deta, dphiAvg);
305306
} else if (ChosenEventType == femto_flow_femto_container::EventType::mixed) {
@@ -419,7 +420,7 @@ class FemtoFlowDetaDphiStar
419420
/// Magnetic field to be provided in Tesla
420421
template <typename T>
421422
void phiAtRadiiTPC(const T& part, std::vector<float>& tmpVec)
422-
{
423+
{
423424

424425
float phi0 = part.phi();
425426
// Start: Get the charge from cutcontainer using masks
@@ -465,7 +466,7 @@ class FemtoFlowDetaDphiStar
465466
} else {
466467
dphi = 0;
467468
}
468-
dphi = RecoDecay::constrainAngle(dphi, -1*o2::constants::math::PI, 1);
469+
dphi = RecoDecay::constrainAngle(dphi, -1 * o2::constants::math::PI, 1);
469470
dPhiAvg += dphi;
470471
if (plotForEveryRadii) {
471472
histdetadpiRadii[iHist][i]->Fill(part1.eta() - part2.eta(), dphi);

‎PWGCF/Femto/Core/FemtoFlowFemtoContainer.h‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,12 @@
2222

2323
#include "PWGCF/Femto/Core/FemtoFlowMath.h"
2424

25-
#include "Framework/HistogramRegistry.h"
26-
27-
#include "Math/Vector4D.h"
2825
#include "Framework/ASoAHelpers.h"
29-
#include "Framework/O2DatabasePDGPlugin.h"
3026
#include "Framework/AnalysisTask.h"
27+
#include "Framework/HistogramRegistry.h"
28+
#include "Framework/O2DatabasePDGPlugin.h"
3129

30+
#include "Math/Vector4D.h"
3231
#include "TMath.h"
3332

3433
#include <fairlogger/Logger.h>
@@ -319,13 +318,13 @@ class FemtoFlowFemtoContainer
319318
}
320319

321320
protected:
322-
o2::framework::HistogramRegistry* HistogramRegistry = nullptr; ///< For QA output
321+
o2::framework::HistogramRegistry* HistogramRegistry = nullptr; ///< For QA output
323322
static constexpr std::string_view FolderSuffix[2] = {"SameEvent", "MixedEvent"}; ///< Folder naming for the output according to kEventType
324323
static constexpr femto_flow_femto_container::Observable FemtoObs = obs; ///< Femtoscopic observable to be computed (according to femto_flow_femto_container::Observable)
325-
static constexpr int kEventType = eventType; ///< Type of the event (same/mixed, according to femto_flow_femto_container::EventType)
326-
float kMassOne = 0.f; ///< PDG mass of particle 1
327-
float kMassTwo = 0.f; ///< PDG mass of particle 2
328-
int kPDGOne = 0; ///< PDG code of particle 1
324+
static constexpr int kEventType = eventType; ///< Type of the event (same/mixed, according to femto_flow_femto_container::EventType)
325+
float kMassOne = 0.f; ///< PDG mass of particle 1
326+
float kMassTwo = 0.f; ///< PDG mass of particle 2
327+
int kPDGOne = 0; ///< PDG code of particle 1
329328
int kPDGTwo = 0;
330329
int numqnBins = 10; ///< Max num of devided qn bins
331330
};

‎PWGCF/Femto/Core/FemtoFlowObjectSelection.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ class FemtoFlowObjectSelection
196196
}
197197

198198
protected:
199-
o2::framework::HistogramRegistry* mHistogramRegistry; ///< For QA output
199+
o2::framework::HistogramRegistry* mHistogramRegistry; ///< For QA output
200200
std::vector<FemtoFlowSelection<selValDataType, selVariable>> mSelections; ///< Vector containing all selections
201201
};
202202

‎PWGCF/Femto/Core/FemtoFlowPairCleaner.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ class FemtoFlowPairCleaner
187187
}
188188

189189
private:
190-
o2::framework::HistogramRegistry* mHistogramRegistry; ///< For QA output
190+
o2::framework::HistogramRegistry* mHistogramRegistry; ///< For QA output
191191
static constexpr o2::aod::femtoflowparticle::ParticleType kPartOneType = partOne; ///< Type of particle 1
192192
static constexpr o2::aod::femtoflowparticle::ParticleType kPartTwoType = partTwo; ///< Type of particle 2
193193
};

‎PWGCF/Femto/Core/FemtoFlowParticleHisto.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,7 @@ class FemtoFlowParticleHisto
523523
/// \param part particle for which the histograms should be filled
524524
template <bool isMC, bool isDebug, typename T>
525525
void fillQAMisIden(T const& part, int confPDG)
526-
{
526+
{
527527
using namespace o2::framework;
528528

529529
fillQABaseMisiden<isMC, isDebug, T>(part, HIST(o2::aod::femtoflowparticle::ParticleTypeName[kParticleType]) + HIST(kFolderSuffix[kFolderSuffixType]), confPDG);
@@ -545,7 +545,7 @@ class FemtoFlowParticleHisto
545545
}
546546

547547
private:
548-
o2::framework::HistogramRegistry* mHistogramRegistry; ///< For QA output
548+
o2::framework::HistogramRegistry* mHistogramRegistry; ///< For QA output
549549
static constexpr o2::aod::femtoflowparticle::ParticleType kParticleType = particleType; ///< Type of the particle under analysis // o2-linter: disable=name/constexpr-constant
550550
static constexpr int kFolderSuffixType = suffixType; ///< Counter for the folder suffix specified below // o2-linter: disable=name/constexpr-constant
551551
static constexpr std::string_view kFolderSuffix[5] = {"_debug", "_one", "_two", "_pos", "_neg"}; ///< Suffix for the folder name in case of analyses of pairs of the same kind (T-T, V-V, C-C) // o2-linter: disable=name/constexpr-constant

0 commit comments

Comments
 (0)