Skip to content

Commit 312fba8

Browse files
authored
Merge pull request #27 from alibuild/alibot-cleanup-8742
Please consider the following formatting changes to AliceO2Group#8742
2 parents bb03560 + ebbc4d7 commit 312fba8

File tree

3 files changed

+17
-17
lines changed

3 files changed

+17
-17
lines changed

PWGHF/HFC/DataModel/CorrelationTables.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,12 @@ DECLARE_SOA_COLUMN(PtD, ptD, float); //! Transverse mom
5757
DECLARE_SOA_COLUMN(PtHadron, ptHadron, float); //! Transverse momentum of Hadron
5858
DECLARE_SOA_COLUMN(MD, mD, float); //! Invariant mass of D0
5959
DECLARE_SOA_COLUMN(MDbar, mDbar, float); //! Invariant mass of D0bar
60-
DECLARE_SOA_COLUMN(MlScoreBkgD0, mlScoreBkgD0, float); //! ML background score for D0 selection
61-
DECLARE_SOA_COLUMN(MlScoreNonPromptD0, mlScoreNonPromptD0, float); //! ML prompt score for D0 selection
62-
DECLARE_SOA_COLUMN(MlScorePromptD0, mlScorePromptD0, float); //! ML prompt score for D0 selection
63-
DECLARE_SOA_COLUMN(MlScoreBkgD0bar, mlScoreBkgD0bar, float); //! ML background score for D0 selection
64-
DECLARE_SOA_COLUMN(MlScoreNonPromptD0bar, mlScoreNonPromptD0bar, float); //! ML prompt score for D0 selection
65-
DECLARE_SOA_COLUMN(MlScorePromptD0bar, mlScorePromptD0bar, float); //! ML prompt score for D0 selection
60+
DECLARE_SOA_COLUMN(MlScoreBkgD0, mlScoreBkgD0, float); //! ML background score for D0 selection
61+
DECLARE_SOA_COLUMN(MlScoreNonPromptD0, mlScoreNonPromptD0, float); //! ML prompt score for D0 selection
62+
DECLARE_SOA_COLUMN(MlScorePromptD0, mlScorePromptD0, float); //! ML prompt score for D0 selection
63+
DECLARE_SOA_COLUMN(MlScoreBkgD0bar, mlScoreBkgD0bar, float); //! ML background score for D0 selection
64+
DECLARE_SOA_COLUMN(MlScoreNonPromptD0bar, mlScoreNonPromptD0bar, float); //! ML prompt score for D0 selection
65+
DECLARE_SOA_COLUMN(MlScorePromptD0bar, mlScorePromptD0bar, float); //! ML prompt score for D0 selection
6666
DECLARE_SOA_COLUMN(SignalStatus, signalStatus, int); //! Tag for D0,D0bar
6767
DECLARE_SOA_COLUMN(PoolBin, poolBin, int); //! Pool Bin for the MixedEvent
6868
DECLARE_SOA_COLUMN(IsAutoCorrelated, isAutoCorrelated, bool); //! Correlation Status

PWGHF/HFC/TableProducer/correlatorD0Hadrons.cxx

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ struct HfCorrelatorD0Hadrons {
303303
registry.fill(HIST("hMultiplicity"), nTracks);
304304
std::vector<float> outputMlD0 = {-1., -1., -1.};
305305
std::vector<float> outputMlD0bar = {-1., -1., -1.};
306-
306+
307307
for (const auto& candidate : candidates) {
308308
if (std::abs(hfHelper.yD0(candidate)) >= yCandMax || candidate.pt() <= ptCandMin || candidate.pt() >= ptTrackMax) {
309309
continue;
@@ -339,8 +339,8 @@ struct HfCorrelatorD0Hadrons {
339339
outputMlD0bar[iclass] = candidate.mlProbD0bar()[classMl->at(iclass)];
340340
}
341341
}
342-
entryD0CandRecoInfo(hfHelper.invMassD0ToPiK(candidate), hfHelper.invMassD0barToKPi(candidate), candidate.pt(), outputMlD0[0], outputMlD0[2], outputMlD0bar[0], outputMlD0bar[2]);
343-
342+
entryD0CandRecoInfo(hfHelper.invMassD0ToPiK(candidate), hfHelper.invMassD0barToKPi(candidate), candidate.pt(), outputMlD0[0], outputMlD0[2], outputMlD0bar[0], outputMlD0bar[2]);
343+
344344
// ========================== Fill general histos ================================
345345
registry.fill(HIST("hPtCand"), candidate.pt());
346346
registry.fill(HIST("hPtProng0"), candidate.ptProng0());
@@ -411,7 +411,7 @@ struct HfCorrelatorD0Hadrons {
411411
poolBin,
412412
correlationStatus);
413413
entryD0HadronRecoInfo(hfHelper.invMassD0ToPiK(candidate), hfHelper.invMassD0barToKPi(candidate), signalStatus);
414-
entryD0HadronMlInfo(outputMlD0[0],outputMlD0[1],outputMlD0[2],outputMlD0bar[0],outputMlD0bar[1],outputMlD0bar[2]);
414+
entryD0HadronMlInfo(outputMlD0[0], outputMlD0[1], outputMlD0[2], outputMlD0bar[0], outputMlD0bar[1], outputMlD0bar[2]);
415415

416416
} // end inner loop (tracks)
417417

@@ -580,7 +580,7 @@ struct HfCorrelatorD0Hadrons {
580580
correlationStatus);
581581
entryD0HadronRecoInfo(hfHelper.invMassD0ToPiK(candidate), hfHelper.invMassD0barToKPi(candidate), signalStatus);
582582
} // end inner loop (Tracks)
583-
} // end of outer loop (D0)
583+
} // end of outer loop (D0)
584584
registry.fill(HIST("hZvtx"), collision.posZ());
585585
registry.fill(HIST("hMultV0M"), collision.multFT0M());
586586
}
@@ -716,21 +716,21 @@ struct HfCorrelatorD0Hadrons {
716716
invMassDstar2 = std::sqrt((eKPi + ePion) * (eKPi + ePion) - pSum2);
717717
std::vector<float> outputMlD0 = {-1., -1., -1.};
718718
std::vector<float> outputMlD0bar = {-1., -1., -1.};
719-
719+
720720
if (t1.isSelD0() >= selectionFlagD0) {
721721
if ((std::abs(invMassDstar1 - hfHelper.invMassD0ToPiK(t1)) - softPiMass) < ptSoftPionMax) {
722722
isSoftPiD0 = true;
723723
}
724724
for (unsigned int iclass = 0; iclass < classMl->size(); iclass++) {
725-
outputMlD0[iclass] = t1.mlProbD0()[classMl->at(iclass)];
725+
outputMlD0[iclass] = t1.mlProbD0()[classMl->at(iclass)];
726726
}
727727
}
728728
if (t1.isSelD0bar() >= selectionFlagD0bar) {
729729
if ((std::abs(invMassDstar2 - hfHelper.invMassD0barToKPi(t1)) - softPiMass) < ptSoftPionMax) {
730730
isSoftPiD0bar = true;
731731
}
732732
for (unsigned int iclass = 0; iclass < classMl->size(); iclass++) {
733-
outputMlD0bar[iclass] = t1.mlProbD0bar()[classMl->at(iclass)];
733+
outputMlD0bar[iclass] = t1.mlProbD0bar()[classMl->at(iclass)];
734734
}
735735
}
736736

@@ -752,7 +752,7 @@ struct HfCorrelatorD0Hadrons {
752752
bool correlationStatus = false;
753753
entryD0HadronPair(getDeltaPhi(t1.phi(), t2.phi()), t1.eta() - t2.eta(), t1.pt(), t2.pt(), poolBin, correlationStatus);
754754
entryD0HadronRecoInfo(hfHelper.invMassD0ToPiK(t1), hfHelper.invMassD0barToKPi(t1), signalStatus);
755-
entryD0HadronMlInfo(outputMlD0[0],outputMlD0[1],outputMlD0[2],outputMlD0bar[0],outputMlD0bar[1],outputMlD0bar[2]);
755+
entryD0HadronMlInfo(outputMlD0[0], outputMlD0[1], outputMlD0[2], outputMlD0bar[0], outputMlD0bar[1], outputMlD0bar[2]);
756756
}
757757
}
758758
}

PWGHF/HFC/Tasks/taskCorrelationD0Hadrons.cxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ struct HfTaskCorrelationD0Hadrons {
264264
registry.fill(HIST("hBdtScorePromptD0bar"), bdtScorePromptD0bar);
265265
registry.fill(HIST("hBdtScoreBkgD0bar"), bdtScoreBkgD0bar);
266266
}
267-
267+
268268
for (const auto& pairEntry : pairEntries) {
269269
// define variables for widely used quantities
270270
double deltaPhi = pairEntry.deltaPhi();
@@ -289,7 +289,7 @@ struct HfTaskCorrelationD0Hadrons {
289289
if (ptHadron > ptHadronMax) {
290290
ptHadron = ptHadronMax + 0.5;
291291
}
292-
if (bdtScorePromptD0 < mlOutputPromptD0->at(ptBinD) || bdtScoreBkgD0 > mlOutputBkgD0->at(ptBinD) ||
292+
if (bdtScorePromptD0 < mlOutputPromptD0->at(ptBinD) || bdtScoreBkgD0 > mlOutputBkgD0->at(ptBinD) ||
293293
bdtScorePromptD0bar < mlOutputPromptD0bar->at(ptBinD) || bdtScoreBkgD0bar > mlOutputBkgD0bar->at(ptBinD)) {
294294
continue;
295295
}

0 commit comments

Comments
 (0)