Skip to content

Commit 33bb1c0

Browse files
authored
[PWGHF] Simplify UPC Lc TTree output (#16406)
1 parent 90107bf commit 33bb1c0

1 file changed

Lines changed: 10 additions & 20 deletions

File tree

PWGHF/D2H/Tasks/taskUpcLc.cxx

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -66,18 +66,15 @@ namespace full
6666
DECLARE_SOA_COLUMN(M, m, float);
6767
DECLARE_SOA_COLUMN(Pt, pt, float);
6868
DECLARE_SOA_COLUMN(BkgScore, bkgScore, float);
69-
DECLARE_SOA_COLUMN(PromptScore, promptScore, float);
70-
DECLARE_SOA_COLUMN(FdScore, fdScore, float);
7169
DECLARE_SOA_COLUMN(PtProng0, ptProng0, float);
7270
DECLARE_SOA_COLUMN(PtProng1, ptProng1, float);
7371
DECLARE_SOA_COLUMN(PtProng2, ptProng2, float);
7472
DECLARE_SOA_COLUMN(Chi2PCA, chi2PCA, float);
7573
DECLARE_SOA_COLUMN(DecayLength, decayLength, float);
7674
DECLARE_SOA_COLUMN(Cpa, cpa, float);
77-
DECLARE_SOA_COLUMN(PvContributors, pvContributors, float);
78-
DECLARE_SOA_COLUMN(Multiplicity, multiplicity, float);
75+
DECLARE_SOA_COLUMN(PvContributors, pvContributors, int);
76+
DECLARE_SOA_COLUMN(Multiplicity, multiplicity, int);
7977
DECLARE_SOA_COLUMN(Vtz, vtz, float);
80-
DECLARE_SOA_COLUMN(AmpFV0A, ampFV0A, float);
8178
DECLARE_SOA_COLUMN(AmpFT0A, ampFT0A, float);
8279
DECLARE_SOA_COLUMN(AmpFT0C, ampFT0C, float);
8380
DECLARE_SOA_COLUMN(ZdcTimeZNA, zdcTimeZNA, float);
@@ -87,7 +84,6 @@ DECLARE_SOA_TABLE(HfUpcQa, "AOD", "HFUPCQA",
8784
full::PvContributors,
8885
full::Multiplicity,
8986
full::Vtz,
90-
full::AmpFV0A,
9187
full::AmpFT0A,
9288
full::AmpFT0C,
9389
full::ZdcTimeZNA,
@@ -97,9 +93,6 @@ DECLARE_SOA_TABLE(HfUpcLcBdtInfos, "AOD", "HFUPCLCBDTINFOS",
9793
full::M,
9894
full::Pt,
9995
full::BkgScore,
100-
full::PromptScore,
101-
full::FdScore,
102-
full::AmpFV0A,
10396
full::AmpFT0A,
10497
full::AmpFT0C,
10598
full::ZdcTimeZNA,
@@ -114,7 +107,6 @@ DECLARE_SOA_TABLE(HfUpcLcInfos, "AOD", "HFUPCLCINFOS",
114107
full::Chi2PCA,
115108
full::DecayLength,
116109
full::Cpa,
117-
full::AmpFV0A,
118110
full::AmpFT0A,
119111
full::AmpFT0C,
120112
full::ZdcTimeZNA,
@@ -251,9 +243,9 @@ struct HfTaskUpcLc {
251243
if (gap == o2::aod::sgselector::TrueGap::SingleGapA || gap == o2::aod::sgselector::TrueGap::SingleGapC) {
252244
registry.fill(HIST("Data/hUpcMulti"), collision.multNTracksPV());
253245
registry.fill(HIST("Data/hUpcVtz"), collision.posZ());
254-
}
255-
if (fillTreeUpcQa) {
256-
rowUpcQa(numPvContributors, collision.multNTracksPV(), collision.posZ(), fitInfo.ampFV0A, fitInfo.ampFT0A, fitInfo.ampFT0C, zdcTimeZNA, zdcTimeZNC);
246+
if (fillTreeUpcQa) {
247+
rowUpcQa(numPvContributors, collision.multNTracksPV(), collision.posZ(), fitInfo.ampFT0A, fitInfo.ampFT0C, zdcTimeZNA, zdcTimeZNC);
248+
}
257249
}
258250

259251
for (const auto& candidate : groupedLcCandidates) {
@@ -271,7 +263,7 @@ struct HfTaskUpcLc {
271263
const auto chi2PCA = candidate.chi2PCA();
272264
const auto cpa = candidate.cpa();
273265

274-
double outputBkg(-1), outputPrompt(-1), outputFD(-1);
266+
double outputBkg(-1);
275267

276268
auto fillTHnData = [&](bool isPKPi) {
277269
const auto massLc = isPKPi ? HfHelper::invMassLcToPKPi(candidate) : HfHelper::invMassLcToPiKP(candidate);
@@ -280,25 +272,23 @@ struct HfTaskUpcLc {
280272
const auto& mlProb = isPKPi ? candidate.mlProbLcToPKPi() : candidate.mlProbLcToPiKP();
281273
if (mlProb.size() == NumberOfMlClasses) {
282274
outputBkg = mlProb[MlClassBackground]; /// bkg score
283-
outputPrompt = mlProb[MlClassPrompt]; /// prompt score
284-
outputFD = mlProb[MlClassNonPrompt]; /// non-prompt score
285275
}
286276
/// Fill the ML outputScores and variables of candidate
287277
if (fillTreeOnlySingleGap) {
288278
if (gap == o2::aod::sgselector::TrueGap::SingleGapA || gap == o2::aod::sgselector::TrueGap::SingleGapC) {
289-
rowCandUpcBdt(massLc, pt, outputBkg, outputPrompt, outputFD, fitInfo.ampFV0A, fitInfo.ampFT0A, fitInfo.ampFT0C, zdcTimeZNA, zdcTimeZNC);
279+
rowCandUpcBdt(massLc, pt, outputBkg, fitInfo.ampFT0A, fitInfo.ampFT0C, zdcTimeZNA, zdcTimeZNC);
290280
}
291281
} else {
292-
rowCandUpcBdt(massLc, pt, outputBkg, outputPrompt, outputFD, fitInfo.ampFV0A, fitInfo.ampFT0A, fitInfo.ampFT0C, zdcTimeZNA, zdcTimeZNC);
282+
rowCandUpcBdt(massLc, pt, outputBkg, fitInfo.ampFT0A, fitInfo.ampFT0C, zdcTimeZNA, zdcTimeZNC);
293283
}
294284

295285
} else {
296286
if (fillTreeOnlySingleGap) {
297287
if (gap == o2::aod::sgselector::TrueGap::SingleGapA || gap == o2::aod::sgselector::TrueGap::SingleGapC) {
298-
rowCandUpc(massLc, pt, ptProng0, ptProng1, ptProng2, chi2PCA, decayLength, cpa, fitInfo.ampFV0A, fitInfo.ampFT0A, fitInfo.ampFT0C, zdcTimeZNA, zdcTimeZNC);
288+
rowCandUpc(massLc, pt, ptProng0, ptProng1, ptProng2, chi2PCA, decayLength, cpa, fitInfo.ampFT0A, fitInfo.ampFT0C, zdcTimeZNA, zdcTimeZNC);
299289
}
300290
} else {
301-
rowCandUpc(massLc, pt, ptProng0, ptProng1, ptProng2, chi2PCA, decayLength, cpa, fitInfo.ampFV0A, fitInfo.ampFT0A, fitInfo.ampFT0C, zdcTimeZNA, zdcTimeZNC);
291+
rowCandUpc(massLc, pt, ptProng0, ptProng1, ptProng2, chi2PCA, decayLength, cpa, fitInfo.ampFT0A, fitInfo.ampFT0C, zdcTimeZNA, zdcTimeZNC);
302292
}
303293
}
304294
};

0 commit comments

Comments
 (0)