Skip to content

Commit 65cb8b0

Browse files
DelloStrittoDelloStritto
committed
Update HF event selection
1 parent db4aa34 commit 65cb8b0

16 files changed

Lines changed: 98 additions & 76 deletions

‎PWGHF/D2H/TableProducer/dataCreatorCharmHadPiReduced.cxx‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,7 @@ struct HfDataCreatorCharmHadPiReduced {
257257
using CollisionsWCentAndMcLabels = soa::Join<CollisionsWCent, aod::McCollisionLabels>;
258258
using CollisionsWCentAndQvectors = soa::Join<CollisionsWCent, aod::QvectorFT0Cs, aod::QvectorFT0As, aod::QvectorFT0Ms, aod::QvectorTPCposs, aod::QvectorTPCnegs, aod::QvectorTPCalls>;
259259
using BCsInfo = soa::Join<aod::BCsWithTimestamps, aod::BcSels>;
260+
using McCollisionsWMult = soa::Join<aod::McCollisions, aod::MultsExtraMC>;
260261

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

15721573
template <uint8_t DecayChannel>
1573-
void runMcGen(aod::McCollision const& mcCollision,
1574+
void runMcGen(McCollisionsWMult::iterator const& mcCollision,
15741575
aod::McParticles const& particlesMc,
15751576
CollisionsWCentAndMcLabels const& collisions,
15761577
BCsInfo const&)
@@ -2346,7 +2347,7 @@ struct HfDataCreatorCharmHadPiReduced {
23462347
TracksPidWithSelAndMc const& tracks,
23472348
aod::McParticles const& particlesMc,
23482349
BCsInfo const& bcs,
2349-
McCollisions const& mcCollisions)
2350+
McCollisionsWMult const& mcCollisions)
23502351
{
23512352
// store configurables needed for B0 workflow
23522353
if (!isHfCandBhadConfigFilled) {
@@ -2381,7 +2382,7 @@ struct HfDataCreatorCharmHadPiReduced {
23812382
TracksPidWithSelAndMc const& tracks,
23822383
aod::McParticles const& particlesMc,
23832384
BCsInfo const& bcs,
2384-
McCollisions const& mcCollisions)
2385+
McCollisionsWMult const& mcCollisions)
23852386
{
23862387
// store configurables needed for B0 workflow
23872388
if (!isHfCandBhadConfigFilled) {
@@ -2416,7 +2417,7 @@ struct HfDataCreatorCharmHadPiReduced {
24162417
TracksPidWithSelAndMc const& tracks,
24172418
aod::McParticles const& particlesMc,
24182419
BCsInfo const& bcs,
2419-
McCollisions const& mcCollisions,
2420+
McCollisionsWMult const& mcCollisions,
24202421
aod::Hf2Prongs const&)
24212422
{
24222423
// store configurables needed for B0 workflow
@@ -2452,7 +2453,7 @@ struct HfDataCreatorCharmHadPiReduced {
24522453
TracksPidWithSelAndMc const& tracks,
24532454
aod::McParticles const& particlesMc,
24542455
BCsInfo const& bcs,
2455-
McCollisions const& mcCollisions,
2456+
McCollisionsWMult const& mcCollisions,
24562457
aod::Hf2Prongs const&)
24572458
{
24582459
// store configurables needed for B0 workflow
@@ -2488,7 +2489,7 @@ struct HfDataCreatorCharmHadPiReduced {
24882489
TracksPidWithSelAndMc const& tracks,
24892490
aod::McParticles const& particlesMc,
24902491
BCsInfo const& bcs,
2491-
McCollisions const& mcCollisions)
2492+
McCollisionsWMult const& mcCollisions)
24922493
{
24932494
// store configurables needed for Bs workflow
24942495
if (!isHfCandBhadConfigFilled) {
@@ -2523,7 +2524,7 @@ struct HfDataCreatorCharmHadPiReduced {
25232524
TracksPidWithSelAndMc const& tracks,
25242525
aod::McParticles const& particlesMc,
25252526
BCsInfo const& bcs,
2526-
McCollisions const& mcCollisions)
2527+
McCollisionsWMult const& mcCollisions)
25272528
{
25282529
// store configurables needed for Bs workflow
25292530
if (!isHfCandBhadConfigFilled) {
@@ -2558,7 +2559,7 @@ struct HfDataCreatorCharmHadPiReduced {
25582559
TracksPidWithSelAndMc const& tracks,
25592560
aod::McParticles const& particlesMc,
25602561
BCsInfo const& bcs,
2561-
McCollisions const& mcCollisions)
2562+
McCollisionsWMult const& mcCollisions)
25622563
{
25632564
// store configurables needed for B+ workflow
25642565
if (!isHfCandBhadConfigFilled) {
@@ -2593,7 +2594,7 @@ struct HfDataCreatorCharmHadPiReduced {
25932594
TracksPidWithSelAndMc const& tracks,
25942595
aod::McParticles const& particlesMc,
25952596
BCsInfo const& bcs,
2596-
McCollisions const& mcCollisions)
2597+
McCollisionsWMult const& mcCollisions)
25972598
{
25982599
// store configurables needed for B+ workflow
25992600
if (!isHfCandBhadConfigFilled) {
@@ -2628,7 +2629,7 @@ struct HfDataCreatorCharmHadPiReduced {
26282629
TracksPidWithSelAndMc const& tracks,
26292630
aod::McParticles const& particlesMc,
26302631
BCsInfo const& bcs,
2631-
McCollisions const& mcCollisions)
2632+
McCollisionsWMult const& mcCollisions)
26322633
{
26332634
// store configurables needed for Lb workflow
26342635
if (!isHfCandBhadConfigFilled) {
@@ -2663,7 +2664,7 @@ struct HfDataCreatorCharmHadPiReduced {
26632664
TracksPidWithSelAndMc const& tracks,
26642665
aod::McParticles const& particlesMc,
26652666
BCsInfo const& bcs,
2666-
McCollisions const& mcCollisions)
2667+
McCollisionsWMult const& mcCollisions)
26672668
{
26682669
// store configurables needed for Lb workflow
26692670
if (!isHfCandBhadConfigFilled) {

‎PWGHF/D2H/TableProducer/dataCreatorCharmResoToD0Reduced.cxx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@ struct HfDataCreatorCharmResoToD0Reduced {
456456
aod::McParticles const& particlesMc,
457457
BCsInfo const& bcs,
458458
McCollisionsNoCents const& collInfos,
459-
aod::McCollisions const& mcCollisions)
459+
soa::Join<aod::McCollisions, aod::MultsExtraMC> const& mcCollisions)
460460
{
461461
int zvtxColl{0};
462462
int sel8Coll{0};
@@ -495,7 +495,7 @@ struct HfDataCreatorCharmResoToD0Reduced {
495495
aod::McParticles const& particlesMc,
496496
BCsInfo const& bcs,
497497
McCollisionsNoCents const& collInfos,
498-
aod::McCollisions const& mcCollisions)
498+
soa::Join<aod::McCollisions, aod::MultsExtraMC> const& mcCollisions)
499499
{
500500
int zvtxColl{0};
501501
int sel8Coll{0};
@@ -536,7 +536,7 @@ struct HfDataCreatorCharmResoToD0Reduced {
536536
aod::McParticles const& particlesMc,
537537
BCsInfo const& bcs,
538538
McCollisionsNoCents const& collInfos,
539-
aod::McCollisions const& mcCollisions)
539+
soa::Join<aod::McCollisions, aod::MultsExtraMC> const& mcCollisions)
540540
{
541541
int zvtxColl{0};
542542
int sel8Coll{0};
@@ -577,7 +577,7 @@ struct HfDataCreatorCharmResoToD0Reduced {
577577
aod::McParticles const& particlesMc,
578578
BCsInfo const& bcs,
579579
McCollisionsNoCents const& collInfos,
580-
aod::McCollisions const& mcCollisions)
580+
soa::Join<aod::McCollisions, aod::MultsExtraMC> const& mcCollisions)
581581
{
582582
int zvtxColl{0};
583583
int sel8Coll{0};
@@ -616,7 +616,7 @@ struct HfDataCreatorCharmResoToD0Reduced {
616616
aod::McParticles const& particlesMc,
617617
BCsInfo const& bcs,
618618
McCollisionsNoCents const& collInfos,
619-
aod::McCollisions const& mcCollisions)
619+
soa::Join<aod::McCollisions, aod::MultsExtraMC> const& mcCollisions)
620620
{
621621
int zvtxColl{0};
622622
int sel8Coll{0};
@@ -657,7 +657,7 @@ struct HfDataCreatorCharmResoToD0Reduced {
657657
aod::McParticles const& particlesMc,
658658
BCsInfo const& bcs,
659659
McCollisionsNoCents const& collInfos,
660-
aod::McCollisions const& mcCollisions)
660+
soa::Join<aod::McCollisions, aod::MultsExtraMC> const& mcCollisions)
661661
{
662662
int zvtxColl{0};
663663
int sel8Coll{0};

‎PWGHF/D2H/TableProducer/dataCreatorCharmResoToDplusReduced.cxx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,7 @@ struct HfDataCreatorCharmResoToDplusReduced {
414414
aod::McParticles const& particlesMc,
415415
BCsInfo const& bcs,
416416
McCollisionsNoCents const& collInfos,
417-
aod::McCollisions const& mcCollisions)
417+
soa::Join<aod::McCollisions, aod::MultsExtraMC> const& mcCollisions)
418418
{
419419
int zvtxColl{0};
420420
int sel8Coll{0};
@@ -453,7 +453,7 @@ struct HfDataCreatorCharmResoToDplusReduced {
453453
aod::McParticles const& particlesMc,
454454
BCsInfo const& bcs,
455455
McCollisionsNoCents const& collInfos,
456-
aod::McCollisions const& mcCollisions)
456+
soa::Join<aod::McCollisions, aod::MultsExtraMC> const& mcCollisions)
457457
{
458458
int zvtxColl{0};
459459
int sel8Coll{0};
@@ -494,7 +494,7 @@ struct HfDataCreatorCharmResoToDplusReduced {
494494
aod::McParticles const& particlesMc,
495495
BCsInfo const& bcs,
496496
McCollisionsNoCents const& collInfos,
497-
aod::McCollisions const& mcCollisions)
497+
soa::Join<aod::McCollisions, aod::MultsExtraMC> const& mcCollisions)
498498
{
499499
int zvtxColl{0};
500500
int sel8Coll{0};
@@ -535,7 +535,7 @@ struct HfDataCreatorCharmResoToDplusReduced {
535535
aod::McParticles const& particlesMc,
536536
BCsInfo const& bcs,
537537
McCollisionsNoCents const& collInfos,
538-
aod::McCollisions const& mcCollisions)
538+
soa::Join<aod::McCollisions, aod::MultsExtraMC> const& mcCollisions)
539539
{
540540
int zvtxColl{0};
541541
int sel8Coll{0};
@@ -574,7 +574,7 @@ struct HfDataCreatorCharmResoToDplusReduced {
574574
aod::McParticles const& particlesMc,
575575
BCsInfo const& bcs,
576576
McCollisionsNoCents const& collInfos,
577-
aod::McCollisions const& mcCollisions)
577+
soa::Join<aod::McCollisions, aod::MultsExtraMC> const& mcCollisions)
578578
{
579579
int zvtxColl{0};
580580
int sel8Coll{0};
@@ -615,7 +615,7 @@ struct HfDataCreatorCharmResoToDplusReduced {
615615
aod::McParticles const& particlesMc,
616616
BCsInfo const& bcs,
617617
McCollisionsNoCents const& collInfos,
618-
aod::McCollisions const& mcCollisions)
618+
soa::Join<aod::McCollisions, aod::MultsExtraMC> const& mcCollisions)
619619
{
620620
int zvtxColl{0};
621621
int sel8Coll{0};

‎PWGHF/D2H/TableProducer/dataCreatorCharmResoToDstarReduced.cxx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@ struct HfDataCreatorCharmResoToDstarReduced {
416416
aod::McParticles const& particlesMc,
417417
BCsInfo const& bcs,
418418
McCollisionsNoCents const& collInfos,
419-
aod::McCollisions const& mcCollisions)
419+
soa::Join<aod::McCollisions, aod::MultsExtraMC> const& mcCollisions)
420420
{
421421
int zvtxColl{0};
422422
int sel8Coll{0};
@@ -455,7 +455,7 @@ struct HfDataCreatorCharmResoToDstarReduced {
455455
aod::McParticles const& particlesMc,
456456
BCsInfo const& bcs,
457457
McCollisionsNoCents const& collInfos,
458-
aod::McCollisions const& mcCollisions)
458+
soa::Join<aod::McCollisions, aod::MultsExtraMC> const& mcCollisions)
459459
{
460460
int zvtxColl{0};
461461
int sel8Coll{0};
@@ -496,7 +496,7 @@ struct HfDataCreatorCharmResoToDstarReduced {
496496
aod::McParticles const& particlesMc,
497497
BCsInfo const& bcs,
498498
McCollisionsNoCents const& collInfos,
499-
aod::McCollisions const& mcCollisions)
499+
soa::Join<aod::McCollisions, aod::MultsExtraMC> const& mcCollisions)
500500
{
501501
int zvtxColl{0};
502502
int sel8Coll{0};
@@ -537,7 +537,7 @@ struct HfDataCreatorCharmResoToDstarReduced {
537537
aod::McParticles const& particlesMc,
538538
BCsInfo const& bcs,
539539
McCollisionsNoCents const& collInfos,
540-
aod::McCollisions const& mcCollisions)
540+
soa::Join<aod::McCollisions, aod::MultsExtraMC> const& mcCollisions)
541541
{
542542
int zvtxColl{0};
543543
int sel8Coll{0};
@@ -576,7 +576,7 @@ struct HfDataCreatorCharmResoToDstarReduced {
576576
aod::McParticles const& particlesMc,
577577
BCsInfo const& bcs,
578578
McCollisionsNoCents const& collInfos,
579-
aod::McCollisions const& mcCollisions)
579+
soa::Join<aod::McCollisions, aod::MultsExtraMC> const& mcCollisions)
580580
{
581581
int zvtxColl{0};
582582
int sel8Coll{0};
@@ -617,7 +617,7 @@ struct HfDataCreatorCharmResoToDstarReduced {
617617
aod::McParticles const& particlesMc,
618618
BCsInfo const& bcs,
619619
McCollisionsNoCents const& collInfos,
620-
aod::McCollisions const& mcCollisions)
620+
soa::Join<aod::McCollisions, aod::MultsExtraMC> const& mcCollisions)
621621
{
622622
int zvtxColl{0};
623623
int sel8Coll{0};

‎PWGHF/D2H/TableProducer/dataCreatorJpsiHadReduced.cxx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -827,7 +827,7 @@ struct HfDataCreatorJpsiHadReduced {
827827
}
828828

829829
template <uint8_t DecChannel>
830-
void runMcGen(aod::McCollision const& mcCollision,
830+
void runMcGen(soa::Join<aod::McCollisions, aod::MultsExtraMC>::iterator const& mcCollision,
831831
aod::McParticles const& particlesMc,
832832
CollisionsWCMcLabels const& collisions,
833833
BCsInfo const&)
@@ -1578,7 +1578,7 @@ struct HfDataCreatorJpsiHadReduced {
15781578
TracksPidWithSelAndMc const& tracks,
15791579
aod::McParticles const& particlesMc,
15801580
BCsInfo const& bcs,
1581-
McCollisions const& mcCollisions)
1581+
soa::Join<aod::McCollisions, aod::MultsExtraMC> const& mcCollisions)
15821582
{
15831583
// store configurables needed for B+ workflow
15841584
if (!isHfCandBhadConfigFilled) {
@@ -1613,7 +1613,7 @@ struct HfDataCreatorJpsiHadReduced {
16131613
TracksPidWithSelAndMc const& tracks,
16141614
aod::McParticles const& particlesMc,
16151615
BCsInfo const& bcs,
1616-
McCollisions const& mcCollisions)
1616+
soa::Join<aod::McCollisions, aod::MultsExtraMC> const& mcCollisions)
16171617
{
16181618
// store configurables needed for B+ workflow
16191619
if (!isHfCandBhadConfigFilled) {
@@ -1648,7 +1648,7 @@ struct HfDataCreatorJpsiHadReduced {
16481648
TracksPidWithSelAndMc const& tracks,
16491649
aod::McParticles const& particlesMc,
16501650
BCsInfo const& bcs,
1651-
McCollisions const& mcCollisions)
1651+
soa::Join<aod::McCollisions, aod::MultsExtraMC> const& mcCollisions)
16521652
{
16531653
// store configurables needed for B+ workflow
16541654
if (!isHfCandBhadConfigFilled) {

‎PWGHF/HFC/Tasks/taskCorrelationsEfficiencies.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ struct HfTaskCorrelationsEfficiencies {
139139
std::unique_ptr<TF1> funcDcaXYPtCutPrimTrk{nullptr};
140140

141141
using BCsInfo = soa::Join<aod::BCs, aod::Timestamps, aod::BcSels>;
142-
using McCollisionsWMult = soa::Join<aod::McCollisions, aod::McCentFT0Ms>;
142+
using McCollisionsWMult = soa::Join<aod::McCollisions, aod::McCentFT0Ms, aod::MultsExtraMC>;
143143
using RecoCollisions = soa::Join<aod::Collisions, aod::McCollisionLabels, aod::EvSels, aod::PVMults, aod::FT0Mults, aod::FV0Mults, aod::CentFT0Ms, aod::CentFT0As, aod::CentFT0Cs, aod::CentFV0As>;
144144
using McCandsDs = soa::Filtered<soa::Join<aod::HfCand3Prong, aod::HfSelDsToKKPi, aod::HfMlDsToKKPi, aod::HfCand3ProngMcRec>>;
145145
using McCandsDplus = soa::Filtered<soa::Join<aod::HfCand3Prong, aod::HfSelDplusToPiKPi, aod::HfMlDplusToPiKPi, aod::HfCand3ProngMcRec>>;

‎PWGHF/TableProducer/candidateCreator2Prong.cxx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -834,7 +834,7 @@ struct HfCandidateCreator2ProngExpressions {
834834
using McCollisionsNoCents = soa::Join<aod::Collisions, aod::EvSels, aod::PVMults, aod::McCollisionLabels>;
835835
using McCollisionsFT0Cs = soa::Join<aod::Collisions, aod::EvSels, aod::PVMults, aod::McCollisionLabels, aod::CentFT0Cs>;
836836
using McCollisionsFT0Ms = soa::Join<aod::Collisions, aod::EvSels, aod::PVMults, aod::McCollisionLabels, aod::CentFT0Ms>;
837-
using McCollisionsCentFT0Ms = soa::Join<aod::McCollisions, aod::McCentFT0Ms>;
837+
using McCollisionsCentFT0Ms = soa::Join<aod::McCollisions, aod::McCentFT0Ms, aod::MultsExtraMC>;
838838
using BCsInfo = soa::Join<aod::BCs, aod::Timestamps, aod::BcSels>;
839839

840840
Preslice<aod::McParticles> mcParticlesPerMcCollision = aod::mcparticle::mcCollisionId;
@@ -1053,7 +1053,7 @@ struct HfCandidateCreator2ProngExpressions {
10531053
void processMc(aod::TracksWMc const& tracks,
10541054
aod::McParticles const& mcParticles,
10551055
McCollisionsNoCents const& collInfos,
1056-
aod::McCollisions const& mcCollisions,
1056+
soa::Join<aod::McCollisions, aod::MultsExtraMC> const& mcCollisions,
10571057
BCsInfo const& bcsInfo)
10581058
{
10591059
runCreator2ProngMc<CentralityEstimator::None>(tracks, mcParticles, collInfos, mcCollisions, bcsInfo);
@@ -1063,7 +1063,7 @@ struct HfCandidateCreator2ProngExpressions {
10631063
void processMcCentFT0C(aod::TracksWMc const& tracks,
10641064
aod::McParticles const& mcParticles,
10651065
McCollisionsFT0Cs const& collInfos,
1066-
aod::McCollisions const& mcCollisions,
1066+
soa::Join<aod::McCollisions, aod::MultsExtraMC> const& mcCollisions,
10671067
BCsInfo const& bcsInfo)
10681068
{
10691069
runCreator2ProngMc<CentralityEstimator::FT0C>(tracks, mcParticles, collInfos, mcCollisions, bcsInfo);

0 commit comments

Comments
 (0)