Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions PWGHF/DataModel/DerivedTables.h
Original file line number Diff line number Diff line change
Expand Up @@ -579,9 +579,9 @@ DECLARE_SOA_TABLE_STAGED(HfBplusMcs, "HFBPMC", //! Table with MC candidate info
// MC particle columns
namespace hf_mc_particle
{
DECLARE_SOA_INDEX_COLUMN(McCollision, mcCollision); //! MC collision of this particle
DECLARE_SOA_INDEX_COLUMN(McParticle, mcParticle); //! MC particle
DECLARE_SOA_INDEX_COLUMN(HfMcCollBase, hfMcCollBase); //! collision index pointing to the derived MC collision table for B+ candidates
DECLARE_SOA_INDEX_COLUMN(McCollision, mcCollision); //! MC collision of this particle
DECLARE_SOA_INDEX_COLUMN(McParticle, mcParticle); //! MC particle
DECLARE_SOA_INDEX_COLUMN(HfMcCollBase, hfMcCollBase); //! collision index pointing to the derived MC collision table for B+ candidates
DECLARE_SOA_COLUMN(FlagMcMatchGen, flagMcMatchGen, int8_t); //! flag for generator level matching
DECLARE_SOA_COLUMN(OriginMcGen, originMcGen, int8_t); //! particle origin, generator level
DECLARE_SOA_COLUMN(FlagMcDecayChanGen, flagMcDecayChanGen, int8_t); //! resonant decay channel flag, generator level
Expand Down
1 change: 0 additions & 1 deletion PWGHF/TableProducer/derivedDataCreatorBplusToD0Pi.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,6 @@ struct HfDerivedDataCreatorBplusToD0Pi {
rowsCommon.init(confDerData);
}


template <typename T, typename U, typename V>
void fillTablesCandidate(const T& candidate, const U& prongCharm, const V& prongBachelor, int candFlag, double invMass,
double ct, double y, int8_t flagMc, int8_t origin, float mlScore, const std::vector<float>& mlScoresCharm)
Expand Down
15 changes: 10 additions & 5 deletions PWGHF/Utils/utilsDerivedData.h
Original file line number Diff line number Diff line change
Expand Up @@ -79,30 +79,35 @@ struct ProducesHfDerivedData : o2::framework::ProducesGroup {
std::map<int, std::vector<int>> matchedCollisions; // indices of derived reconstructed collisions matched to the global indices of MC collisions
std::map<int, bool> hasMcParticles; // flags for MC collisions with HF particles

void init(ConfigurableHfDerivedData const& c) {
void init(ConfigurableHfDerivedData const& c)
{
conf = &c;
}

template <typename T>
void reserveTablesCandidates(T size) {
void reserveTablesCandidates(T size)
{
o2::analysis::hf_derived::reserveTable(rowCandidateBase, conf->fillCandidateBase, size);
}

template <typename T>
void reserveTablesColl(T size) {
void reserveTablesColl(T size)
{
o2::analysis::hf_derived::reserveTable(rowCollBase, conf->fillCollBase, size);
o2::analysis::hf_derived::reserveTable(rowCollId, conf->fillCollId, size);
}

template <typename T>
void reserveTablesMcColl(T size) {
void reserveTablesMcColl(T size)
{
o2::analysis::hf_derived::reserveTable(rowMcCollBase, conf->fillMcCollBase, size);
o2::analysis::hf_derived::reserveTable(rowMcCollId, conf->fillMcCollId, size);
o2::analysis::hf_derived::reserveTable(rowMcRCollId, conf->fillMcRCollId, size);
}

template <typename T>
void reserveTablesParticles(T size) {
void reserveTablesParticles(T size)
{
o2::analysis::hf_derived::reserveTable(rowParticleBase, conf->fillParticleBase, size);
o2::analysis::hf_derived::reserveTable(rowParticleId, conf->fillParticleId, size);
}
Expand Down