Skip to content

Commit faf31f1

Browse files
stefanopolitanostefanopolitano
authored
PWGHF: removing dependence on centrality table for process function w/o centrality cut (#6984)
* PWGHF: removing dependence on centrality table for process function in candidate creator w/o centrality cut * PWGHF: including hf selections for process functions w/o centrality uct
1 parent 3aea964 commit faf31f1

5 files changed

Lines changed: 41 additions & 16 deletions

File tree

‎PWGHF/TableProducer/candidateCreator2Prong.cxx‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -658,8 +658,10 @@ struct HfCandidateCreator2ProngExpressions {
658658

659659
HfEventSelectionMc hfEvSelMc; // mc event selection and monitoring
660660

661+
using McCollisionsNoCents = soa::Join<aod::Collisions, aod::EvSels, aod::McCollisionLabels>;
661662
using McCollisionsFT0Cs = soa::Join<aod::Collisions, aod::EvSels, aod::McCollisionLabels, aod::CentFT0Cs>;
662663
using McCollisionsFT0Ms = soa::Join<aod::Collisions, aod::EvSels, aod::McCollisionLabels, aod::CentFT0Ms>;
664+
PresliceUnsorted<McCollisionsNoCents> colPerMcCollision = aod::mccollisionlabel::mcCollisionId;
663665
PresliceUnsorted<McCollisionsFT0Cs> colPerMcCollisionFT0C = aod::mccollisionlabel::mcCollisionId;
664666
PresliceUnsorted<McCollisionsFT0Ms> colPerMcCollisionFT0M = aod::mccollisionlabel::mcCollisionId;
665667

@@ -776,6 +778,9 @@ struct HfCandidateCreator2ProngExpressions {
776778
} else if constexpr (centEstimator == CentralityEstimator::FT0M) {
777779
const auto collSlice = collInfos.sliceBy(colPerMcCollisionFT0M, mcCollision.globalIndex());
778780
rejectionMask = hfEvSelMc.getHfMcCollisionRejectionMask<BCsInfo, centEstimator>(mcCollision, collSlice, centrality);
781+
} else if constexpr (centEstimator == CentralityEstimator::None) {
782+
const auto collSlice = collInfos.sliceBy(colPerMcCollision, mcCollision.globalIndex());
783+
rejectionMask = hfEvSelMc.getHfMcCollisionRejectionMask<BCsInfo, centEstimator>(mcCollision, collSlice, centrality);
779784
}
780785
hfEvSelMc.fillHistograms(rejectionMask);
781786
if (rejectionMask != 0) {
@@ -817,13 +822,13 @@ struct HfCandidateCreator2ProngExpressions {
817822

818823
void processMc(aod::TracksWMc const& tracks,
819824
aod::McParticles const& mcParticles,
820-
McCollisionsFT0Cs const& collInfos,
825+
McCollisionsNoCents const& collInfos,
821826
aod::McCollisions const& mcCollisions,
822827
BCsInfo const& BCsInfo)
823828
{
824829
runCreator2ProngMc<CentralityEstimator::None>(tracks, mcParticles, collInfos, mcCollisions, BCsInfo);
825830
}
826-
PROCESS_SWITCH(HfCandidateCreator2ProngExpressions, processMc, "Process MC - no centrality", true);
831+
PROCESS_SWITCH(HfCandidateCreator2ProngExpressions, processMc, "Process MC - no centrality", false);
827832

828833
void processMcCentFT0C(aod::TracksWMc const& tracks,
829834
aod::McParticles const& mcParticles,

‎PWGHF/TableProducer/candidateCreator3Prong.cxx‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -465,8 +465,10 @@ struct HfCandidateCreator3ProngExpressions {
465465
using BCsInfo = soa::Join<aod::BCs, aod::Timestamps, aod::BcSels>;
466466
HistogramRegistry registry{"registry"};
467467

468+
using McCollisionsNoCents = soa::Join<aod::Collisions, aod::EvSels, aod::McCollisionLabels>;
468469
using McCollisionsFT0Cs = soa::Join<aod::Collisions, aod::EvSels, aod::McCollisionLabels, aod::CentFT0Cs>;
469470
using McCollisionsFT0Ms = soa::Join<aod::Collisions, aod::EvSels, aod::McCollisionLabels, aod::CentFT0Ms>;
471+
PresliceUnsorted<McCollisionsNoCents> colPerMcCollision = aod::mccollisionlabel::mcCollisionId;
470472
PresliceUnsorted<McCollisionsFT0Cs> colPerMcCollisionFT0C = aod::mccollisionlabel::mcCollisionId;
471473
PresliceUnsorted<McCollisionsFT0Ms> colPerMcCollisionFT0M = aod::mccollisionlabel::mcCollisionId;
472474

@@ -663,6 +665,9 @@ struct HfCandidateCreator3ProngExpressions {
663665
} else if constexpr (centEstimator == CentralityEstimator::FT0M) {
664666
const auto collSlice = collInfos.sliceBy(colPerMcCollisionFT0M, mcCollision.globalIndex());
665667
rejectionMask = hfEvSelMc.getHfMcCollisionRejectionMask<BCsInfo, centEstimator>(mcCollision, collSlice, centrality);
668+
} else if constexpr (centEstimator == CentralityEstimator::None) {
669+
const auto collSlice = collInfos.sliceBy(colPerMcCollision, mcCollision.globalIndex());
670+
rejectionMask = hfEvSelMc.getHfMcCollisionRejectionMask<BCsInfo, centEstimator>(mcCollision, collSlice, centrality);
666671
}
667672
hfEvSelMc.fillHistograms(rejectionMask);
668673
if (rejectionMask != 0) {
@@ -751,13 +756,13 @@ struct HfCandidateCreator3ProngExpressions {
751756

752757
void processMc(aod::TracksWMc const& tracks,
753758
aod::McParticles const& mcParticles,
754-
McCollisionsFT0Cs const& collInfos,
759+
McCollisionsNoCents const& collInfos,
755760
aod::McCollisions const& mcCollisions,
756761
BCsInfo const& BCsInfo)
757762
{
758763
runCreator3ProngMc<CentralityEstimator::None>(tracks, mcParticles, collInfos, mcCollisions, BCsInfo);
759764
}
760-
PROCESS_SWITCH(HfCandidateCreator3ProngExpressions, processMc, "Process MC - no centrality", true);
765+
PROCESS_SWITCH(HfCandidateCreator3ProngExpressions, processMc, "Process MC - no centrality", false);
761766

762767
void processMcCentFT0C(aod::TracksWMc const& tracks,
763768
aod::McParticles const& mcParticles,

‎PWGHF/TableProducer/candidateCreatorCascade.cxx‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -439,8 +439,10 @@ struct HfCandidateCreatorCascadeMc {
439439
// Configuration
440440
o2::framework::Configurable<bool> rejectBackground{"rejectBackground", true, "Reject particles from background events"};
441441

442+
using McCollisionsNoCents = soa::Join<aod::Collisions, aod::EvSels, aod::McCollisionLabels>;
442443
using McCollisionsFT0Cs = soa::Join<aod::Collisions, aod::EvSels, aod::McCollisionLabels, aod::CentFT0Cs>;
443444
using McCollisionsFT0Ms = soa::Join<aod::Collisions, aod::EvSels, aod::McCollisionLabels, aod::CentFT0Ms>;
445+
PresliceUnsorted<McCollisionsNoCents> colPerMcCollision = aod::mccollisionlabel::mcCollisionId;
444446
PresliceUnsorted<McCollisionsFT0Cs> colPerMcCollisionFT0C = aod::mccollisionlabel::mcCollisionId;
445447
PresliceUnsorted<McCollisionsFT0Ms> colPerMcCollisionFT0M = aod::mccollisionlabel::mcCollisionId;
446448

@@ -541,6 +543,9 @@ struct HfCandidateCreatorCascadeMc {
541543
} else if constexpr (centEstimator == CentralityEstimator::FT0M) {
542544
const auto collSlice = collInfos.sliceBy(colPerMcCollisionFT0M, mcCollision.globalIndex());
543545
rejectionMask = hfEvSelMc.getHfMcCollisionRejectionMask<BCsInfo, centEstimator>(mcCollision, collSlice, centrality);
546+
} else if constexpr (centEstimator == CentralityEstimator::None) {
547+
const auto collSlice = collInfos.sliceBy(colPerMcCollision, mcCollision.globalIndex());
548+
rejectionMask = hfEvSelMc.getHfMcCollisionRejectionMask<BCsInfo, centEstimator>(mcCollision, collSlice, centrality);
544549
}
545550
hfEvSelMc.fillHistograms(rejectionMask);
546551
if (rejectionMask != 0) {
@@ -585,13 +590,13 @@ struct HfCandidateCreatorCascadeMc {
585590

586591
void processMc(MyTracksWMc const& tracks,
587592
aod::McParticles const& mcParticles,
588-
McCollisionsFT0Cs const& collInfos,
593+
McCollisionsNoCents const& collInfos,
589594
aod::McCollisions const& mcCollisions,
590595
BCsInfo const& BCsInfo)
591596
{
592597
runCreatorCascMc<CentralityEstimator::None>(tracks, mcParticles, collInfos, mcCollisions, BCsInfo);
593598
}
594-
PROCESS_SWITCH(HfCandidateCreatorCascadeMc, processMc, "Process MC - no centrality", true);
599+
PROCESS_SWITCH(HfCandidateCreatorCascadeMc, processMc, "Process MC - no centrality", false);
595600

596601
void processMcCentFT0C(MyTracksWMc const& tracks,
597602
aod::McParticles const& mcParticles,

‎PWGHF/TableProducer/candidateCreatorDstar.cxx‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -507,8 +507,10 @@ struct HfCandidateCreatorDstarExpressions {
507507
// Configuration
508508
o2::framework::Configurable<bool> rejectBackground{"rejectBackground", true, "Reject particles from background events"};
509509

510+
using McCollisionsNoCents = soa::Join<aod::Collisions, aod::EvSels, aod::McCollisionLabels>;
510511
using McCollisionsFT0Cs = soa::Join<aod::Collisions, aod::EvSels, aod::McCollisionLabels, aod::CentFT0Cs>;
511512
using McCollisionsFT0Ms = soa::Join<aod::Collisions, aod::EvSels, aod::McCollisionLabels, aod::CentFT0Ms>;
513+
PresliceUnsorted<McCollisionsNoCents> colPerMcCollision = aod::mccollisionlabel::mcCollisionId;
512514
PresliceUnsorted<McCollisionsFT0Cs> colPerMcCollisionFT0C = aod::mccollisionlabel::mcCollisionId;
513515
PresliceUnsorted<McCollisionsFT0Ms> colPerMcCollisionFT0M = aod::mccollisionlabel::mcCollisionId;
514516

@@ -632,6 +634,9 @@ struct HfCandidateCreatorDstarExpressions {
632634
} else if constexpr (centEstimator == CentralityEstimator::FT0M) {
633635
const auto collSlice = collInfos.sliceBy(colPerMcCollisionFT0M, mcCollision.globalIndex());
634636
rejectionMask = hfEvSelMc.getHfMcCollisionRejectionMask<BCsInfo, centEstimator>(mcCollision, collSlice, centrality);
637+
} else if constexpr (centEstimator == CentralityEstimator::None) {
638+
const auto collSlice = collInfos.sliceBy(colPerMcCollision, mcCollision.globalIndex());
639+
rejectionMask = hfEvSelMc.getHfMcCollisionRejectionMask<BCsInfo, centEstimator>(mcCollision, collSlice, centrality);
635640
}
636641
hfEvSelMc.fillHistograms(rejectionMask);
637642
if (rejectionMask != 0) {
@@ -669,13 +674,13 @@ struct HfCandidateCreatorDstarExpressions {
669674

670675
void processMc(aod::TracksWMc const& tracks,
671676
aod::McParticles const& mcParticles,
672-
McCollisionsFT0Cs const& collInfos,
677+
McCollisionsNoCents const& collInfos,
673678
aod::McCollisions const& mcCollisions,
674679
BCsInfo const& BCsInfo)
675680
{
676681
runCreatorDstarMc<CentralityEstimator::None>(tracks, mcParticles, collInfos, mcCollisions, BCsInfo);
677682
}
678-
PROCESS_SWITCH(HfCandidateCreatorDstarExpressions, processMc, "Process MC - no centrality", true);
683+
PROCESS_SWITCH(HfCandidateCreatorDstarExpressions, processMc, "Process MC - no centrality", false);
679684

680685
void processMcCentFT0C(aod::TracksWMc const& tracks,
681686
aod::McParticles const& mcParticles,

‎PWGHF/TableProducer/candidateCreatorXic0Omegac0.cxx‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -664,8 +664,10 @@ struct HfCandidateCreatorXic0Omegac0Mc {
664664
// Configuration
665665
o2::framework::Configurable<bool> rejectBackground{"rejectBackground", true, "Reject particles from background events"};
666666

667+
using McCollisionsNoCents = soa::Join<aod::Collisions, aod::EvSels, aod::McCollisionLabels>;
667668
using McCollisionsFT0Cs = soa::Join<aod::Collisions, aod::EvSels, aod::McCollisionLabels, aod::CentFT0Cs>;
668669
using McCollisionsFT0Ms = soa::Join<aod::Collisions, aod::EvSels, aod::McCollisionLabels, aod::CentFT0Ms>;
670+
PresliceUnsorted<McCollisionsNoCents> colPerMcCollision = aod::mccollisionlabel::mcCollisionId;
669671
PresliceUnsorted<McCollisionsFT0Cs> colPerMcCollisionFT0C = aod::mccollisionlabel::mcCollisionId;
670672
PresliceUnsorted<McCollisionsFT0Ms> colPerMcCollisionFT0M = aod::mccollisionlabel::mcCollisionId;
671673

@@ -964,6 +966,9 @@ struct HfCandidateCreatorXic0Omegac0Mc {
964966
} else if constexpr (centEstimator == CentralityEstimator::FT0M) {
965967
const auto collSlice = collInfos.sliceBy(colPerMcCollisionFT0M, mcCollision.globalIndex());
966968
rejectionMask = hfEvSelMc.getHfMcCollisionRejectionMask<BCsInfo, centEstimator>(mcCollision, collSlice, centrality);
969+
} else if constexpr (centEstimator == CentralityEstimator::None) {
970+
const auto collSlice = collInfos.sliceBy(colPerMcCollision, mcCollision.globalIndex());
971+
rejectionMask = hfEvSelMc.getHfMcCollisionRejectionMask<BCsInfo, centEstimator>(mcCollision, collSlice, centrality);
967972
}
968973
hfEvSelMc.fillHistograms(rejectionMask);
969974
if (rejectionMask != 0) {
@@ -1138,12 +1143,12 @@ struct HfCandidateCreatorXic0Omegac0Mc {
11381143
aod::McParticles const& mcParticles,
11391144
aod::McCollisions const& mcColls,
11401145
aod::McCollisionLabels const& mcLabels,
1141-
McCollisionsFT0Ms const& collInfos,
1146+
McCollisionsNoCents const& collInfos,
11421147
BCsInfo const& bcs)
11431148
{
11441149
runXic0Omegac0Mc<CentralityEstimator::None, aod::hf_cand_xic0_omegac0::DecayType::XiczeroToXiPi>(candidates, tracks, mcParticles, collInfos, mcColls, mcLabels, bcs);
11451150
}
1146-
PROCESS_SWITCH(HfCandidateCreatorXic0Omegac0Mc, processMcXicToXiPi, "Run Xic0 to xi pi MC process function - no centrality", true);
1151+
PROCESS_SWITCH(HfCandidateCreatorXic0Omegac0Mc, processMcXicToXiPi, "Run Xic0 to xi pi MC process function - no centrality", false);
11471152

11481153
void processMcXicToXiPiFT0m(aod::HfCandToXiPi const& candidates,
11491154
aod::TracksWMc const& tracks,
@@ -1174,12 +1179,12 @@ struct HfCandidateCreatorXic0Omegac0Mc {
11741179
aod::McParticles const& mcParticles,
11751180
aod::McCollisions const& mcColls,
11761181
aod::McCollisionLabels const& mcLabels,
1177-
McCollisionsFT0Ms const& collInfos,
1182+
McCollisionsNoCents const& collInfos,
11781183
BCsInfo const& bcs)
11791184
{
11801185
runXic0Omegac0Mc<CentralityEstimator::None, aod::hf_cand_xic0_omegac0::DecayType::OmegaczeroToXiPi>(candidates, tracks, mcParticles, collInfos, mcColls, mcLabels, bcs);
11811186
}
1182-
PROCESS_SWITCH(HfCandidateCreatorXic0Omegac0Mc, processMcOmegacToXiPi, "Run Omegac0 to xi pi MC process function - FT0M", true);
1187+
PROCESS_SWITCH(HfCandidateCreatorXic0Omegac0Mc, processMcOmegacToXiPi, "Run Omegac0 to xi pi MC process function - no centrality", false);
11831188

11841189
void processMcOmegacToXiPiFT0m(aod::HfCandToXiPi const& candidates,
11851190
aod::TracksWMc const& tracks,
@@ -1210,12 +1215,12 @@ struct HfCandidateCreatorXic0Omegac0Mc {
12101215
aod::McParticles const& mcParticles,
12111216
aod::McCollisions const& mcColls,
12121217
aod::McCollisionLabels const& mcLabels,
1213-
McCollisionsFT0Ms const& collInfos,
1218+
McCollisionsNoCents const& collInfos,
12141219
BCsInfo const& bcs)
12151220
{
12161221
runXic0Omegac0Mc<CentralityEstimator::None, aod::hf_cand_xic0_omegac0::DecayType::OmegaczeroToOmegaPi>(candidates, tracks, mcParticles, collInfos, mcColls, mcLabels, bcs);
12171222
}
1218-
PROCESS_SWITCH(HfCandidateCreatorXic0Omegac0Mc, processMcOmegacToOmegaPi, "Run Omegac0 to omega pi MC process function - no centrality", true);
1223+
PROCESS_SWITCH(HfCandidateCreatorXic0Omegac0Mc, processMcOmegacToOmegaPi, "Run Omegac0 to omega pi MC process function - no centrality", false);
12191224

12201225
void processMcOmegacToOmegaPiFT0m(aod::HfCandToOmegaPi const& candidates,
12211226
aod::TracksWMc const& tracks,
@@ -1246,12 +1251,12 @@ struct HfCandidateCreatorXic0Omegac0Mc {
12461251
aod::McParticles const& mcParticles,
12471252
aod::McCollisions const& mcColls,
12481253
aod::McCollisionLabels const& mcLabels,
1249-
McCollisionsFT0Ms const& collInfos,
1254+
McCollisionsNoCents const& collInfos,
12501255
BCsInfo const& bcs)
12511256
{
12521257
runXic0Omegac0Mc<CentralityEstimator::None, aod::hf_cand_xic0_omegac0::DecayType::OmegaczeroToOmegaK>(candidates, tracks, mcParticles, collInfos, mcColls, mcLabels, bcs);
12531258
}
1254-
PROCESS_SWITCH(HfCandidateCreatorXic0Omegac0Mc, processMcOmegacToOmegaK, "Run Omegac0 to omega K MC process function - no centrality", true);
1259+
PROCESS_SWITCH(HfCandidateCreatorXic0Omegac0Mc, processMcOmegacToOmegaK, "Run Omegac0 to omega K MC process function - no centrality", false);
12551260

12561261
void processMcOmegacToOmegaKFT0m(aod::HfCandToOmegaK const& candidates,
12571262
aod::TracksWMc const& tracks,

0 commit comments

Comments
 (0)