Skip to content

Commit d87a246

Browse files
MarcellocostiMarcellocosti
committed
Restore unwanted changes
1 parent 3148b35 commit d87a246

4 files changed

Lines changed: 26 additions & 49 deletions

File tree

‎ALICE3/DataModel/A3DecayFinderTables.h‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -202,11 +202,6 @@ DECLARE_SOA_DYNAMIC_COLUMN(ImpactParameterXY, impactParameterXY, //!
202202
DECLARE_SOA_COLUMN(MlScore0, mlScore0, float); //!
203203
DECLARE_SOA_COLUMN(MlScore1, mlScore1, float); //!
204204
DECLARE_SOA_COLUMN(MlScore2, mlScore2, float); //!
205-
206-
// Secondary vertex gen-reco position
207-
DECLARE_SOA_COLUMN(DeltaXSecVtx, deltaXSecVtx, float); //!
208-
DECLARE_SOA_COLUMN(DeltaYSecVtx, deltaYSecVtx, float); //!
209-
DECLARE_SOA_COLUMN(DeltaZSecVtx, deltaZSecVtx, float); //!
210205
} // namespace a3_hf_cand
211206

212207
#define HFCAND_COLUMNS \
@@ -240,11 +235,6 @@ DECLARE_SOA_COLUMN(DeltaZSecVtx, deltaZSecVtx, float); //!
240235
a3_hf_cand::Pt2Prong2<a3_hf_cand::PxProng2, a3_hf_cand::PyProng2>, \
241236
a3_hf_cand::PVectorProng2<a3_hf_cand::PxProng2, a3_hf_cand::PyProng2, a3_hf_cand::PzProng2>
242237

243-
DECLARE_SOA_TABLE(Alice3SVResos, "AOD", "ALICE3SVRESO", //!
244-
a3_hf_cand::DeltaXSecVtx,
245-
a3_hf_cand::DeltaYSecVtx,
246-
a3_hf_cand::DeltaZSecVtx);
247-
248238
namespace a3DecayMap
249239
{
250240
DECLARE_SOA_COLUMN(DecayMap, decayMap, uint32_t); //! simple map to process passing / not passing criteria

‎ALICE3/TableProducer/alice3-decayfinder.cxx‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ struct alice3decayFinder {
7979
Produces<aod::Alice3McRecFlags> mcRecFlags; // contains MC truth info (is true Lc, or bkg)
8080
Produces<aod::Alice3PidLcs> pidInfoLcDaugs; // contains PID info for Lc candidates
8181
Produces<aod::Alice3McGenFlags> mcGenFlags; // contains MC gen info for 3-prong candidates
82-
Produces<aod::Alice3SVResos> coordsSVResos; // contains MC gen and reco coordinates of the secondary vertex info for 3-prong candidates
8382

8483
// Vertexing
8584
struct : ConfigurableGroup {
@@ -232,7 +231,6 @@ struct alice3decayFinder {
232231
std::array<float, 3> Pdaug2; // pion track
233232
std::array<float, 3> primaryVertex; // primary vertex coordinates
234233
std::array<double, 3> secondaryVertex; // secondary vertex coordinates
235-
std::array<double, 3> deltaRecoGenSV; // difference between reconstructed and generated secondary vertex coordinates
236234
float impactParameterY0; // impact parameters
237235
float errorImpactParameterY0; // impact parameters error
238236
float impactParameterY1; // impact parameters
@@ -436,9 +434,6 @@ struct alice3decayFinder {
436434
mCandidate3Prong.origin = 0; // Default: unknown origin
437435
if (mCandidate3Prong.particleMcRec > -1) {
438436
const auto& motherParticle = mcParticles.rawIteratorAt(mCandidate3Prong.particleMcRec);
439-
mCandidate3Prong.deltaRecoGenSV[0] = mCandidate3Prong.secondaryVertex[0] - motherParticle.vx();
440-
mCandidate3Prong.deltaRecoGenSV[1] = mCandidate3Prong.secondaryVertex[1] - motherParticle.vy();
441-
mCandidate3Prong.deltaRecoGenSV[2] = mCandidate3Prong.secondaryVertex[2] - motherParticle.vz();
442437
mCandidate3Prong.flagMc = motherParticle.pdgCode() > 0 ? charmHadFlag : -charmHadFlag; // Particle
443438
std::vector<int> idxBhadMothers{};
444439
mCandidate3Prong.origin = RecoDecay::getCharmHadronOrigin(mcParticles, motherParticle, false, &idxBhadMothers);
@@ -1059,9 +1054,8 @@ struct alice3decayFinder {
10591054
std::sqrt(mCandidate3Prong.errorImpactParameterZ1),
10601055
std::sqrt(mCandidate3Prong.errorImpactParameterZ2),
10611056
candPx, candPy, candPz);
1062-
mcRecFlags(mCandidate3Prong.origin, mCandidate3Prong.ptBMotherRec, mCandidate3Prong.flagMc, mCandidate3Prong.particleMcRec);
1057+
mcRecFlags(mCandidate3Prong.origin, mCandidate3Prong.ptBMotherRec, mCandidate3Prong.flagMc, mCandidate3Prong.particleMcRec); // placeholder for prompt/non-prompt
10631058
fillPidTable(prong0, prong1, prong2);
1064-
coordsSVResos(mCandidate3Prong.deltaRecoGenSV[0], mCandidate3Prong.deltaRecoGenSV[1], mCandidate3Prong.deltaRecoGenSV[2]);
10651059
}
10661060
}
10671061
}

‎ALICE3/Tasks/alice3HfTask3Prong.cxx‎

Lines changed: 16 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ struct Alice3HfTask3Prong {
6464

6565
int selectedPdg{-1};
6666

67-
using Cands3PReco = soa::Filtered<soa::Join<aod::Alice3Cand3Ps, aod::Alice3Sel3Ps, aod::Alice3McRecFlags, aod::Alice3SVResos>>;
68-
using Cands3PRecoWMl = soa::Filtered<soa::Join<aod::Alice3Cand3Ps, aod::Alice3Sel3Ps, aod::Alice3Ml3Ps, aod::Alice3McRecFlags, aod::Alice3SVResos>>;
67+
using Cands3PReco = soa::Filtered<soa::Join<aod::Alice3Cand3Ps, aod::Alice3Sel3Ps, aod::Alice3McRecFlags>>;
68+
using Cands3PRecoWMl = soa::Filtered<soa::Join<aod::Alice3Cand3Ps, aod::Alice3Sel3Ps, aod::Alice3Ml3Ps, aod::Alice3McRecFlags>>;
6969
using Cands3PGen = soa::Join<aod::McParticles, aod::Alice3McGenFlags>;
7070

7171
Filter filterSelectCandidates = (aod::a3_hf_sel_3prong::isSelMassHypo0 == true || aod::a3_hf_sel_3prong::isSelMassHypo1 == true);
@@ -79,7 +79,6 @@ struct Alice3HfTask3Prong {
7979
ConfigurableAxis thnConfigAxisCanType{"thnConfigAxisCanType", {5, 0., 5.}, ""};
8080
ConfigurableAxis thnAxisRapidity{"thnAxisRapidity", {20, -1, 1}, "Cand. rapidity bins"};
8181
ConfigurableAxis thnConfigAxisGenPtB{"thnConfigAxisGenPtB", {1000, 0, 100}, "Gen Pt B"};
82-
ConfigurableAxis thnConfigAxisDeltaSecVtxCoord{"thnConfigAxisDeltaSecVtxCoord", {1000, -10, 10}, ""};
8382

8483
HistogramRegistry registry{"registry", {}};
8584

@@ -143,9 +142,6 @@ struct Alice3HfTask3Prong {
143142
addHistogramsRec("hCPAxy", "cosine of pointing angle xy", "entries", {HistType::kTH1F, {{110, -1.1, 1.1}}});
144143
addHistogramsRec("hDca2", "prong Chi2PCA to sec. vertex (cm)", "entries", {HistType::kTH1F, {{400, 0., 20.}}});
145144
addHistogramsRec("hEta", "#it{#eta}", "entries", {HistType::kTH1F, {{100, -2., 2.}}});
146-
addHistogramsRec("hDeltaXRecoGenSecVtx", "p_{T} (GeV/#it{c})", "#Delta X Sec. Vtx. (cm)", {HistType::kTH2F, {thnConfigAxisPt, thnConfigAxisDeltaSecVtxCoord}});
147-
addHistogramsRec("hDeltaYRecoGenSecVtx", "p_{T} (GeV/#it{c})", "#Delta Y Sec. Vtx. (cm)", {HistType::kTH2F, {thnConfigAxisPt, thnConfigAxisDeltaSecVtxCoord}});
148-
addHistogramsRec("hDeltaZRecoGenSecVtx", "p_{T} (GeV/#it{c})", "#Delta Z Sec. Vtx. (cm)", {HistType::kTH2F, {thnConfigAxisPt, thnConfigAxisDeltaSecVtxCoord}});
149145
addHistogramsRec("hd0VsPtProng0", "prong 0 DCAxy to prim. vertex (cm)", "#it{p}_{T} (GeV/#it{c})", {HistType::kTH2F, {{600, -0.4, 0.4}, {vbins}}});
150146
addHistogramsRec("hd0VsPtProng1", "prong 1 DCAxy to prim. vertex (cm)", "#it{p}_{T} (GeV/#it{c})", {HistType::kTH2F, {{600, -0.4, 0.4}, {vbins}}});
151147
addHistogramsRec("hd0VsPtProng2", "prong 2 DCAxy to prim. vertex (cm)", "#it{p}_{T} (GeV/#it{c})", {HistType::kTH2F, {{600, -0.4, 0.4}, {vbins}}});
@@ -261,18 +257,15 @@ struct Alice3HfTask3Prong {
261257
registry.fill(histoPrefix + HIST("hImpParErrProng1VsPt") + histoSuffix, candidate.errorImpactParameterY1(), candidate.pt());
262258
registry.fill(histoPrefix + HIST("hImpParErrProng2VsPt") + histoSuffix, candidate.errorImpactParameterY2(), candidate.pt());
263259
registry.fill(histoPrefix + HIST("hDecLenErrVsPt") + histoSuffix, candidate.errorDecayLength(), candidate.pt());
264-
registry.fill(histoPrefix + HIST("hDeltaXRecoGenSecVtx") + histoSuffix, candidate.pt(), candidate.deltaXSecVtx());
265-
registry.fill(histoPrefix + HIST("hDeltaYRecoGenSecVtx") + histoSuffix, candidate.pt(), candidate.deltaYSecVtx());
266-
registry.fill(histoPrefix + HIST("hDeltaZRecoGenSecVtx") + histoSuffix, candidate.pt(), candidate.deltaZSecVtx());
267260
}
268261

269262
/// Fill MC histograms at reconstruction level
270263
/// \tparam CharmHad is the charm hadron species
271264
/// \tparam SaveMl indicates whether ML scores are saved in the THnSparse
272265
/// \tparam CandsRec is the type of the reconstructed candidates collection
273266
/// \param candidates is the collection of reconstructed candidates
274-
template <CharmHadAlice3 CharmHad, bool SaveMl, typename CandsRec, typename GenParticles>
275-
void fillHistosMcRec(CandsRec const& candidates, GenParticles const& genParticles)
267+
template <CharmHadAlice3 CharmHad, bool SaveMl, typename CandsRec, typename AllParticles>
268+
void fillHistosMcRec(CandsRec const& candidates, AllParticles const& allParticles)
276269
{
277270
registry.fill(HIST("MC/rec/hCandidateCounter"), 0.);
278271
for (const auto& candidate : candidates) {
@@ -284,13 +277,13 @@ struct Alice3HfTask3Prong {
284277
registry.fill(HIST("MC/rec/hCandidateCounter"), 2.);
285278
if (candidate.particleMcRec() >= 0) {
286279
registry.fill(HIST("MC/rec/hCandidateCounter"), 3.);
287-
auto mcParticle = genParticles.iteratorAt(candidate.particleMcRec());
280+
auto mcParticle = allParticles.iteratorAt(candidate.particleMcRec());
288281
if (mcParticle.has_daughters()) {
289282
auto daughters = mcParticle.daughtersIds();
290283
LOG(debug) << "Reco candidate matched to MC particle with PDG " << mcParticle.pdgCode() << " daughters: " << daughters.size();
291284
int prongIdx = 0;
292285
for (int dauId = daughters[0]; dauId <= daughters[1]; dauId++) {
293-
auto dau = genParticles.iteratorAt(dauId);
286+
auto dau = allParticles.iteratorAt(dauId);
294287
LOG(debug) << " dauId: " << dauId << " PDG: " << dau.pdgCode() << " with pT: " << dau.pt();
295288
switch (prongIdx) {
296289
case 0:
@@ -383,9 +376,9 @@ struct Alice3HfTask3Prong {
383376
/// \tparam ParticleType is the type of the generated particle
384377
/// \tparam TableType is the type of the full table (non-Partition)
385378
/// \param particle is a generated particle
386-
/// \param genParticles is the full table of particles for iteratorAt access
379+
/// \param allParticles is the full table of particles for iteratorAt access
387380
template <CharmHadAlice3 CharmHad, int SignalType, typename ParticleType, typename TableType>
388-
void fillHistogramsGen(ParticleType const& particle, TableType const& genParticles)
381+
void fillHistogramsGen(ParticleType const& particle, TableType const& allParticles)
389382
{
390383
LOG(debug) << "Filling generated histograms for signal type " << SignalType;
391384
static constexpr auto histoPrefix = HIST("MC/gen/") + HIST(SignalFolders[SignalType]) + HIST("/");
@@ -407,7 +400,7 @@ struct Alice3HfTask3Prong {
407400
float pz = 0.f;
408401
float e = 0.f;
409402
for (int iDau = firstDauIdx; iDau <= lastDauIdx && iDau > 0; iDau++) {
410-
const auto& dau = genParticles.iteratorAt(iDau);
403+
const auto& dau = allParticles.iteratorAt(iDau);
411404
e += dau.e();
412405
px += dau.px();
413406
py += dau.py();
@@ -422,11 +415,11 @@ struct Alice3HfTask3Prong {
422415
/// Fill MC histograms at generated level
423416
/// \tparam CharmHad is the charm hadron species
424417
/// \tparam CandsGen is the type of the generated candidates collection
425-
/// \tparam GenParticles is the type of the full particle table
418+
/// \tparam AllParticles is the type of the full particle table
426419
/// \param mcParticles is the collection of generated particles (can be a Partition)
427-
/// \param genParticles is the full table of particles
428-
template <CharmHadAlice3 CharmHad, typename CandsGen, typename GenParticles>
429-
void fillHistosMcGen(CandsGen const& mcParticles, GenParticles const& genParticles)
420+
/// \param allParticles is the full table of particles
421+
template <CharmHadAlice3 CharmHad, typename CandsGen, typename AllParticles>
422+
void fillHistosMcGen(CandsGen const& mcParticles, AllParticles const& allParticles)
430423
{
431424
// MC gen.
432425
for (const auto& particle : mcParticles) {
@@ -438,14 +431,14 @@ struct Alice3HfTask3Prong {
438431
const auto ptGen = particle.pt();
439432
const auto originType = particle.originMcGen();
440433

441-
fillHistogramsGen<CharmHad, Signal>(particle, genParticles);
434+
fillHistogramsGen<CharmHad, Signal>(particle, allParticles);
442435

443436
float ptGenB = -1.f;
444437
if (originType == RecoDecay::OriginType::Prompt) {
445-
fillHistogramsGen<CharmHad, Prompt>(particle, genParticles);
438+
fillHistogramsGen<CharmHad, Prompt>(particle, allParticles);
446439
} else if (particle.originMcGen() == RecoDecay::OriginType::NonPrompt) {
447440
ptGenB = particle.bHadMotherPtGen();
448-
fillHistogramsGen<CharmHad, NonPrompt>(particle, genParticles);
441+
fillHistogramsGen<CharmHad, NonPrompt>(particle, allParticles);
449442
}
450443

451444
if (fillThn) {

‎PWGJE/Tasks/CMakeLists.txt‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -188,10 +188,10 @@ if(FastJet_FOUND)
188188
SOURCES v0QA.cxx
189189
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore
190190
COMPONENT_NAME Analysis)
191-
# o2physics_add_dpl_workflow(jet-finder-charged-qa
192-
# SOURCES jetFinderQA.cxx
193-
# PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore
194-
# COMPONENT_NAME Analysis)
191+
o2physics_add_dpl_workflow(jet-finder-charged-qa
192+
SOURCES jetFinderQA.cxx
193+
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore
194+
COMPONENT_NAME Analysis)
195195
o2physics_add_dpl_workflow(jet-outlier-qa
196196
SOURCES jetOutlierQA.cxx
197197
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore
@@ -366,11 +366,11 @@ if(FastJet_FOUND)
366366
SOURCES dijetFinderQA.cxx
367367
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore
368368
COMPONENT_NAME Analysis)
369-
# o2physics_add_dpl_workflow(bjet-tagging-gnn
370-
# SOURCES bjetTaggingGnn.cxx
371-
# PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore O2Physics::EventFilteringUtils
372-
# O2Physics::AnalysisCCDB
373-
# COMPONENT_NAME Analysis)
369+
o2physics_add_dpl_workflow(bjet-tagging-gnn
370+
SOURCES bjetTaggingGnn.cxx
371+
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore O2Physics::EventFilteringUtils
372+
O2Physics::AnalysisCCDB
373+
COMPONENT_NAME Analysis)
374374
o2physics_add_dpl_workflow(jet-shape
375375
SOURCES jetShape.cxx
376376
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore

0 commit comments

Comments
 (0)