Skip to content

Commit 988a58a

Browse files
mtorresc15mtorresc15
committed
Fix formatting issues in Omegac QA workflow
1 parent 6a4c788 commit 988a58a

4 files changed

Lines changed: 111 additions & 116 deletions

File tree

‎PWGHF/Core/HfMlResponseOmegacToOmegaPiQa.h‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,9 @@
3030
// Fill the map of available input features
3131
// the key is the feature's name (std::string)
3232
// the value is the corresponding value in EnumInputFeatures
33-
#define FILL_MAP_OMEGAC0(FEATURE) \
34-
{ \
35-
#FEATURE, static_cast<uint8_t>(InputFeaturesOmegacToOmegaPi::FEATURE) \
36-
}
33+
#define FILL_MAP_OMEGAC0(FEATURE) \
34+
{ \
35+
#FEATURE, static_cast<uint8_t>(InputFeaturesOmegacToOmegaPi::FEATURE)}
3736

3837
// Check if the index of mCachedIndices (index associated to a FEATURE)
3938
// matches the entry in EnumInputFeatures associated to this FEATURE
@@ -70,7 +69,7 @@ enum class InputFeaturesOmegacToOmegaPi : uint8_t {
7069
impactParCascZ,
7170
cosPACharmBaryon,
7271
cosPACasc,
73-
72+
7473
// KFParticle variables
7574
cosPaOmegacToPv,
7675
kfDcaXYPiFromOmegac,
@@ -113,7 +112,7 @@ class HfMlResponseOmegacToOmegaPi : public HfMlResponse<TypeOutputScore>
113112
std::vector<float> inputFeatures;
114113

115114
for (const auto& idx : MlResponse<TypeOutputScore>::mCachedIndices) {
116-
115+
117116
// Variables common to DCAFitter and KFParticle
118117
switch (idx) {
119118

@@ -124,7 +123,7 @@ class HfMlResponseOmegacToOmegaPi : public HfMlResponse<TypeOutputScore>
124123
CHECK_AND_FILL_VEC_OMEGAC0_FULL(cascProng, nSigmaTPCKaFromCasc, tpcNSigmaKa);
125124
CHECK_AND_FILL_VEC_OMEGAC0_FULL(charmBaryonProng, nSigmaTPCPiFromOmegac, tpcNSigmaPi);
126125
}
127-
126+
128127
// DCAFitter variables
129128
if constexpr (reconstructionType == aod::hf_cand_casc_lf::ConstructMethod::DcaFitter) {
130129

@@ -138,7 +137,7 @@ class HfMlResponseOmegacToOmegaPi : public HfMlResponse<TypeOutputScore>
138137
CHECK_AND_FILL_VEC_OMEGAC0(cosPACasc);
139138
}
140139
}
141-
140+
142141
// KFParticle variables
143142
if constexpr (reconstructionType == aod::hf_cand_casc_lf::ConstructMethod::KfParticle) {
144143

@@ -180,8 +179,7 @@ class HfMlResponseOmegacToOmegaPi : public HfMlResponse<TypeOutputScore>
180179
FILL_MAP_OMEGAC0(dcaCascDau),
181180
FILL_MAP_OMEGAC0(nSigmaTPCPiFromV0),
182181
FILL_MAP_OMEGAC0(nSigmaTPCPiFromOmegac),
183-
FILL_MAP_OMEGAC0(nSigmaTPCKaFromCasc)
184-
};
182+
FILL_MAP_OMEGAC0(nSigmaTPCKaFromCasc)};
185183

186184
// DCAFitter variables
187185
if constexpr (reconstructionType == aod::hf_cand_casc_lf::ConstructMethod::DcaFitter) {
@@ -193,8 +191,7 @@ class HfMlResponseOmegacToOmegaPi : public HfMlResponse<TypeOutputScore>
193191
FILL_MAP_OMEGAC0(impactParCascXY),
194192
FILL_MAP_OMEGAC0(impactParCascZ),
195193
FILL_MAP_OMEGAC0(cosPACharmBaryon),
196-
FILL_MAP_OMEGAC0(cosPACasc)
197-
};
194+
FILL_MAP_OMEGAC0(cosPACasc)};
198195

199196
MlResponse<TypeOutputScore>::mAvailableInputFeatures.insert(mapDcaFeatures.begin(), mapDcaFeatures.end());
200197
}
@@ -221,8 +218,7 @@ class HfMlResponseOmegacToOmegaPi : public HfMlResponse<TypeOutputScore>
221218
FILL_MAP_OMEGAC0(chi2NdfTopoCascToOmegac),
222219
FILL_MAP_OMEGAC0(chi2NdfTopoCascToPv),
223220
FILL_MAP_OMEGAC0(chi2GeoOmegac),
224-
FILL_MAP_OMEGAC0(chi2GeoCasc)
225-
};
221+
FILL_MAP_OMEGAC0(chi2GeoCasc)};
226222

227223
MlResponse<TypeOutputScore>::mAvailableInputFeatures.insert(mapKfFeatures.begin(), mapKfFeatures.end());
228224
}

‎PWGHF/D2H/Tasks/taskOmegac0ToOmegaPiQa.cxx‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,10 @@ struct HfTaskOmegac0ToOmegaPiQa {
102102

103103
void init(InitContext&)
104104
{
105-
std::array<bool, 20> doprocess{doprocessDataDCAFitter, doprocessDataDCAFitterMl, doprocessDataDCAFitterFT0C, doprocessDataDCAFitterMlFT0C,
105+
std::array<bool, 20> doprocess{doprocessDataDCAFitter, doprocessDataDCAFitterMl, doprocessDataDCAFitterFT0C, doprocessDataDCAFitterMlFT0C,
106106
doprocessDataDCAFitterFT0M, doprocessDataDCAFitterMlFT0M,
107107
doprocessDataKFParticle, doprocessDataKFParticleMl, doprocessDataKFParticleFT0C, doprocessDataKFParticleMlFT0C,
108-
doprocessDataKFParticleFT0M, doprocessDataKFParticleMlFT0M,
108+
doprocessDataKFParticleFT0M, doprocessDataKFParticleMlFT0M,
109109
doprocessMcDCAFitter, doprocessMcDCAFitterMl,
110110
doprocessMcDCAFitterFT0M, doprocessMcDCAFitterMlFT0M,
111111
doprocessMcKFParticle, doprocessMcKFParticleMl,
@@ -128,12 +128,12 @@ struct HfTaskOmegac0ToOmegaPiQa {
128128
std::vector<AxisSpec> axes = {thnAxisMass, thnAxisPt, thnAxisY};
129129
std::vector<AxisSpec> axesMcGen = {thnAxisPt, thnAxisPtB, thnAxisY, thnAxisOrigin};
130130

131-
if (doprocessDataDCAFitterFT0C || doprocessDataDCAFitterMlFT0C|| doprocessDataDCAFitterFT0M || doprocessDataDCAFitterMlFT0M || doprocessDataKFParticleFT0C || doprocessDataKFParticleMlFT0C || doprocessDataKFParticleFT0M || doprocessDataKFParticleMlFT0M) {
131+
if (doprocessDataDCAFitterFT0C || doprocessDataDCAFitterMlFT0C || doprocessDataDCAFitterFT0M || doprocessDataDCAFitterMlFT0M || doprocessDataKFParticleFT0C || doprocessDataKFParticleMlFT0C || doprocessDataKFParticleFT0M || doprocessDataKFParticleMlFT0M) {
132132
axes.push_back(thnAxisCent);
133133
axes.emplace_back(thnConfigAxisNumPvContr);
134134
}
135135

136-
if (doprocessMcDCAFitterFT0M || doprocessMcDCAFitterMlFT0M ||doprocessMcKFParticleFT0M || doprocessMcKFParticleMlFT0M) {
136+
if (doprocessMcDCAFitterFT0M || doprocessMcDCAFitterMlFT0M || doprocessMcKFParticleFT0M || doprocessMcKFParticleMlFT0M) {
137137
axes.push_back(thnAxisCentMc);
138138
axes.emplace_back(thnConfigAxisNumPvContr);
139139
axesMcGen.push_back(thnAxisCentMc);
@@ -170,7 +170,7 @@ struct HfTaskOmegac0ToOmegaPiQa {
170170
if (!(candidate.resultSelections() == true || (candidate.resultSelections() == false && !selectionFlagOmegac0))) {
171171
continue;
172172
}
173-
173+
174174
double yOmegac{0.};
175175
if constexpr (UseKfParticle) {
176176
yOmegac = candidate.kfRapOmegac();
@@ -211,7 +211,7 @@ struct HfTaskOmegac0ToOmegaPiQa {
211211
if constexpr (UseCentrality) {
212212
float const cent = o2::hf_centrality::getCentralityColl(collision);
213213
if constexpr (ApplyMl) {
214-
registry.fill(HIST("hReco"), candidate.invMassCharmBaryon(), candidate.ptCharmBaryon(), yOmegac,
214+
registry.fill(HIST("hReco"), candidate.invMassCharmBaryon(), candidate.ptCharmBaryon(), yOmegac,
215215
cent, numPvContributors, candidate.mlProbOmegac()[0]);
216216
} else {
217217
registry.fill(HIST("hReco"), candidate.invMassCharmBaryon(), candidate.ptCharmBaryon(), yOmegac,
@@ -280,7 +280,7 @@ struct HfTaskOmegac0ToOmegaPiQa {
280280
if (!(candidate.resultSelections() == true || (candidate.resultSelections() == false && !selectionFlagOmegac0))) {
281281
continue;
282282
}
283-
283+
284284
double yOmegac{0.};
285285
if constexpr (UseKfParticle) {
286286
yOmegac = candidate.kfRapOmegac();
@@ -408,8 +408,8 @@ struct HfTaskOmegac0ToOmegaPiQa {
408408
}
409409
}
410410
}
411-
PROCESS_SWITCH(HfTaskOmegac0ToOmegaPiQa, processDataDCAFitterMlFT0M, "process data with DCAFitter, ML selections, FT0M centrality", false);
412-
411+
PROCESS_SWITCH(HfTaskOmegac0ToOmegaPiQa, processDataDCAFitterMlFT0M, "process data with DCAFitter, ML selections, FT0M centrality", false);
412+
413413
////////////////////////////////////
414414
/// Data with KFParticle //
415415
////////////////////////////////////
@@ -467,7 +467,7 @@ struct HfTaskOmegac0ToOmegaPiQa {
467467

468468
void processDataKFParticleMlFT0M(Omegac0CandsMlKF const& candidates,
469469
CollisionsWithFT0M const& collisions)
470-
{
470+
{
471471
for (const auto& collision : collisions) {
472472
auto groupedOmegacCandidates = candidates.sliceBy(candOmegacKFMlPerCollision, collision.globalIndex());
473473

@@ -495,7 +495,7 @@ struct HfTaskOmegac0ToOmegaPiQa {
495495
processMc<false, true>(omegac0CandidatesMlMc, mcParticles);
496496
}
497497
PROCESS_SWITCH(HfTaskOmegac0ToOmegaPiQa, processMcDCAFitterMl, "Process MC with DCAFitter, ML selections", false);
498-
498+
499499
void processMcDCAFitterFT0M(Omegac0CandsMc const& omegaC0CandidatesMc,
500500
Omegac0Gen const& mcParticles,
501501
CollisionsWithMcLabels const& collisions,

‎PWGHF/TableProducer/candidateSelectorOmegac0ToOmegaPiQa.cxx‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ enum {
6969

7070
/// Struct for applying Omegac0 -> Omega pi selection cuts
7171
struct HfCandidateSelectorToOmegaPiQa {
72-
// DCAFitter and KFParticle
72+
// DCAFitter and KFParticle
7373
Produces<aod::HfSelToOmegaPi> hfSelToOmegaPi;
7474
// ML selection - filled for both DCAFitter and KFParticle
7575
Produces<aod::HfMlSelOmegacToOmegaPi> hfMlSelToOmegaPi;
@@ -369,7 +369,7 @@ struct HfCandidateSelectorToOmegaPiQa {
369369

370370
registry.add("hInvMassCharmBaryon", "Charm baryon invariant mass; inv. mass; entries", {HistType::kTH1F, {{500, 2.3, 3.1}}});
371371
registry.add("hPtCharmBaryon", "Charm baryon transverse momentum; p_{T} (GeV/#it{c}); entries", {HistType::kTH1F, {{8000, 0., 80.}}});
372-
372+
373373
if (doprocessOmegac0SelectorWithKFParticle) {
374374
registry.add("hSelCompetingCasc", "hSelCompetingCasc;status;entries", {HistType::kTH1F, {axisSel}});
375375
registry.add("hInvMassXiMinus_rej_cut", "hInvMassXiMinus_rej_cut;m_{#Lambda#pi} under Xi hypothesis (GeV/#it{c}^{2});entries", {HistType::kTH1F, {{1000, 1.25f, 1.65f}}});
@@ -670,7 +670,7 @@ struct HfCandidateSelectorToOmegaPiQa {
670670

671671
// template <bool dokf, typename TCandTable>
672672
template <int svReco, typename TCandTable>
673-
void runOmegac0Selector(TCandTable const& candidates,
673+
void runOmegac0Selector(TCandTable const& candidates,
674674
TracksSel const& tracks,
675675
TracksSelLf const& lfTracks)
676676
{
@@ -696,11 +696,11 @@ struct HfCandidateSelectorToOmegaPiQa {
696696
registry.fill(HIST("hSelSignDec"), 1); // anti-particle decay
697697
} else {
698698
registry.fill(HIST("hSelSignDec"), 0); // particle decay
699-
}
699+
}
700700

701701
// pT selection
702702
auto ptCandOmegac = RecoDecay::pt(candidate.pxCharmBaryon(), candidate.pyCharmBaryon());
703-
703+
704704
if (ptCandOmegac <= ptCandMin || ptCandOmegac >= ptCandMax) {
705705
resultSelections = false;
706706
}
@@ -725,7 +725,7 @@ struct HfCandidateSelectorToOmegaPiQa {
725725
if (!selectionResOnLF || !selectionResOnHF) {
726726
resultSelections = false;
727727
}
728-
728+
729729
// if (std::abs(etaV0PosDau) > etaTrackLFDauMax) {
730730
// resultSelections = false;
731731
// registry.fill(HIST("hSelEtaPosV0Dau"), 0);
@@ -1222,8 +1222,8 @@ struct HfCandidateSelectorToOmegaPiQa {
12221222
///////////////////////////////////
12231223
/// Process with DCAFitter //
12241224
///////////////////////////////////
1225-
void processOmegac0SelectorWithDCAFitter(aod::HfCandToOmegaPi const& candidates,
1226-
TracksSel const& tracks,
1225+
void processOmegac0SelectorWithDCAFitter(aod::HfCandToOmegaPi const& candidates,
1226+
TracksSel const& tracks,
12271227
TracksSelLf const& lfTracks)
12281228
{
12291229
runOmegac0Selector<doDcaFitter>(candidates, tracks, lfTracks);
@@ -1233,8 +1233,8 @@ struct HfCandidateSelectorToOmegaPiQa {
12331233
////////////////////////////////////
12341234
/// Process with KFParticle //
12351235
////////////////////////////////////
1236-
void processOmegac0SelectorWithKFParticle(soa::Join<aod::HfCandToOmegaPi, aod::HfOmegacKf> const& candidates,
1237-
TracksSel const& tracks,
1236+
void processOmegac0SelectorWithKFParticle(soa::Join<aod::HfCandToOmegaPi, aod::HfOmegacKf> const& candidates,
1237+
TracksSel const& tracks,
12381238
TracksSelLf const& lfTracks)
12391239
{
12401240
runOmegac0Selector<doKfParticle>(candidates, tracks, lfTracks);

0 commit comments

Comments
 (0)