Skip to content
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.

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

[PWGDQ] Add track propagation for pairs in dqefficiency task #7614

Merged
merged 1 commit into from
Sep 8, 2024
Merged
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
20 changes: 17 additions & 3 deletions PWGDQ/Tasks/dqEfficiency_withAssoc.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -874,6 +874,8 @@ struct AnalysisPrefilterSelection {
Configurable<std::string> fConfigPrefilterTrackCut{"cfgPrefilterTrackCut", "", "Prefilter track cut"};
Configurable<std::string> fConfigPrefilterPairCut{"cfgPrefilterPairCut", "", "Prefilter pair cut"};
Configurable<std::string> fConfigTrackCuts{"cfgTrackCuts", "", "Track cuts for which to run the prefilter"};
// Track related options
Configurable<bool> fPropTrack{"cfgPropTrack", true, "Propgate tracks to associated collision to recalculate DCA and momentum vector"};

std::map<uint32_t, uint32_t> fPrefilterMap;
AnalysisCompositeCut* fPairCut;
Expand Down Expand Up @@ -938,8 +940,8 @@ struct AnalysisPrefilterSelection {
VarManager::SetupTwoProngFwdDCAFitter(5.0f, true, 200.0f, 1.0e-3f, 0.9f, true);
}

template <uint32_t TTrackFillMap, typename TTracks>
void runPrefilter(soa::Join<aod::ReducedTracksAssoc, aod::BarrelTrackCuts> const& assocs, TTracks const& /*tracks*/)
template <uint32_t TTrackFillMap, typename TEvent, typename TTracks>
void runPrefilter(TEvent const& event, soa::Join<aod::ReducedTracksAssoc, aod::BarrelTrackCuts> const& assocs, TTracks const& /*tracks*/)
{

for (auto& [assoc1, assoc2] : o2::soa::combinations(assocs, assocs)) {
Expand All @@ -964,6 +966,9 @@ struct AnalysisPrefilterSelection {

// compute pair quantities
VarManager::FillPair<VarManager::kDecayToEE, TTrackFillMap>(track1, track2);
if (fPropTrack) {
VarManager::FillPairCollision<VarManager::kDecayToEE, TTrackFillMap>(event, track1, track2);
}
// if the pair fullfils the criteria, add an entry into the prefilter map for the two tracks
if (fPairCut->IsSelected(VarManager::fgValues)) {
if (fPrefilterMap.find(track1.globalIndex()) == fPrefilterMap.end() && track1Candidate > 0) {
Expand All @@ -984,7 +989,7 @@ struct AnalysisPrefilterSelection {
for (auto& event : events) {
auto groupedAssocs = assocs.sliceBy(trackAssocsPerCollision, event.globalIndex());
if (groupedAssocs.size() > 1) {
runPrefilter<gkTrackFillMap>(groupedAssocs, tracks);
runPrefilter<gkTrackFillMap>(event, groupedAssocs, tracks);
}
}
uint32_t mymap = -1;
Expand Down Expand Up @@ -1056,6 +1061,9 @@ struct AnalysisSameEventPairing {
Configurable<std::string> fConfigMCGenSignals{"cfgBarrelMCGenSignals", "", "Comma separated list of MC signals (generated)"};
Configurable<bool> fConfigSkimSignalOnly{"fConfigSkimSignalOnly", false, "Configurable to select only matched candidates"};

// Track related options
Configurable<bool> fPropTrack{"cfgPropTrack", true, "Propgate tracks to associated collision to recalculate DCA and momentum vector"};

Service<o2::ccdb::BasicCCDBManager> fCCDB;

// Filter filterEventSelected = aod::dqanalysisflags::isEventSelected & uint32_t(1);
Expand Down Expand Up @@ -1442,6 +1450,9 @@ struct AnalysisSameEventPairing {
}

VarManager::FillPair<TPairType, TTrackFillMap>(t1, t2);
if (fPropTrack) {
VarManager::FillPairCollision<TPairType, TTrackFillMap>(event, t1, t2);
}
if constexpr (TTwoProngFitter) {
VarManager::FillPairVertexing<TPairType, TEventFillMap, TTrackFillMap>(event, t1, t2, fConfigPropToPCA);
}
Expand Down Expand Up @@ -1490,6 +1501,9 @@ struct AnalysisSameEventPairing {
}

VarManager::FillPair<TPairType, TTrackFillMap>(t1, t2);
if (fPropTrack) {
VarManager::FillPairCollision<TPairType, TTrackFillMap>(event, t1, t2);
}
if constexpr (TTwoProngFitter) {
VarManager::FillPairVertexing<TPairType, TEventFillMap, TTrackFillMap>(event, t1, t2, fConfigPropToPCA);
}
Expand Down
Loading