Skip to content

Commit 08c0583

Browse files
IgorPtakIgorPtak
authored
Merge pull request #4 from alibuild/alibot-cleanup-17424
Please consider the following formatting changes to #17424
2 parents debfdb9 + 23f15fb commit 08c0583

9 files changed

Lines changed: 26 additions & 34 deletions

File tree

‎PWGCF/Femto/Core/charmHadronBuilder.h‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,8 @@ using ConfLcSelection2 = ConfLcSelection<PrefixLcSelection2>;
139139
/// registered is decided per species in CharmHadronSelection::configure.
140140
enum CharmHadronSels {
141141
// topological selections
142-
kCpaMin, ///< Min. CPA (cosine pointing angle)
143-
kDecayLengthMin, ///< Min. decay length
142+
kCpaMin, ///< Min. CPA (cosine pointing angle)
143+
kDecayLengthMin, ///< Min. decay length
144144

145145
// topological selections, 2-prong only (D0)
146146
kImpactParameterProductMax, ///< Max. product of prong impact parameters (d0*d0)
@@ -472,12 +472,12 @@ class CharmHadronBuilder
472472
{
473473
if (mProduceD0s) {
474474
charmHadronProducts.producedD0s(collisionProducts.producedCollision.lastIndex(),
475-
signedPt,
476-
candidate.eta(),
477-
candidate.phi(),
478-
mass,
479-
posDauIndex,
480-
negDauIndex);
475+
signedPt,
476+
candidate.eta(),
477+
candidate.phi(),
478+
mass,
479+
posDauIndex,
480+
negDauIndex);
481481
}
482482
if (mProduceD0Masks) {
483483
charmHadronProducts.producedD0Masks(mCharmHadronSelection.getBitmask());
@@ -608,7 +608,7 @@ class CharmHadronBuilder
608608

609609
template <modes::System system, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8>
610610
void fillCharmHadrons(T1 const& col, T2& collisionBuilder, T3& collisionProducts, T4& trackProducts,
611-
T5& charmHadronProducts, T6 const& candidates, T7 const& /*tracks*/, T8& trackBuilder)
611+
T5& charmHadronProducts, T6 const& candidates, T7 const& /*tracks*/, T8& trackBuilder)
612612
{
613613
if (!mFillAnyTable) {
614614
return;
@@ -656,7 +656,7 @@ class CharmHadronBuilder
656656

657657
template <modes::System system, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8, typename T9, typename T10, typename T11, typename T12>
658658
void fillMcCharmHadrons(T1 const& col, T2& collisionBuilder, T3& collisionProducts, T4 const& mcCols, T5& trackProducts,
659-
T6& charmHadronProducts, T7 const& candidates, T8 const& tracks, T9& trackBuilder, T10 const& mcParticles, T11& mcBuilder, T12& mcProducts)
659+
T6& charmHadronProducts, T7 const& candidates, T8 const& tracks, T9& trackBuilder, T10 const& mcParticles, T11& mcBuilder, T12& mcProducts)
660660
{
661661
if (!mFillAnyTable) {
662662
return;

‎PWGCF/Femto/Core/charmHadronHistManager.h‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -256,17 +256,17 @@ auto makeD0McQaHistSpecMap(const T1& confBinningAnalysis, const T2& confBinningQ
256256
}
257257

258258
// NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
259-
#define LC_HIST_QA_MAP(conf) \
260-
{kMassLcToPKPi, {(conf).massLcToPKPi}}, \
261-
{kMassLcToPiKP, {(conf).massLcToPiKP}}, \
262-
{kMlBkg, {(conf).mlScore}}, \
263-
{kMlPrompt, {(conf).mlScore}}, \
264-
{kMlNonPrompt, {(conf).mlScore}}, \
265-
{kCpa, {(conf).cpa}}, \
266-
{kCpaXY, {(conf).cpa}}, \
267-
{kDecayLength, {(conf).decayLength}}, \
268-
{kDecayLengthXY, {(conf).decayLength}}, \
269-
{kChi2Pca, {(conf).chi2Pca}}, \
259+
#define LC_HIST_QA_MAP(conf) \
260+
{kMassLcToPKPi, {(conf).massLcToPKPi}}, \
261+
{kMassLcToPiKP, {(conf).massLcToPiKP}}, \
262+
{kMlBkg, {(conf).mlScore}}, \
263+
{kMlPrompt, {(conf).mlScore}}, \
264+
{kMlNonPrompt, {(conf).mlScore}}, \
265+
{kCpa, {(conf).cpa}}, \
266+
{kCpaXY, {(conf).cpa}}, \
267+
{kDecayLength, {(conf).decayLength}}, \
268+
{kDecayLengthXY, {(conf).decayLength}}, \
269+
{kChi2Pca, {(conf).chi2Pca}}, \
270270
{kImpactParameterProngSqSum, {(conf).impactParameterProngSqSum}},
271271

272272
template <typename T>
@@ -285,7 +285,6 @@ auto makeLcMcQaHistSpecMap(const T1& confBinningAnalysis, const T2& confBinningQ
285285
CHARMHADRON_HIST_MC_MAP(confBinningAnalysis)};
286286
}
287287

288-
289288
#undef CHARMHADRON_HIST_ANALYSIS_MAP
290289
#undef CHARMHADRON_HIST_MC_MAP
291290
#undef CHARMHADRON_HIST_QA_MAP
@@ -538,7 +537,6 @@ class CharmHadronHistManager
538537
}
539538
}
540539

541-
542540
void initMc(std::map<CharmHadronHist, std::vector<o2::framework::AxisSpec>> const& CharmHadronSpecs)
543541
{
544542
std::string mcDir = std::string(charmHadronPrefix) + std::string(McDir);

‎PWGCF/Femto/Core/closePairRejection.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -588,7 +588,7 @@ class ClosePairRejectionTrackLc
588588
mCtrPion.compute(track, prong2);
589589
}
590590

591-
[[nodiscard]] bool isClosePair() const { return mCtrProton.isClosePair() || mCtrKaon.isClosePair() || mCtrPion.isClosePair(); }
591+
[[nodiscard]] bool isClosePair() const { return mCtrProton.isClosePair() || mCtrKaon.isClosePair() || mCtrPion.isClosePair(); }
592592

593593
void fill(float kstar)
594594
{

‎PWGCF/Femto/Core/mcBuilder.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ class McBuilder
277277
if (!RecoDecay::isMatchedMCGen(mcParticles, mcParticle, o2::constants::physics::Pdg::kLambdaCPlus, std::array{+kProton, -kKPlus, +kPiPlus}, true, &sign, 2)) {
278278
return;
279279
}
280-
if(std::abs(mcParticle.y()) > mCharmYGenMax) {
280+
if (std::abs(mcParticle.y()) > mCharmYGenMax) {
281281
return;
282282
}
283283
}

‎PWGCF/Femto/Core/pairBuilder.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1085,7 +1085,7 @@ class PairTrackLcBuilder
10851085
mMixingDepth = confMixing.depth.value;
10861086
}
10871087

1088-
template <modes::Mode mode, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6>
1088+
template <modes::Mode mode, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6>
10891089
void processSameEvent(T1 const& col, T2& trackTable, T3& trackPartition, T4& /*lcTable*/, T5& lcPartition, T6& cache)
10901090
{
10911091
auto trackSlice = trackPartition->sliceByCached(o2::aod::femtobase::stored::fColId, col.globalIndex(), cache);

‎PWGCF/Femto/Core/pairHistManager.h‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -711,9 +711,7 @@ class PairHistManager
711711
}
712712

713713
if (mPlotDalitz) {
714-
if constexpr (modes::isEqual(particleType1, modes::Particle::kTrack) && (modes::isEqual(particleType2, modes::Particle::kV0) ||
715-
modes::isEqual(particleType2, modes::Particle::kTwoTrackResonance) ||
716-
modes::isEqual(particleType2, modes::Particle::kCharmHadron)) &&
714+
if constexpr (modes::isEqual(particleType1, modes::Particle::kTrack) && (modes::isEqual(particleType2, modes::Particle::kV0) || modes::isEqual(particleType2, modes::Particle::kTwoTrackResonance) || modes::isEqual(particleType2, modes::Particle::kCharmHadron)) &&
717715
requires(T2 p) { p.posDauId(); p.negDauId(); }) {
718716
auto posDaughter = trackTable.rawIteratorAt(particle2.posDauId() - trackTable.offset());
719717
auto negDaughter = trackTable.rawIteratorAt(particle2.negDauId() - trackTable.offset());

‎PWGCF/Femto/Core/partitions.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,6 @@
195195
(o2::aod::femtobase::stored::mass < (selection).massMax) && \
196196
ncheckbit(o2::aod::femtocharmhadrons::mask, (selection).mask)
197197

198-
199198
// macros for mc collisions (mc only)
200199
// NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
201200
#define MAKE_MC_COLLISION_FILTER(selection) \

‎PWGCF/Femto/TableProducer/femtoProducer.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -967,7 +967,7 @@ struct FemtoProducer {
967967
}
968968
PROCESS_SWITCH(FemtoProducer, processTracksLcsRun3PbPb, "Provide tracks and Lcs in PbPb collisions", false);
969969

970-
void processTracksLcsRun3ppMc(rawinputs::Run3PpMcGenCollisions const& mcCols,
970+
void processTracksLcsRun3ppMc(rawinputs::Run3PpMcGenCollisions const& mcCols,
971971
rawinputs::Run3PpMcRecoCollisions const& cols,
972972
o2::aod::BCsWithTimestamps const& bcs,
973973
rawinputs::Run3McRecoTracks const& tracks,

‎PWGCF/Femto/Tasks/femtoCharmHadronQa.cxx‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,6 @@ struct FemtoCharmHadronQa {
109109
modes::CharmHadron::kLc>
110110
lcHistManager;
111111

112-
113-
114112
// setup for daughters
115113
trackhistmanager::ConfD01PosDauBinning confD01PosDaughterBinning;
116114
trackhistmanager::ConfD01PosDauQaBinning confD01PosDaughterQaBinning;
@@ -127,7 +125,6 @@ struct FemtoCharmHadronQa {
127125
trackhistmanager::ConfLc1PionDauBinning confLc1PionDaughterBinning;
128126
trackhistmanager::ConfLc1PionDauQaBinning confLc1PionDaughterQaBinning;
129127

130-
131128
o2::framework::HistogramRegistry hRegistry{"FemtoCharmHadronQa", {}, o2::framework::OutputObjHandlingPolicy::AnalysisObject};
132129

133130
void init(o2::framework::InitContext&)

0 commit comments

Comments
 (0)