Skip to content

Commit b5d6983

Browse files
vkuceravkucera
committed
Compiles
1 parent e8a4a3f commit b5d6983

12 files changed

+225
-243
lines changed

‎PWGHF/D2H/Tasks/taskOmegac0ToOmegapi.cxx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -276,10 +276,10 @@ struct HfTaskOmegac0ToOmegapi {
276276
auto numPvContributors = candidate.template collision_as<CollType>().numContrib();
277277

278278
if constexpr (applyMl) {
279-
registry.fill(HIST("hBdtScoreVsMassVsPtVsPtBVsYVsOriginVsOmegac0Type"), candidate.mlProbOmegac()[0], candidate.invMassCharmBaryon(), candidate.ptCharmBaryon(), candidate.kfRapOmegac(), candidate.ptBhadMotherPart(), candidate.originRec(), candidate.flagMcMatchRec(), numPvContributors);
279+
registry.fill(HIST("hBdtScoreVsMassVsPtVsPtBVsYVsOriginVsOmegac0Type"), candidate.mlProbOmegac()[0], candidate.invMassCharmBaryon(), candidate.ptCharmBaryon(), candidate.kfRapOmegac(), candidate.ptBhadMotherPart(), candidate.originMcRec(), candidate.flagMcMatchRec(), numPvContributors);
280280

281281
} else {
282-
registry.fill(HIST("hMassVsPtVsPtBVsYVsOriginVsOmegac0Type"), candidate.invMassCharmBaryon(), candidate.ptCharmBaryon(), candidate.kfRapOmegac(), candidate.ptBhadMotherPart(), candidate.originRec(), candidate.flagMcMatchRec(), numPvContributors);
282+
registry.fill(HIST("hMassVsPtVsPtBVsYVsOriginVsOmegac0Type"), candidate.invMassCharmBaryon(), candidate.ptCharmBaryon(), candidate.kfRapOmegac(), candidate.ptBhadMotherPart(), candidate.originMcRec(), candidate.flagMcMatchRec(), numPvContributors);
283283
}
284284
}
285285

@@ -298,7 +298,7 @@ struct HfTaskOmegac0ToOmegapi {
298298
maxNumContrib = recCol.numContrib() > maxNumContrib ? recCol.numContrib() : maxNumContrib;
299299
}
300300

301-
if (particle.originGen() == RecoDecay::OriginType::Prompt) {
301+
if (particle.originMcGen() == RecoDecay::OriginType::Prompt) {
302302
registry.fill(HIST("hSparseAcc"), ptGen, -1., yGen, RecoDecay::OriginType::Prompt, maxNumContrib);
303303
} else {
304304
float ptGenB = mcParticles.rawIteratorAt(particle.idxBhadMotherPart()).pt();

‎PWGHF/D2H/Tasks/taskXic0ToXiPi.cxx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ struct HfTaskXic0ToXiPi {
243243
kfptXic,
244244
candidate.kfRapXic(),
245245
candidate.ptBhadMotherPart(),
246-
candidate.originRec(),
246+
candidate.originMcRec(),
247247
candidate.flagMcMatchRec(),
248248
numPvContributors);
249249
} else {
@@ -252,7 +252,7 @@ struct HfTaskXic0ToXiPi {
252252
kfptXic,
253253
candidate.kfRapXic(),
254254
candidate.ptBhadMotherPart(),
255-
candidate.originRec(),
255+
candidate.originMcRec(),
256256
candidate.flagMcMatchRec(),
257257
numPvContributors);
258258
}
@@ -273,7 +273,7 @@ struct HfTaskXic0ToXiPi {
273273
maxNumContrib = recCol.numContrib() > maxNumContrib ? recCol.numContrib() : maxNumContrib;
274274
}
275275

276-
if (particle.originGen() == RecoDecay::OriginType::Prompt) {
276+
if (particle.originMcGen() == RecoDecay::OriginType::Prompt) {
277277
registry.fill(HIST("hSparseAcc"),
278278
ptGen,
279279
-1.,

‎PWGHF/DataModel/CandidateReconstructionTables.h‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1567,8 +1567,8 @@ DECLARE_SOA_COLUMN(CollisionMatched, collisionMatched, bool);
15671567
DECLARE_SOA_COLUMN(DebugGenCharmBar, debugGenCharmBar, int8_t);
15681568
DECLARE_SOA_COLUMN(DebugGenCasc, debugGenCasc, int8_t);
15691569
DECLARE_SOA_COLUMN(DebugGenLambda, debugGenLambda, int8_t);
1570-
DECLARE_SOA_COLUMN(OriginRec, originRec, int8_t);
1571-
DECLARE_SOA_COLUMN(OriginGen, originGen, int8_t);
1570+
DECLARE_SOA_COLUMN(OriginMcRec, originMcRec, int8_t);
1571+
DECLARE_SOA_COLUMN(OriginMcGen, originMcGen, int8_t);
15721572
DECLARE_SOA_COLUMN(PtCharmBaryonGen, ptCharmBaryonGen, float);
15731573
DECLARE_SOA_COLUMN(RapidityCharmBaryonGen, rapidityCharmBaryonGen, float);
15741574

@@ -1791,31 +1791,31 @@ DECLARE_SOA_TABLE(HfCandToXiPiKfQa, "AOD", "HFCANDTOXIPIKFQA",
17911791
DECLARE_SOA_TABLE(HfXicToXiPiMCRec, "AOD", "HFXICXIPIMCREC", //!
17921792
hf_cand_xic0_omegac0::FlagMcMatchRec,
17931793
hf_cand_xic0_omegac0::DebugMcRec,
1794-
hf_cand_xic0_omegac0::OriginRec,
1794+
hf_cand_xic0_omegac0::OriginMcRec,
17951795
hf_cand_xic0_omegac0::CollisionMatched,
17961796
hf_cand::PtBhadMotherPart,
17971797
hf_cand::PdgBhadMotherPart,
17981798
o2::soa::Marker<1>);
17991799
DECLARE_SOA_TABLE(HfOmegacToXiPiMCRec, "AOD", "HFOMCXIPIMCREC", //!
18001800
hf_cand_xic0_omegac0::FlagMcMatchRec,
18011801
hf_cand_xic0_omegac0::DebugMcRec,
1802-
hf_cand_xic0_omegac0::OriginRec,
1802+
hf_cand_xic0_omegac0::OriginMcRec,
18031803
hf_cand_xic0_omegac0::CollisionMatched,
18041804
hf_cand::PtBhadMotherPart,
18051805
hf_cand::PdgBhadMotherPart,
18061806
o2::soa::Marker<2>);
18071807
DECLARE_SOA_TABLE(HfToOmegaPiMCRec, "AOD", "HFTOOMEPIMCREC", //!
18081808
hf_cand_xic0_omegac0::FlagMcMatchRec,
18091809
hf_cand_xic0_omegac0::DebugMcRec,
1810-
hf_cand_xic0_omegac0::OriginRec,
1810+
hf_cand_xic0_omegac0::OriginMcRec,
18111811
hf_cand_xic0_omegac0::CollisionMatched,
18121812
hf_cand::PtBhadMotherPart,
18131813
hf_cand::PdgBhadMotherPart,
18141814
o2::soa::Marker<3>);
18151815
DECLARE_SOA_TABLE(HfToOmegaKMCRec, "AOD", "HFTOOMEKMCREC", //!
18161816
hf_cand_xic0_omegac0::FlagMcMatchRec,
18171817
hf_cand_xic0_omegac0::DebugMcRec,
1818-
hf_cand_xic0_omegac0::OriginRec,
1818+
hf_cand_xic0_omegac0::OriginMcRec,
18191819
hf_cand_xic0_omegac0::CollisionMatched,
18201820
hf_cand::PtBhadMotherPart,
18211821
hf_cand::PdgBhadMotherPart,
@@ -1824,16 +1824,16 @@ DECLARE_SOA_TABLE(HfToOmegaKMCRec, "AOD", "HFTOOMEKMCREC", //!
18241824
// table with results of generator level MC matching
18251825
DECLARE_SOA_TABLE(HfXicToXiPiMCGen, "AOD", "HFXICXIPIMCGEN", //!
18261826
hf_cand_xic0_omegac0::FlagMcMatchGen, hf_cand_xic0_omegac0::DebugGenCharmBar, hf_cand_xic0_omegac0::DebugGenCasc, hf_cand_xic0_omegac0::DebugGenLambda,
1827-
hf_cand_xic0_omegac0::PtCharmBaryonGen, hf_cand_xic0_omegac0::RapidityCharmBaryonGen, hf_cand_xic0_omegac0::OriginGen, hf_cand::IdxBhadMotherPart, o2::soa::Marker<1>);
1827+
hf_cand_xic0_omegac0::PtCharmBaryonGen, hf_cand_xic0_omegac0::RapidityCharmBaryonGen, hf_cand_xic0_omegac0::OriginMcGen, hf_cand::IdxBhadMotherPart, o2::soa::Marker<1>);
18281828
DECLARE_SOA_TABLE(HfOmegacToXiPiMCGen, "AOD", "HFOMECXIPIMCGEN", //!
18291829
hf_cand_xic0_omegac0::FlagMcMatchGen, hf_cand_xic0_omegac0::DebugGenCharmBar, hf_cand_xic0_omegac0::DebugGenCasc, hf_cand_xic0_omegac0::DebugGenLambda,
1830-
hf_cand_xic0_omegac0::PtCharmBaryonGen, hf_cand_xic0_omegac0::RapidityCharmBaryonGen, hf_cand_xic0_omegac0::OriginGen, hf_cand::IdxBhadMotherPart, o2::soa::Marker<2>);
1830+
hf_cand_xic0_omegac0::PtCharmBaryonGen, hf_cand_xic0_omegac0::RapidityCharmBaryonGen, hf_cand_xic0_omegac0::OriginMcGen, hf_cand::IdxBhadMotherPart, o2::soa::Marker<2>);
18311831
DECLARE_SOA_TABLE(HfToOmegaPiMCGen, "AOD", "HFTOOMEPIMCGEN", //!
18321832
hf_cand_xic0_omegac0::FlagMcMatchGen, hf_cand_xic0_omegac0::DebugGenCharmBar, hf_cand_xic0_omegac0::DebugGenCasc, hf_cand_xic0_omegac0::DebugGenLambda,
1833-
hf_cand_xic0_omegac0::PtCharmBaryonGen, hf_cand_xic0_omegac0::RapidityCharmBaryonGen, hf_cand_xic0_omegac0::OriginGen, hf_cand::IdxBhadMotherPart, o2::soa::Marker<3>);
1833+
hf_cand_xic0_omegac0::PtCharmBaryonGen, hf_cand_xic0_omegac0::RapidityCharmBaryonGen, hf_cand_xic0_omegac0::OriginMcGen, hf_cand::IdxBhadMotherPart, o2::soa::Marker<3>);
18341834
DECLARE_SOA_TABLE(HfToOmegaKMCGen, "AOD", "HFTOOMEKMCGEN", //!
18351835
hf_cand_xic0_omegac0::FlagMcMatchGen, hf_cand_xic0_omegac0::DebugGenCharmBar, hf_cand_xic0_omegac0::DebugGenCasc, hf_cand_xic0_omegac0::DebugGenLambda,
1836-
hf_cand_xic0_omegac0::PtCharmBaryonGen, hf_cand_xic0_omegac0::RapidityCharmBaryonGen, hf_cand_xic0_omegac0::OriginGen, hf_cand::IdxBhadMotherPart, o2::soa::Marker<4>);
1836+
hf_cand_xic0_omegac0::PtCharmBaryonGen, hf_cand_xic0_omegac0::RapidityCharmBaryonGen, hf_cand_xic0_omegac0::OriginMcGen, hf_cand::IdxBhadMotherPart, o2::soa::Marker<4>);
18371837

18381838
// specific Xic to Xi Pi Pi candidate properties
18391839
namespace hf_cand_xic_to_xi_pi_pi
@@ -1901,8 +1901,8 @@ DECLARE_SOA_COLUMN(NSigTofPrFromLambda, nSigTofPrFromLambda, float);
19011901
// MC matching result:
19021902
DECLARE_SOA_COLUMN(FlagMcMatchRec, flagMcMatchRec, int8_t); // reconstruction level
19031903
DECLARE_SOA_COLUMN(FlagMcMatchGen, flagMcMatchGen, int8_t); // generator level
1904-
DECLARE_SOA_COLUMN(OriginRec, originRec, int8_t);
1905-
DECLARE_SOA_COLUMN(OriginGen, originGen, int8_t);
1904+
DECLARE_SOA_COLUMN(OriginMcRec, originMcRec, int8_t);
1905+
DECLARE_SOA_COLUMN(OriginMcGen, originMcGen, int8_t);
19061906
// Residuals and pulls
19071907
DECLARE_SOA_COLUMN(PtResidual, ptResidual, float);
19081908
DECLARE_SOA_COLUMN(PResidual, pResidual, float);
@@ -2004,17 +2004,17 @@ DECLARE_SOA_TABLE(HfCandXicKF, "AOD", "HFCANDXICKF",
20042004
// table with results of reconstruction level MC matching
20052005
DECLARE_SOA_TABLE(HfCandXicMcRec, "AOD", "HFCANDXICMCREC",
20062006
hf_cand_xic_to_xi_pi_pi::FlagMcMatchRec,
2007-
hf_cand_xic_to_xi_pi_pi::OriginRec);
2007+
hf_cand_xic_to_xi_pi_pi::OriginMcRec);
20082008

20092009
// table with results of generator level MC matching
20102010
DECLARE_SOA_TABLE(HfCandXicMcGen, "AOD", "HFCANDXICMCGEN",
20112011
hf_cand_xic_to_xi_pi_pi::FlagMcMatchGen,
2012-
hf_cand_xic_to_xi_pi_pi::OriginGen,
2012+
hf_cand_xic_to_xi_pi_pi::OriginMcGen,
20132013
hf_cand::PdgBhadMotherPart);
20142014

20152015
// table with residuals and pulls of PV
20162016
DECLARE_SOA_TABLE(HfCandXicResid, "AOD", "HFCANDXICRESID",
2017-
hf_cand_xic_to_xi_pi_pi::OriginGen,
2017+
hf_cand_xic_to_xi_pi_pi::OriginMcGen,
20182018
hf_cand_xic_to_xi_pi_pi::PResidual,
20192019
hf_cand_xic_to_xi_pi_pi::PtResidual,
20202020
hf_cand_xic_to_xi_pi_pi::XPvResidual,

0 commit comments

Comments
 (0)