Skip to content

[PWGHF] Update HF event selection #18660

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DelloStritto wants to merge 1 commit into
base: master
Choose a base branch
from
+98 −76
Open

[PWGHF] Update HF event selection #18660

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 12 additions & 11 deletions PWGHF/D2H/TableProducer/dataCreatorCharmHadPiReduced.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,7 @@ struct HfDataCreatorCharmHadPiReduced {
using CollisionsWCentAndMcLabels = soa::Join<CollisionsWCent, aod::McCollisionLabels>;
using CollisionsWCentAndQvectors = soa::Join<CollisionsWCent, aod::QvectorFT0Cs, aod::QvectorFT0As, aod::QvectorFT0Ms, aod::QvectorTPCposs, aod::QvectorTPCnegs, aod::QvectorTPCalls>;
using BCsInfo = soa::Join<aod::BCsWithTimestamps, aod::BcSels>;
using McCollisionsWMult = soa::Join<aod::McCollisions, aod::MultsExtraMC>;

Filter filterSelectDplusCandidates = (aod::hf_sel_candidate_dplus::isSelDplusToPiKPi >= hfflagConfigurations.selectionFlagDplus);
Filter filterSelectDsCandidates = (aod::hf_sel_candidate_ds::isSelDsToKKPi >= hfflagConfigurations.selectionFlagDs || aod::hf_sel_candidate_ds::isSelDsToPiKK >= hfflagConfigurations.selectionFlagDs);
Expand Down Expand Up @@ -1570,7 +1571,7 @@ struct HfDataCreatorCharmHadPiReduced {
}

template <uint8_t DecayChannel>
void runMcGen(aod::McCollision const& mcCollision,
void runMcGen(McCollisionsWMult::iterator const& mcCollision,
aod::McParticles const& particlesMc,
CollisionsWCentAndMcLabels const& collisions,
BCsInfo const&)
Expand Down Expand Up @@ -2346,7 +2347,7 @@ struct HfDataCreatorCharmHadPiReduced {
TracksPidWithSelAndMc const& tracks,
aod::McParticles const& particlesMc,
BCsInfo const& bcs,
McCollisions const& mcCollisions)
McCollisionsWMult const& mcCollisions)
{
// store configurables needed for B0 workflow
if (!isHfCandBhadConfigFilled) {
Expand Down Expand Up @@ -2381,7 +2382,7 @@ struct HfDataCreatorCharmHadPiReduced {
TracksPidWithSelAndMc const& tracks,
aod::McParticles const& particlesMc,
BCsInfo const& bcs,
McCollisions const& mcCollisions)
McCollisionsWMult const& mcCollisions)
{
// store configurables needed for B0 workflow
if (!isHfCandBhadConfigFilled) {
Expand Down Expand Up @@ -2416,7 +2417,7 @@ struct HfDataCreatorCharmHadPiReduced {
TracksPidWithSelAndMc const& tracks,
aod::McParticles const& particlesMc,
BCsInfo const& bcs,
McCollisions const& mcCollisions,
McCollisionsWMult const& mcCollisions,
aod::Hf2Prongs const&)
{
// store configurables needed for B0 workflow
Expand Down Expand Up @@ -2452,7 +2453,7 @@ struct HfDataCreatorCharmHadPiReduced {
TracksPidWithSelAndMc const& tracks,
aod::McParticles const& particlesMc,
BCsInfo const& bcs,
McCollisions const& mcCollisions,
McCollisionsWMult const& mcCollisions,
aod::Hf2Prongs const&)
{
// store configurables needed for B0 workflow
Expand Down Expand Up @@ -2488,7 +2489,7 @@ struct HfDataCreatorCharmHadPiReduced {
TracksPidWithSelAndMc const& tracks,
aod::McParticles const& particlesMc,
BCsInfo const& bcs,
McCollisions const& mcCollisions)
McCollisionsWMult const& mcCollisions)
{
// store configurables needed for Bs workflow
if (!isHfCandBhadConfigFilled) {
Expand Down Expand Up @@ -2523,7 +2524,7 @@ struct HfDataCreatorCharmHadPiReduced {
TracksPidWithSelAndMc const& tracks,
aod::McParticles const& particlesMc,
BCsInfo const& bcs,
McCollisions const& mcCollisions)
McCollisionsWMult const& mcCollisions)
{
// store configurables needed for Bs workflow
if (!isHfCandBhadConfigFilled) {
Expand Down Expand Up @@ -2558,7 +2559,7 @@ struct HfDataCreatorCharmHadPiReduced {
TracksPidWithSelAndMc const& tracks,
aod::McParticles const& particlesMc,
BCsInfo const& bcs,
McCollisions const& mcCollisions)
McCollisionsWMult const& mcCollisions)
{
// store configurables needed for B+ workflow
if (!isHfCandBhadConfigFilled) {
Expand Down Expand Up @@ -2593,7 +2594,7 @@ struct HfDataCreatorCharmHadPiReduced {
TracksPidWithSelAndMc const& tracks,
aod::McParticles const& particlesMc,
BCsInfo const& bcs,
McCollisions const& mcCollisions)
McCollisionsWMult const& mcCollisions)
{
// store configurables needed for B+ workflow
if (!isHfCandBhadConfigFilled) {
Expand Down Expand Up @@ -2628,7 +2629,7 @@ struct HfDataCreatorCharmHadPiReduced {
TracksPidWithSelAndMc const& tracks,
aod::McParticles const& particlesMc,
BCsInfo const& bcs,
McCollisions const& mcCollisions)
McCollisionsWMult const& mcCollisions)
{
// store configurables needed for Lb workflow
if (!isHfCandBhadConfigFilled) {
Expand Down Expand Up @@ -2663,7 +2664,7 @@ struct HfDataCreatorCharmHadPiReduced {
TracksPidWithSelAndMc const& tracks,
aod::McParticles const& particlesMc,
BCsInfo const& bcs,
McCollisions const& mcCollisions)
McCollisionsWMult const& mcCollisions)
{
// store configurables needed for Lb workflow
if (!isHfCandBhadConfigFilled) {
Expand Down
12 changes: 6 additions & 6 deletions PWGHF/D2H/TableProducer/dataCreatorCharmResoToD0Reduced.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@ struct HfDataCreatorCharmResoToD0Reduced {
aod::McParticles const& particlesMc,
BCsInfo const& bcs,
McCollisionsNoCents const& collInfos,
aod::McCollisions const& mcCollisions)
soa::Join<aod::McCollisions, aod::MultsExtraMC> const& mcCollisions)
{
int zvtxColl{0};
int sel8Coll{0};
Expand Down Expand Up @@ -495,7 +495,7 @@ struct HfDataCreatorCharmResoToD0Reduced {
aod::McParticles const& particlesMc,
BCsInfo const& bcs,
McCollisionsNoCents const& collInfos,
aod::McCollisions const& mcCollisions)
soa::Join<aod::McCollisions, aod::MultsExtraMC> const& mcCollisions)
{
int zvtxColl{0};
int sel8Coll{0};
Expand Down Expand Up @@ -536,7 +536,7 @@ struct HfDataCreatorCharmResoToD0Reduced {
aod::McParticles const& particlesMc,
BCsInfo const& bcs,
McCollisionsNoCents const& collInfos,
aod::McCollisions const& mcCollisions)
soa::Join<aod::McCollisions, aod::MultsExtraMC> const& mcCollisions)
{
int zvtxColl{0};
int sel8Coll{0};
Expand Down Expand Up @@ -577,7 +577,7 @@ struct HfDataCreatorCharmResoToD0Reduced {
aod::McParticles const& particlesMc,
BCsInfo const& bcs,
McCollisionsNoCents const& collInfos,
aod::McCollisions const& mcCollisions)
soa::Join<aod::McCollisions, aod::MultsExtraMC> const& mcCollisions)
{
int zvtxColl{0};
int sel8Coll{0};
Expand Down Expand Up @@ -616,7 +616,7 @@ struct HfDataCreatorCharmResoToD0Reduced {
aod::McParticles const& particlesMc,
BCsInfo const& bcs,
McCollisionsNoCents const& collInfos,
aod::McCollisions const& mcCollisions)
soa::Join<aod::McCollisions, aod::MultsExtraMC> const& mcCollisions)
{
int zvtxColl{0};
int sel8Coll{0};
Expand Down Expand Up @@ -657,7 +657,7 @@ struct HfDataCreatorCharmResoToD0Reduced {
aod::McParticles const& particlesMc,
BCsInfo const& bcs,
McCollisionsNoCents const& collInfos,
aod::McCollisions const& mcCollisions)
soa::Join<aod::McCollisions, aod::MultsExtraMC> const& mcCollisions)
{
int zvtxColl{0};
int sel8Coll{0};
Expand Down
12 changes: 6 additions & 6 deletions PWGHF/D2H/TableProducer/dataCreatorCharmResoToDplusReduced.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,7 @@ struct HfDataCreatorCharmResoToDplusReduced {
aod::McParticles const& particlesMc,
BCsInfo const& bcs,
McCollisionsNoCents const& collInfos,
aod::McCollisions const& mcCollisions)
soa::Join<aod::McCollisions, aod::MultsExtraMC> const& mcCollisions)
{
int zvtxColl{0};
int sel8Coll{0};
Expand Down Expand Up @@ -453,7 +453,7 @@ struct HfDataCreatorCharmResoToDplusReduced {
aod::McParticles const& particlesMc,
BCsInfo const& bcs,
McCollisionsNoCents const& collInfos,
aod::McCollisions const& mcCollisions)
soa::Join<aod::McCollisions, aod::MultsExtraMC> const& mcCollisions)
{
int zvtxColl{0};
int sel8Coll{0};
Expand Down Expand Up @@ -494,7 +494,7 @@ struct HfDataCreatorCharmResoToDplusReduced {
aod::McParticles const& particlesMc,
BCsInfo const& bcs,
McCollisionsNoCents const& collInfos,
aod::McCollisions const& mcCollisions)
soa::Join<aod::McCollisions, aod::MultsExtraMC> const& mcCollisions)
{
int zvtxColl{0};
int sel8Coll{0};
Expand Down Expand Up @@ -535,7 +535,7 @@ struct HfDataCreatorCharmResoToDplusReduced {
aod::McParticles const& particlesMc,
BCsInfo const& bcs,
McCollisionsNoCents const& collInfos,
aod::McCollisions const& mcCollisions)
soa::Join<aod::McCollisions, aod::MultsExtraMC> const& mcCollisions)
{
int zvtxColl{0};
int sel8Coll{0};
Expand Down Expand Up @@ -574,7 +574,7 @@ struct HfDataCreatorCharmResoToDplusReduced {
aod::McParticles const& particlesMc,
BCsInfo const& bcs,
McCollisionsNoCents const& collInfos,
aod::McCollisions const& mcCollisions)
soa::Join<aod::McCollisions, aod::MultsExtraMC> const& mcCollisions)
{
int zvtxColl{0};
int sel8Coll{0};
Expand Down Expand Up @@ -615,7 +615,7 @@ struct HfDataCreatorCharmResoToDplusReduced {
aod::McParticles const& particlesMc,
BCsInfo const& bcs,
McCollisionsNoCents const& collInfos,
aod::McCollisions const& mcCollisions)
soa::Join<aod::McCollisions, aod::MultsExtraMC> const& mcCollisions)
{
int zvtxColl{0};
int sel8Coll{0};
Expand Down
12 changes: 6 additions & 6 deletions PWGHF/D2H/TableProducer/dataCreatorCharmResoToDstarReduced.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,7 @@ struct HfDataCreatorCharmResoToDstarReduced {
aod::McParticles const& particlesMc,
BCsInfo const& bcs,
McCollisionsNoCents const& collInfos,
aod::McCollisions const& mcCollisions)
soa::Join<aod::McCollisions, aod::MultsExtraMC> const& mcCollisions)
{
int zvtxColl{0};
int sel8Coll{0};
Expand Down Expand Up @@ -455,7 +455,7 @@ struct HfDataCreatorCharmResoToDstarReduced {
aod::McParticles const& particlesMc,
BCsInfo const& bcs,
McCollisionsNoCents const& collInfos,
aod::McCollisions const& mcCollisions)
soa::Join<aod::McCollisions, aod::MultsExtraMC> const& mcCollisions)
{
int zvtxColl{0};
int sel8Coll{0};
Expand Down Expand Up @@ -496,7 +496,7 @@ struct HfDataCreatorCharmResoToDstarReduced {
aod::McParticles const& particlesMc,
BCsInfo const& bcs,
McCollisionsNoCents const& collInfos,
aod::McCollisions const& mcCollisions)
soa::Join<aod::McCollisions, aod::MultsExtraMC> const& mcCollisions)
{
int zvtxColl{0};
int sel8Coll{0};
Expand Down Expand Up @@ -537,7 +537,7 @@ struct HfDataCreatorCharmResoToDstarReduced {
aod::McParticles const& particlesMc,
BCsInfo const& bcs,
McCollisionsNoCents const& collInfos,
aod::McCollisions const& mcCollisions)
soa::Join<aod::McCollisions, aod::MultsExtraMC> const& mcCollisions)
{
int zvtxColl{0};
int sel8Coll{0};
Expand Down Expand Up @@ -576,7 +576,7 @@ struct HfDataCreatorCharmResoToDstarReduced {
aod::McParticles const& particlesMc,
BCsInfo const& bcs,
McCollisionsNoCents const& collInfos,
aod::McCollisions const& mcCollisions)
soa::Join<aod::McCollisions, aod::MultsExtraMC> const& mcCollisions)
{
int zvtxColl{0};
int sel8Coll{0};
Expand Down Expand Up @@ -617,7 +617,7 @@ struct HfDataCreatorCharmResoToDstarReduced {
aod::McParticles const& particlesMc,
BCsInfo const& bcs,
McCollisionsNoCents const& collInfos,
aod::McCollisions const& mcCollisions)
soa::Join<aod::McCollisions, aod::MultsExtraMC> const& mcCollisions)
{
int zvtxColl{0};
int sel8Coll{0};
Expand Down
8 changes: 4 additions & 4 deletions PWGHF/D2H/TableProducer/dataCreatorJpsiHadReduced.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -827,7 +827,7 @@ struct HfDataCreatorJpsiHadReduced {
}

template <uint8_t DecChannel>
void runMcGen(aod::McCollision const& mcCollision,
void runMcGen(soa::Join<aod::McCollisions, aod::MultsExtraMC>::iterator const& mcCollision,
aod::McParticles const& particlesMc,
CollisionsWCMcLabels const& collisions,
BCsInfo const&)
Expand Down Expand Up @@ -1578,7 +1578,7 @@ struct HfDataCreatorJpsiHadReduced {
TracksPidWithSelAndMc const& tracks,
aod::McParticles const& particlesMc,
BCsInfo const& bcs,
McCollisions const& mcCollisions)
soa::Join<aod::McCollisions, aod::MultsExtraMC> const& mcCollisions)
{
// store configurables needed for B+ workflow
if (!isHfCandBhadConfigFilled) {
Expand Down Expand Up @@ -1613,7 +1613,7 @@ struct HfDataCreatorJpsiHadReduced {
TracksPidWithSelAndMc const& tracks,
aod::McParticles const& particlesMc,
BCsInfo const& bcs,
McCollisions const& mcCollisions)
soa::Join<aod::McCollisions, aod::MultsExtraMC> const& mcCollisions)
{
// store configurables needed for B+ workflow
if (!isHfCandBhadConfigFilled) {
Expand Down Expand Up @@ -1648,7 +1648,7 @@ struct HfDataCreatorJpsiHadReduced {
TracksPidWithSelAndMc const& tracks,
aod::McParticles const& particlesMc,
BCsInfo const& bcs,
McCollisions const& mcCollisions)
soa::Join<aod::McCollisions, aod::MultsExtraMC> const& mcCollisions)
{
// store configurables needed for B+ workflow
if (!isHfCandBhadConfigFilled) {
Expand Down
2 changes: 1 addition & 1 deletion PWGHF/HFC/Tasks/taskCorrelationsEfficiencies.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ struct HfTaskCorrelationsEfficiencies {
std::unique_ptr<TF1> funcDcaXYPtCutPrimTrk{nullptr};

using BCsInfo = soa::Join<aod::BCs, aod::Timestamps, aod::BcSels>;
using McCollisionsWMult = soa::Join<aod::McCollisions, aod::McCentFT0Ms>;
using McCollisionsWMult = soa::Join<aod::McCollisions, aod::McCentFT0Ms, aod::MultsExtraMC>;
using RecoCollisions = soa::Join<aod::Collisions, aod::McCollisionLabels, aod::EvSels, aod::PVMults, aod::FT0Mults, aod::FV0Mults, aod::CentFT0Ms, aod::CentFT0As, aod::CentFT0Cs, aod::CentFV0As>;
using McCandsDs = soa::Filtered<soa::Join<aod::HfCand3Prong, aod::HfSelDsToKKPi, aod::HfMlDsToKKPi, aod::HfCand3ProngMcRec>>;
using McCandsDplus = soa::Filtered<soa::Join<aod::HfCand3Prong, aod::HfSelDplusToPiKPi, aod::HfMlDplusToPiKPi, aod::HfCand3ProngMcRec>>;
Expand Down
6 changes: 3 additions & 3 deletions PWGHF/TableProducer/candidateCreator2Prong.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -834,7 +834,7 @@ struct HfCandidateCreator2ProngExpressions {
using McCollisionsNoCents = soa::Join<aod::Collisions, aod::EvSels, aod::PVMults, aod::McCollisionLabels>;
using McCollisionsFT0Cs = soa::Join<aod::Collisions, aod::EvSels, aod::PVMults, aod::McCollisionLabels, aod::CentFT0Cs>;
using McCollisionsFT0Ms = soa::Join<aod::Collisions, aod::EvSels, aod::PVMults, aod::McCollisionLabels, aod::CentFT0Ms>;
using McCollisionsCentFT0Ms = soa::Join<aod::McCollisions, aod::McCentFT0Ms>;
using McCollisionsCentFT0Ms = soa::Join<aod::McCollisions, aod::McCentFT0Ms, aod::MultsExtraMC>;
using BCsInfo = soa::Join<aod::BCs, aod::Timestamps, aod::BcSels>;

Preslice<aod::McParticles> mcParticlesPerMcCollision = aod::mcparticle::mcCollisionId;
Expand Down Expand Up @@ -1053,7 +1053,7 @@ struct HfCandidateCreator2ProngExpressions {
void processMc(aod::TracksWMc const& tracks,
aod::McParticles const& mcParticles,
McCollisionsNoCents const& collInfos,
aod::McCollisions const& mcCollisions,
soa::Join<aod::McCollisions, aod::MultsExtraMC> const& mcCollisions,
BCsInfo const& bcsInfo)
{
runCreator2ProngMc<CentralityEstimator::None>(tracks, mcParticles, collInfos, mcCollisions, bcsInfo);
Expand All @@ -1063,7 +1063,7 @@ struct HfCandidateCreator2ProngExpressions {
void processMcCentFT0C(aod::TracksWMc const& tracks,
aod::McParticles const& mcParticles,
McCollisionsFT0Cs const& collInfos,
aod::McCollisions const& mcCollisions,
soa::Join<aod::McCollisions, aod::MultsExtraMC> const& mcCollisions,
BCsInfo const& bcsInfo)
{
runCreator2ProngMc<CentralityEstimator::FT0C>(tracks, mcParticles, collInfos, mcCollisions, bcsInfo);
Expand Down
Loading
Loading