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
16 changes: 8 additions & 8 deletions PWGHF/HFC/DataModel/DMesonPairsTables.h
Original file line number Diff line number Diff line change
Expand Up @@ -118,14 +118,14 @@ DECLARE_SOA_COLUMN(TimestampD, timestampD, int64_t); //! Timestamp of the D meso
// Definition of the D meson table for D-had correlations. Contains the info needed at Data level.
#define DECLARE_DMESON_ME_TABLE(_cand_number_, _marker_value_, _description_) \
DECLARE_SOA_TABLE(_cand_number_, "AOD", _description_, o2::soa::Marker<_marker_value_>, \
hf_correlation_d_meson_had::PtD, \
hf_correlation_d_meson_had::EtaD, \
hf_correlation_d_meson_had::PhiD, \
hf_correlation_d_meson_had::MD, \
hf_correlation_d_meson_had::DType, \
hf_correlation_d_meson_had::PoolBinD, \
hf_correlation_d_meson_had::GIndexColD, \
hf_correlation_d_meson_had::TimestampD);
hf_correlation_d_meson_had::PtD, \
hf_correlation_d_meson_had::EtaD, \
hf_correlation_d_meson_had::PhiD, \
hf_correlation_d_meson_had::MD, \
hf_correlation_d_meson_had::DType, \
hf_correlation_d_meson_had::PoolBinD, \
hf_correlation_d_meson_had::GIndexColD, \
hf_correlation_d_meson_had::TimestampD);

DECLARE_DMESON_ME_TABLE(DMesonInfoCand1, 1, "DMESCAND1"); //! D0 cand 1 info for event mixing
DECLARE_DMESON_ME_TABLE(DMesonInfoCand2, 2, "DMESCAND2"); //! D0 cand 2 info for event mixing
Expand Down
4 changes: 2 additions & 2 deletions PWGHF/HFC/TableProducer/correlatorDMesonPairs.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -544,7 +544,7 @@ struct HfCorrelatorDMesonPairs {
static bool shouldSwapOrder(const bool isD1, const bool isDbar1, const bool isD2, const bool isDbar2, const T& candidate1, const T& candidate2)
{
if (isD1 != isD2 || isDbar1 != isDbar2) { // different flavour content
return !isD1 && isD2; // Dbar(-only) first, D second -> swap
return !isD1 && isD2; // Dbar(-only) first, D second -> swap
}
return candidate1.pt() < candidate2.pt();
}
Expand Down Expand Up @@ -937,7 +937,7 @@ struct HfCorrelatorDMesonPairs {
PROCESS_SWITCH(HfCorrelatorDMesonPairs, processMcRec, "Process MC reco mode", false);

/// D0(bar)-D0(bar) correlation pair builder - MC generator level (particles flagged as D0 -> pi K)
void processMcGen(aod::McCollision const&, soa::SmallGroups<soa::Join<aod::McCollisionLabels, aod::Collisions>> const& collisions, McParticlesPlus2Prong const& mcParticles)
void processMcGen(aod::McCollision const&, soa::SmallGroups<soa::Join<aod::McCollisionLabels, aod::Collisions>> const& collisions, McParticlesPlus2Prong const& mcParticles)
{
// Take the associated reconstructed collision with the highest number of PV contributors
int numPvContributorsGen{0};
Expand Down