Skip to content

Commit 426c197

Browse files
committed
Simplify UPC Lc TTree output
1 parent a976d7f commit 426c197

1 file changed

Lines changed: 9 additions & 17 deletions

File tree

PWGHF/D2H/Tasks/taskUpcLc.cxx

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -71,18 +71,15 @@ namespace full
7171
DECLARE_SOA_COLUMN(M, m, float);
7272
DECLARE_SOA_COLUMN(Pt, pt, float);
7373
DECLARE_SOA_COLUMN(BkgScore, bkgScore, float);
74-
DECLARE_SOA_COLUMN(PromptScore, promptScore, float);
75-
DECLARE_SOA_COLUMN(FdScore, fdScore, float);
7674
DECLARE_SOA_COLUMN(PtProng0, ptProng0, float);
7775
DECLARE_SOA_COLUMN(PtProng1, ptProng1, float);
7876
DECLARE_SOA_COLUMN(PtProng2, ptProng2, float);
7977
DECLARE_SOA_COLUMN(Chi2PCA, chi2PCA, float);
8078
DECLARE_SOA_COLUMN(DecayLength, decayLength, float);
8179
DECLARE_SOA_COLUMN(Cpa, cpa, float);
82-
DECLARE_SOA_COLUMN(PvContributors, pvContributors, float);
83-
DECLARE_SOA_COLUMN(Multiplicity, multiplicity, float);
80+
DECLARE_SOA_COLUMN(PvContributors, pvContributors, int);
81+
DECLARE_SOA_COLUMN(Multiplicity, multiplicity, int);
8482
DECLARE_SOA_COLUMN(Vtz, vtz, float);
85-
DECLARE_SOA_COLUMN(AmpFV0A, ampFV0A, float);
8683
DECLARE_SOA_COLUMN(AmpFT0A, ampFT0A, float);
8784
DECLARE_SOA_COLUMN(AmpFT0C, ampFT0C, float);
8885
DECLARE_SOA_COLUMN(ZdcTimeZNA, zdcTimeZNA, float);
@@ -92,7 +89,6 @@ DECLARE_SOA_TABLE(HfUpcQa, "AOD", "HFUPCQA",
9289
full::PvContributors,
9390
full::Multiplicity,
9491
full::Vtz,
95-
full::AmpFV0A,
9692
full::AmpFT0A,
9793
full::AmpFT0C,
9894
full::ZdcTimeZNA,
@@ -102,9 +98,6 @@ DECLARE_SOA_TABLE(HfUpcLcBdtInfos, "AOD", "HFUPCLCBDTINFOS",
10298
full::M,
10399
full::Pt,
104100
full::BkgScore,
105-
full::PromptScore,
106-
full::FdScore,
107-
full::AmpFV0A,
108101
full::AmpFT0A,
109102
full::AmpFT0C,
110103
full::ZdcTimeZNA,
@@ -119,7 +112,6 @@ DECLARE_SOA_TABLE(HfUpcLcInfos, "AOD", "HFUPCLCINFOS",
119112
full::Chi2PCA,
120113
full::DecayLength,
121114
full::Cpa,
122-
full::AmpFV0A,
123115
full::AmpFT0A,
124116
full::AmpFT0C,
125117
full::ZdcTimeZNA,
@@ -256,9 +248,9 @@ struct HfTaskUpcLc {
256248
if (gap == o2::aod::sgselector::TrueGap::SingleGapA || gap == o2::aod::sgselector::TrueGap::SingleGapC) {
257249
registry.fill(HIST("Data/hUpcMulti"), collision.multNTracksPV());
258250
registry.fill(HIST("Data/hUpcVtz"), collision.posZ());
259-
}
260-
if (fillTreeUpcQa) {
261-
rowUpcQa(numPvContributors, collision.multNTracksPV(), collision.posZ(), fitInfo.ampFV0A, fitInfo.ampFT0A, fitInfo.ampFT0C, zdcTimeZNA, zdcTimeZNC);
251+
if (fillTreeUpcQa) {
252+
rowUpcQa(numPvContributors, collision.multNTracksPV(), collision.posZ(), fitInfo.ampFT0A, fitInfo.ampFT0C, zdcTimeZNA, zdcTimeZNC);
253+
}
262254
}
263255

264256
for (const auto& candidate : groupedLcCandidates) {
@@ -291,19 +283,19 @@ struct HfTaskUpcLc {
291283
/// Fill the ML outputScores and variables of candidate
292284
if (fillTreeOnlySingleGap) {
293285
if (gap == o2::aod::sgselector::TrueGap::SingleGapA || gap == o2::aod::sgselector::TrueGap::SingleGapC) {
294-
rowCandUpcBdt(massLc, pt, outputBkg, outputPrompt, outputFD, fitInfo.ampFV0A, fitInfo.ampFT0A, fitInfo.ampFT0C, zdcTimeZNA, zdcTimeZNC);
286+
rowCandUpcBdt(massLc, pt, outputBkg, fitInfo.ampFT0A, fitInfo.ampFT0C, zdcTimeZNA, zdcTimeZNC);
295287
}
296288
} else {
297-
rowCandUpcBdt(massLc, pt, outputBkg, outputPrompt, outputFD, fitInfo.ampFV0A, fitInfo.ampFT0A, fitInfo.ampFT0C, zdcTimeZNA, zdcTimeZNC);
289+
rowCandUpcBdt(massLc, pt, outputBkg, fitInfo.ampFT0A, fitInfo.ampFT0C, zdcTimeZNA, zdcTimeZNC);
298290
}
299291

300292
} else {
301293
if (fillTreeOnlySingleGap) {
302294
if (gap == o2::aod::sgselector::TrueGap::SingleGapA || gap == o2::aod::sgselector::TrueGap::SingleGapC) {
303-
rowCandUpc(massLc, pt, ptProng0, ptProng1, ptProng2, chi2PCA, decayLength, cpa, fitInfo.ampFV0A, fitInfo.ampFT0A, fitInfo.ampFT0C, zdcTimeZNA, zdcTimeZNC);
295+
rowCandUpc(massLc, pt, ptProng0, ptProng1, ptProng2, chi2PCA, decayLength, cpa, fitInfo.ampFT0A, fitInfo.ampFT0C, zdcTimeZNA, zdcTimeZNC);
304296
}
305297
} else {
306-
rowCandUpc(massLc, pt, ptProng0, ptProng1, ptProng2, chi2PCA, decayLength, cpa, fitInfo.ampFV0A, fitInfo.ampFT0A, fitInfo.ampFT0C, zdcTimeZNA, zdcTimeZNC);
298+
rowCandUpc(massLc, pt, ptProng0, ptProng1, ptProng2, chi2PCA, decayLength, cpa, fitInfo.ampFT0A, fitInfo.ampFT0C, zdcTimeZNA, zdcTimeZNC);
307299
}
308300
}
309301
};

0 commit comments

Comments
 (0)