Skip to content

Commit 814296b

Browse files
DelloStrittoDelloStritto
authored
[PWGHF,PWGJE] Add INEL > 0 to event selection utils (#17687)
1 parent 0ef4a0d commit 814296b

30 files changed

Lines changed: 302 additions & 267 deletions

‎PWGHF/D2H/TableProducer/dataCreatorCharmHadPiReduced.cxx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
#include "Common/DataModel/Centrality.h"
3838
#include "Common/DataModel/CollisionAssociationTables.h"
3939
#include "Common/DataModel/EventSelection.h"
40+
#include "Common/DataModel/Multiplicity.h"
4041
#include "Common/DataModel/PIDResponseTOF.h"
4142
#include "Common/DataModel/PIDResponseTPC.h"
4243
#include "Common/DataModel/Qvectors.h"
@@ -244,7 +245,7 @@ struct HfDataCreatorCharmHadPiReduced {
244245
using CandsDstarFiltered = soa::Filtered<soa::Join<aod::HfCandDstarsWPid, aod::HfD0FromDstar, aod::HfSelDstarToD0Pi>>;
245246
using CandsDstarFilteredWithMl = soa::Filtered<soa::Join<aod::HfCandDstarsWPid, aod::HfD0FromDstar, aod::HfSelDstarToD0Pi, aod::HfMlDstarToD0Pi>>;
246247

247-
using CollisionsWCent = soa::Join<aod::Collisions, aod::EvSels, aod::CentFT0Ms, aod::CentFT0Cs>;
248+
using CollisionsWCent = soa::Join<aod::Collisions, aod::EvSels, aod::PVMults, aod::CentFT0Ms, aod::CentFT0Cs>;
248249
using CollisionsWCentAndMcLabels = soa::Join<CollisionsWCent, aod::McCollisionLabels>;
249250
using CollisionsWCentAndQvectors = soa::Join<CollisionsWCent, aod::QvectorFT0Cs, aod::QvectorFT0As, aod::QvectorFT0Ms, aod::QvectorTPCposs, aod::QvectorTPCnegs, aod::QvectorTPCalls>;
250251
using BCsInfo = soa::Join<aod::BCsWithTimestamps, aod::BcSels>;

‎PWGHF/D2H/TableProducer/dataCreatorCharmResoToD0Reduced.cxx‎

Lines changed: 28 additions & 27 deletions
Large diffs are not rendered by default.

‎PWGHF/D2H/TableProducer/dataCreatorCharmResoToDplusReduced.cxx‎

Lines changed: 26 additions & 25 deletions
Large diffs are not rendered by default.

‎PWGHF/D2H/TableProducer/dataCreatorCharmResoToDstarReduced.cxx‎

Lines changed: 26 additions & 25 deletions
Large diffs are not rendered by default.

‎PWGHF/D2H/TableProducer/dataCreatorHiddenCharmReduced.cxx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
#include "Common/Core/ZorroSummary.h"
2828
#include "Common/DataModel/CollisionAssociationTables.h"
2929
#include "Common/DataModel/EventSelection.h"
30+
#include "Common/DataModel/Multiplicity.h"
3031
#include "Common/DataModel/PIDResponseTOF.h"
3132
#include "Common/DataModel/PIDResponseTPC.h"
3233
#include "Common/DataModel/TrackSelectionTables.h"
@@ -289,7 +290,7 @@ struct HfDataCreatorHiddenCharmReduced {
289290
return isSelectedPid(track);
290291
}
291292

292-
void processEtaCTrack(soa::Join<aod::Collisions, aod::EvSels> const& collisions,
293+
void processEtaCTrack(soa::Join<aod::Collisions, aod::EvSels, aod::PVMults> const& collisions,
293294
aod::TrackAssoc const& trackIndices,
294295
TracksWithPID const& tracks,
295296
aod::BCsWithTimestamps const&)

‎PWGHF/D2H/TableProducer/dataCreatorJpsiHadReduced.cxx‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
#include "Common/Core/trackUtilities.h"
3535
#include "Common/DataModel/CollisionAssociationTables.h"
3636
#include "Common/DataModel/EventSelection.h"
37+
#include "Common/DataModel/Multiplicity.h"
3738
#include "Common/DataModel/PIDResponseTOF.h"
3839
#include "Common/DataModel/PIDResponseTPC.h"
3940
#include "Common/DataModel/TrackSelectionTables.h"
@@ -191,7 +192,7 @@ struct HfDataCreatorJpsiHadReduced {
191192
using TracksPid = soa::Join<aod::pidTPCFullPi, aod::pidTOFFullPi, aod::pidTPCFullKa, aod::pidTOFFullKa, aod::pidTPCFullPr, aod::pidTOFFullPr, aod::pidTPCFullEl, aod::pidTOFFullEl>;
192193
using TracksPidWithSel = soa::Join<aod::TracksWCovDcaExtra, TracksPid, aod::TrackSelection>;
193194
using TracksPidWithSelAndMc = soa::Join<TracksPidWithSel, aod::McTrackLabels>;
194-
using CollisionsWCMcLabels = soa::Join<aod::Collisions, aod::McCollisionLabels, aod::EvSels>;
195+
using CollisionsWCMcLabels = soa::Join<aod::Collisions, aod::McCollisionLabels, aod::EvSels, aod::PVMults>;
195196
using BCsInfo = soa::Join<aod::BCsWithTimestamps, aod::BcSels>;
196197

197198
Preslice<aod::HfCand2ProngWPid> candsJpsiPerCollision = aod::track_association::collisionId;
@@ -1479,7 +1480,7 @@ struct HfDataCreatorJpsiHadReduced {
14791480
// }
14801481
}
14811482

1482-
void processJpsiKData(soa::Join<aod::Collisions, aod::EvSels> const& collisions,
1483+
void processJpsiKData(soa::Join<aod::Collisions, aod::EvSels, aod::PVMults> const& collisions,
14831484
aod::HfCand2ProngWPid const& candsJpsi,
14841485
aod::TrackAssoc const& trackIndices,
14851486
TracksPidWithSel const& tracks,
@@ -1507,7 +1508,7 @@ struct HfDataCreatorJpsiHadReduced {
15071508
}
15081509
PROCESS_SWITCH(HfDataCreatorJpsiHadReduced, processJpsiKData, "Process J/Psi K without MC info", true);
15091510

1510-
void processJpsiPhiData(soa::Join<aod::Collisions, aod::EvSels> const& collisions,
1511+
void processJpsiPhiData(soa::Join<aod::Collisions, aod::EvSels, aod::PVMults> const& collisions,
15111512
aod::HfCand2ProngWPid const& candsJpsi,
15121513
aod::TrackAssoc const& trackIndices,
15131514
TracksPidWithSel const& tracks,
@@ -1535,7 +1536,7 @@ struct HfDataCreatorJpsiHadReduced {
15351536
}
15361537
PROCESS_SWITCH(HfDataCreatorJpsiHadReduced, processJpsiPhiData, "Process J/Psi phi without MC info", false);
15371538

1538-
void processJpsiK0StarData(soa::Join<aod::Collisions, aod::EvSels> const& collisions,
1539+
void processJpsiK0StarData(soa::Join<aod::Collisions, aod::EvSels, aod::PVMults> const& collisions,
15391540
aod::HfCand2ProngWPid const& candsJpsi,
15401541
aod::TrackAssoc const& trackIndices,
15411542
TracksPidWithSel const& tracks,

‎PWGHF/D2H/Tasks/taskCd.cxx‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#include "Common/Core/RecoDecay.h"
2525
#include "Common/DataModel/Centrality.h"
2626
#include "Common/DataModel/EventSelection.h"
27+
#include "Common/DataModel/Multiplicity.h"
2728
#include "Common/DataModel/PIDResponseITS.h"
2829
#include "Common/DataModel/PIDResponseTOF.h"
2930
#include "Common/DataModel/PIDResponseTPC.h"
@@ -242,12 +243,12 @@ struct HfTaskCd {
242243

243244
SliceCache cache;
244245

245-
using CollisionsWEvSel = soa::Join<aod::Collisions, aod::EvSels>;
246-
using CollisionsMc = soa::Join<aod::Collisions, aod::McCollisionLabels, aod::EvSels>;
247-
using CollisionsWithEvSelFT0C = soa::Join<aod::Collisions, aod::EvSels, aod::CentFT0Cs>;
248-
using CollisionsMcWithEvSelFT0C = soa::Join<aod::Collisions, aod::McCollisionLabels, aod::EvSels, aod::CentFT0Cs>;
249-
using CollisionsWithEvSelFT0M = soa::Join<aod::Collisions, aod::EvSels, aod::CentFT0Ms>;
250-
using CollisionsMcWithEvSelFT0M = soa::Join<aod::Collisions, aod::McCollisionLabels, aod::EvSels, aod::CentFT0Ms>;
246+
using CollisionsWEvSel = soa::Join<aod::Collisions, aod::EvSels, aod::PVMults>;
247+
using CollisionsMc = soa::Join<aod::Collisions, aod::McCollisionLabels, aod::EvSels, aod::PVMults>;
248+
using CollisionsWithEvSelFT0C = soa::Join<aod::Collisions, aod::EvSels, aod::PVMults, aod::CentFT0Cs>;
249+
using CollisionsMcWithEvSelFT0C = soa::Join<aod::Collisions, aod::McCollisionLabels, aod::EvSels, aod::PVMults, aod::CentFT0Cs>;
250+
using CollisionsWithEvSelFT0M = soa::Join<aod::Collisions, aod::EvSels, aod::PVMults, aod::CentFT0Ms>;
251+
using CollisionsMcWithEvSelFT0M = soa::Join<aod::Collisions, aod::McCollisionLabels, aod::EvSels, aod::PVMults, aod::CentFT0Ms>;
251252

252253
using CdCandidates = soa::Filtered<soa::Join<aod::HfCand3Prong, aod::HfSelCd, aod::HfCand3ProngWPidPiKaDe>>;
253254
using CdCandidatesMc = soa::Filtered<soa::Join<aod::HfCand3Prong, aod::HfSelCd, aod::HfCand3ProngWPidPiKaDe, aod::HfCand3ProngMcRec>>;

‎PWGHF/D2H/Tasks/taskCharmPolarisation.cxx‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
#include "Common/Core/RecoDecay.h"
3030
#include "Common/DataModel/Centrality.h"
3131
#include "Common/DataModel/EventSelection.h"
32+
#include "Common/DataModel/Multiplicity.h"
3233
#include "Common/DataModel/Qvectors.h"
3334

3435
#include <CCDB/BasicCCDBManager.h>
@@ -226,9 +227,9 @@ struct HfTaskCharmPolarisation {
226227
HfEventSelection hfEvSel; // event selection and monitoring
227228
o2::framework::Service<o2::ccdb::BasicCCDBManager> ccdb{};
228229

229-
using CollisionsWithMcLabels = soa::SmallGroups<soa::Join<aod::Collisions, aod::EvSels, aod::McCollisionLabels>>;
230-
using CollisionsWithMcLabelsAndCent = soa::SmallGroups<soa::Join<aod::Collisions, aod::EvSels, aod::McCollisionLabels, aod::CentFT0Ms, aod::CentFT0Cs>>;
231-
using CollsWithQVecs = soa::Join<aod::Collisions, aod::EvSels, aod::QvectorFT0Cs, aod::QvectorFT0As, aod::QvectorFT0Ms, aod::QvectorFV0As, aod::QvectorBPoss, aod::QvectorBNegs, aod::QvectorBTots, aod::CentFT0Ms, aod::CentFT0Cs>;
230+
using CollisionsWithMcLabels = soa::SmallGroups<soa::Join<aod::Collisions, aod::EvSels, aod::PVMults, aod::McCollisionLabels>>;
231+
using CollisionsWithMcLabelsAndCent = soa::SmallGroups<soa::Join<aod::Collisions, aod::EvSels, aod::PVMults, aod::McCollisionLabels, aod::CentFT0Ms, aod::CentFT0Cs>>;
232+
using CollsWithQVecs = soa::Join<aod::Collisions, aod::EvSels, aod::PVMults, aod::QvectorFT0Cs, aod::QvectorFT0As, aod::QvectorFT0Ms, aod::QvectorFV0As, aod::QvectorBPoss, aod::QvectorBNegs, aod::QvectorBTots, aod::CentFT0Ms, aod::CentFT0Cs>;
232233
using TracksWithMcLabels = soa::Join<aod::Tracks, aod::TracksExtra, aod::McTrackLabels>;
233234
using TracksWithExtra = soa::Join<aod::Tracks, aod::TracksExtra>;
234235

‎PWGHF/D2H/Tasks/taskD0.cxx‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
#include "Common/Core/RecoDecay.h"
3333
#include "Common/DataModel/Centrality.h"
3434
#include "Common/DataModel/EventSelection.h"
35+
#include "Common/DataModel/Multiplicity.h"
3536
#include "Common/DataModel/TrackSelectionTables.h"
3637

3738
#include <CCDB/BasicCCDBManager.h>
@@ -120,10 +121,10 @@ struct HfTaskD0 {
120121
using D0CandidatesMlKF = soa::Filtered<soa::Join<aod::HfCand2Prong, aod::HfSelD0, aod::HfMlD0, aod::HfCand2ProngKF>>;
121122
using D0CandidatesMlMcKF = soa::Filtered<soa::Join<aod::HfCand2Prong, aod::HfSelD0, aod::HfMlD0, aod::HfCand2ProngKF, aod::HfCand2ProngMcRec>>;
122123

123-
using Collisions = soa::Join<aod::Collisions, aod::EvSels>;
124-
using CollisionsCent = soa::Join<aod::Collisions, aod::EvSels, aod::CentFT0Ms, aod::CentFT0Cs>;
125-
using CollisionsWithMcLabels = soa::Join<aod::Collisions, aod::McCollisionLabels, aod::EvSels>;
126-
using CollisionsWithMcLabelsCent = soa::Join<aod::Collisions, aod::McCollisionLabels, aod::EvSels, aod::CentFT0Ms, aod::CentFT0Cs>;
124+
using Collisions = soa::Join<aod::Collisions, aod::EvSels, aod::PVMults>;
125+
using CollisionsCent = soa::Join<aod::Collisions, aod::EvSels, aod::PVMults, aod::CentFT0Ms, aod::CentFT0Cs>;
126+
using CollisionsWithMcLabels = soa::Join<aod::Collisions, aod::McCollisionLabels, aod::EvSels, aod::PVMults>;
127+
using CollisionsWithMcLabelsCent = soa::Join<aod::Collisions, aod::McCollisionLabels, aod::EvSels, aod::PVMults, aod::CentFT0Ms, aod::CentFT0Cs>;
127128
using TracksSelQuality = soa::Join<aod::TracksExtra, aod::TracksWMc>;
128129
using TracksWPid = soa::Join<o2::aod::FullTracks, aod::TracksDCA, o2::aod::TrackSelection, aod::TracksPidPi, aod::PidTpcTofFullPi, aod::TracksPidKa, aod::PidTpcTofFullKa, aod::TracksPidPr, aod::PidTpcTofFullPr>;
129130
// using TracksWithExtra = o2::soa::Join<o2::aod::FullTracks, o2::aod::TrackSelection>;
@@ -1388,7 +1389,7 @@ struct HfTaskD0 {
13881389
PROCESS_SWITCH(HfTaskD0, processMcWithKFParticleMl, "Process MC with KFParticle and ML selections", false);
13891390
// TODO: add the processMcWithKFParticleMlCent
13901391

1391-
void processDataWithDCAFitterNWithUpc(soa::Join<aod::Collisions, aod::EvSels> const& collisions,
1392+
void processDataWithDCAFitterNWithUpc(soa::Join<aod::Collisions, aod::EvSels, aod::PVMults> const& collisions,
13921393
aod::BcFullInfos const& bcs,
13931394
D0Candidates const&,
13941395
aod::TracksWExtra const&,
@@ -1403,7 +1404,7 @@ struct HfTaskD0 {
14031404
}
14041405
PROCESS_SWITCH(HfTaskD0, processDataWithDCAFitterNWithUpc, "Process real data with DCAFitterN w/o ML with UPC", false);
14051406

1406-
void processDataWithDCAFitterNMlWithUpc(soa::Join<aod::Collisions, aod::EvSels> const& collisions,
1407+
void processDataWithDCAFitterNMlWithUpc(soa::Join<aod::Collisions, aod::EvSels, aod::PVMults> const& collisions,
14071408
aod::BcFullInfos const& bcs,
14081409
D0CandidatesMl const&,
14091410
aod::TracksWExtra const&,

‎PWGHF/D2H/Tasks/taskDplus.cxx‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
#include "Common/Core/RecoDecay.h"
3636
#include "Common/DataModel/Centrality.h"
3737
#include "Common/DataModel/EventSelection.h"
38+
#include "Common/DataModel/Multiplicity.h"
3839

3940
#include <CCDB/BasicCCDBManager.h>
4041
#include <CommonConstants/PhysicsConstants.h>
@@ -100,8 +101,8 @@ struct HfTaskDplus {
100101
using CandDplusMcRecoWithMl = soa::Filtered<soa::Join<aod::HfCand3Prong, aod::HfSelDplusToPiKPi, aod::HfCand3ProngMcRec, aod::HfMlDplusToPiKPi>>;
101102
using CandDplusMcGen = soa::Join<aod::McParticles, aod::HfCand3ProngMcGen>;
102103

103-
using CollisionsCent = soa::Join<aod::Collisions, aod::EvSels, aod::CentFT0Ms, aod::CentFT0Cs>;
104-
using McRecoCollisionsCent = soa::Join<aod::Collisions, aod::McCollisionLabels, aod::EvSels, aod::CentFT0Ms, aod::CentFT0Cs>;
104+
using CollisionsCent = soa::Join<aod::Collisions, aod::EvSels, aod::PVMults, aod::CentFT0Ms, aod::CentFT0Cs>;
105+
using McRecoCollisionsCent = soa::Join<aod::Collisions, aod::McCollisionLabels, aod::EvSels, aod::PVMults, aod::CentFT0Ms, aod::CentFT0Cs>;
105106

106107
Filter filterDplusFlag = (o2::aod::hf_track_index::hfflag & static_cast<uint8_t>(BIT(aod::hf_cand_3prong::DecayType::DplusToPiKPi))) != static_cast<uint8_t>(0);
107108

@@ -864,7 +865,7 @@ struct HfTaskDplus {
864865
}
865866
PROCESS_SWITCH(HfTaskDplus, processMcWithMl, "Process MC with ML", false);
866867

867-
void processDataWithUpc(soa::Join<aod::Collisions, aod::EvSels> const& collisions,
868+
void processDataWithUpc(soa::Join<aod::Collisions, aod::EvSels, aod::PVMults> const& collisions,
868869
aod::BcFullInfos const& bcs,
869870
CandDplusData const& selectedDplusCandidates,
870871
aod::Tracks const&,
@@ -877,7 +878,7 @@ struct HfTaskDplus {
877878
}
878879
PROCESS_SWITCH(HfTaskDplus, processDataWithUpc, "Process real data w/o ML with UPC", false);
879880

880-
void processDataWithMlWithUpc(soa::Join<aod::Collisions, aod::EvSels> const& collisions,
881+
void processDataWithMlWithUpc(soa::Join<aod::Collisions, aod::EvSels, aod::PVMults> const& collisions,
881882
aod::BcFullInfos const& bcs,
882883
CandDplusDataWithMl const& selectedDplusCandidatesMl,
883884
aod::Tracks const&,

0 commit comments

Comments
 (0)