Skip to content

Commit 876b605

Browse files
vkuceravkucera
committed
Merge branch 'master' into fixes-PWGEM
2 parents 823590e + 6dd77a5 commit 876b605

130 files changed

Lines changed: 1764 additions & 962 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Common/Tools/Multiplicity/MultModule.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1233,11 +1233,11 @@ class MultModule
12331233
// invoke loading only for requested centralities
12341234
if (internalOpts.mEnabledTables[kCentFV0As])
12351235
getccdb(fv0aInfo, internalOpts.generatorName);
1236-
if (internalOpts.mEnabledTables[kCentFT0Ms])
1236+
if (internalOpts.mEnabledTables[kCentFT0Ms] || internalOpts.mEnabledTables[kBCCentFT0Ms])
12371237
getccdb(ft0mInfo, internalOpts.generatorName);
1238-
if (internalOpts.mEnabledTables[kCentFT0As])
1238+
if (internalOpts.mEnabledTables[kCentFT0As] || internalOpts.mEnabledTables[kBCCentFT0As])
12391239
getccdb(ft0aInfo, internalOpts.generatorName);
1240-
if (internalOpts.mEnabledTables[kCentFT0Cs])
1240+
if (internalOpts.mEnabledTables[kCentFT0Cs] || internalOpts.mEnabledTables[kBCCentFT0Cs])
12411241
getccdb(ft0cInfo, internalOpts.generatorName);
12421242
if (internalOpts.mEnabledTables[kCentFT0CVariant1s])
12431243
getccdb(ft0cVariant1Info, internalOpts.generatorName);

‎PWGCF/GenericFramework/Tasks/flowGenericFramework.cxx‎

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -311,17 +311,7 @@ struct FlowGenericFramework {
311311
int histBin;
312312
int flag; // just store the enum
313313
};
314-
std::vector<EventCut> eventcutflags = {
315-
{cfgEventCutFlags.cfgNoSameBunchPileupCut, kNoSameBunchPileup, o2::aod::evsel::kNoSameBunchPileup},
316-
{cfgEventCutFlags.cfgIsGoodZvtxFT0vsPV, kIsGoodZvtxFT0vsPV, o2::aod::evsel::kIsGoodZvtxFT0vsPV},
317-
{cfgEventCutFlags.cfgNoCollInTimeRangeStandard, kNoCollInTimeRangeStandard, o2::aod::evsel::kNoCollInTimeRangeStandard},
318-
{cfgEventCutFlags.cfgNoCollInRofStandard, kNoCollInRofStandard, o2::aod::evsel::kNoCollInRofStandard},
319-
{cfgEventCutFlags.cfgNoHighMultCollInPrevRof, kNoHighMultCollInPrevRof, o2::aod::evsel::kNoHighMultCollInPrevRof},
320-
{cfgEventCutFlags.cfgNoTimeFrameBorder, kNoTimeFrameBorder, o2::aod::evsel::kIsVertexITSTPC},
321-
{cfgEventCutFlags.cfgNoITSROFrameBorder, kNoITSROFrameBorder, o2::aod::evsel::kIsGoodITSLayersAll},
322-
{cfgEventCutFlags.cfgIsVertexITSTPC, kIsVertexITSTPC, o2::aod::evsel::kNoTimeFrameBorder},
323-
{cfgEventCutFlags.cfgIsGoodITSLayersAll, kIsGoodITSLayersAll, o2::aod::evsel::kNoITSROFrameBorder},
324-
};
314+
std::vector<EventCut> eventcutflags;
325315
enum Particles {
326316
PIONS,
327317
KAONS,
@@ -483,6 +473,20 @@ struct FlowGenericFramework {
483473
LOGF(info, "pt-pt subevent: {%.1f,%.1f}", etamin, etamax);
484474
}
485475

476+
// Setup event cuts
477+
eventcutflags.push_back({cfgEventCutFlags.cfgNoSameBunchPileupCut, kNoSameBunchPileup, o2::aod::evsel::kNoSameBunchPileup});
478+
eventcutflags.push_back({cfgEventCutFlags.cfgIsGoodZvtxFT0vsPV, kIsGoodZvtxFT0vsPV, o2::aod::evsel::kIsGoodZvtxFT0vsPV});
479+
eventcutflags.push_back({cfgEventCutFlags.cfgNoCollInTimeRangeStandard, kNoCollInTimeRangeStandard, o2::aod::evsel::kNoCollInTimeRangeStandard});
480+
eventcutflags.push_back({cfgEventCutFlags.cfgNoCollInRofStandard, kNoCollInRofStandard, o2::aod::evsel::kNoCollInRofStandard});
481+
eventcutflags.push_back({cfgEventCutFlags.cfgNoHighMultCollInPrevRof, kNoHighMultCollInPrevRof, o2::aod::evsel::kNoHighMultCollInPrevRof});
482+
eventcutflags.push_back({cfgEventCutFlags.cfgNoTimeFrameBorder, kNoTimeFrameBorder, o2::aod::evsel::kIsVertexITSTPC});
483+
eventcutflags.push_back({cfgEventCutFlags.cfgNoITSROFrameBorder, kNoITSROFrameBorder, o2::aod::evsel::kIsGoodITSLayersAll});
484+
eventcutflags.push_back({cfgEventCutFlags.cfgIsVertexITSTPC, kIsVertexITSTPC, o2::aod::evsel::kNoTimeFrameBorder});
485+
eventcutflags.push_back({cfgEventCutFlags.cfgIsGoodITSLayersAll, kIsGoodITSLayersAll, o2::aod::evsel::kNoITSROFrameBorder});
486+
for (const auto& cut : eventcutflags) {
487+
LOGF(info, "Flag %d is %senabled", cut.histBin, (cut.enabled) ? "" : "not ");
488+
}
489+
486490
AxisSpec phiAxis = {o2::analysis::gfw::phibins, o2::analysis::gfw::philow, o2::analysis::gfw::phiup, "#phi"};
487491
AxisSpec phiModAxis = {100, 0, constants::math::PI / 9, "fmod(#varphi,#pi/9)"};
488492
AxisSpec etaAxis = {o2::analysis::gfw::etabins, -cfgEta, cfgEta, "#eta"};
@@ -1771,13 +1775,13 @@ struct FlowGenericFramework {
17711775
registry.fill(HIST("K0/PiMinusTPC_K0"), negtrack.pt(), negtrack.tpcNSigmaKa());
17721776
registry.fill(HIST("K0/PiMinusTOF_K0"), negtrack.pt(), negtrack.tofNSigmaKa());
17731777

1774-
registry.fill(HIST("K0/hK0s"), 1);
1778+
registry.fill(HIST("K0/hK0s"), 0.5, 1);
17751779
if (cfgUsePIDEfficiencies) {
17761780
double weffDaughter1 = getEfficiency(postrack, 1);
17771781
double weffDaughter2 = getEfficiency(negtrack, 1);
17781782
weff = weffDaughter1 * weffDaughter2;
17791783
if (weff > 0)
1780-
registry.fill(HIST("K0/hK0s_corrected"), weff);
1784+
registry.fill(HIST("K0/hK0s_corrected"), 0.5, weff);
17811785
}
17821786

17831787
return true;
@@ -1859,13 +1863,13 @@ struct FlowGenericFramework {
18591863
registry.fill(HIST("Lambda/PiMinusTPC_L"), negtrack.pt(), negtrack.tpcNSigmaKa());
18601864
registry.fill(HIST("Lambda/PiMinusTOF_L"), negtrack.pt(), negtrack.tofNSigmaKa());
18611865

1862-
registry.fill(HIST("Lambda/hLambdas"), 1);
1866+
registry.fill(HIST("Lambda/hLambdas"), 0.5, 1);
18631867
if (cfgUsePIDEfficiencies) {
18641868
double weffDaughter1 = getEfficiency(postrack, 3);
18651869
double weffDaughter2 = getEfficiency(negtrack, 1);
18661870
weff = weffDaughter1 * weffDaughter2;
18671871
if (weff > 0)
1868-
registry.fill(HIST("Lambda/hLambdas_corrected"), weff);
1872+
registry.fill(HIST("Lambda/hLambdas_corrected"), 0.5, weff);
18691873
}
18701874
}
18711875
if (isAL) {
@@ -1877,13 +1881,13 @@ struct FlowGenericFramework {
18771881
registry.fill(HIST("Lambda/PrMinusTPC_AL"), negtrack.pt(), negtrack.tpcNSigmaKa());
18781882
registry.fill(HIST("Lambda/PrMinusTOF_AL"), negtrack.pt(), negtrack.tofNSigmaKa());
18791883

1880-
registry.fill(HIST("Lambda/hLambdas"), 1);
1884+
registry.fill(HIST("Lambda/hLambdas"), 0.5, 1);
18811885
if (cfgUsePIDEfficiencies) {
18821886
double weffDaughter1 = getEfficiency(postrack, 1);
18831887
double weffDaughter2 = getEfficiency(negtrack, 3);
18841888
weff = weffDaughter1 * weffDaughter2;
18851889
if (weff > 0)
1886-
registry.fill(HIST("Lambda/hLambdas_corrected"), weff);
1890+
registry.fill(HIST("Lambda/hLambdas_corrected"), 0.5, weff);
18871891
}
18881892
}
18891893
return true;

‎PWGEM/Dilepton/Core/DileptonMC.h‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2222,6 +2222,9 @@ struct DileptonMC {
22222222
if (cfgEventGeneratorType >= 0 && mccollision_from_neg.getSubGeneratorId() != cfgEventGeneratorType) {
22232223
continue;
22242224
}
2225+
if (cfgRequireTrueAssociation && (mcpos.emmceventId() != collision.emmceventId() || mcneg.emmceventId() != collision.emmceventId())) {
2226+
continue;
2227+
}
22252228

22262229
if (isPairOK(pos, neg, cut, tracks)) {
22272230
passed_pairIds.emplace_back(std::make_pair(pos.globalIndex(), neg.globalIndex()));
@@ -2238,6 +2241,9 @@ struct DileptonMC {
22382241
if (cfgEventGeneratorType >= 0 && mccollision_from_pos2.getSubGeneratorId() != cfgEventGeneratorType) {
22392242
continue;
22402243
}
2244+
if (cfgRequireTrueAssociation && (mcpos1.emmceventId() != collision.emmceventId() || mcpos2.emmceventId() != collision.emmceventId())) {
2245+
continue;
2246+
}
22412247

22422248
if (isPairOK(pos1, pos2, cut, tracks)) {
22432249
passed_pairIds.emplace_back(std::make_pair(pos1.globalIndex(), pos2.globalIndex()));
@@ -2254,6 +2260,9 @@ struct DileptonMC {
22542260
if (cfgEventGeneratorType >= 0 && mccollision_from_neg2.getSubGeneratorId() != cfgEventGeneratorType) {
22552261
continue;
22562262
}
2263+
if (cfgRequireTrueAssociation && (mcneg1.emmceventId() != collision.emmceventId() || mcneg2.emmceventId() != collision.emmceventId())) {
2264+
continue;
2265+
}
22572266
if (isPairOK(neg1, neg2, cut, tracks)) {
22582267
passed_pairIds.emplace_back(std::make_pair(neg1.globalIndex(), neg2.globalIndex()));
22592268
}

‎PWGEM/Dilepton/Core/SingleTrackQC.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -331,9 +331,9 @@ struct SingleTrackQC {
331331
fRegistry.add("Track/positive/hChi2_Pt", "chi2;p_{T,#mu} (GeV/c);chi2/ndf", o2::framework::HistType::kTH2F, {{200, 0, 10}, {200, 0.0f, 20}}, false);
332332
fRegistry.add("Track/positive/hChi2MFT_Pt", "chi2MFT;p_{T,#mu} (GeV/c);chi2/ndf", o2::framework::HistType::kTH2F, {{200, 0, 10}, {200, 0.0f, 20}}, false);
333333
fRegistry.add("Track/positive/hChi2MatchMCHMID_Pt", "chi2 match MCH-MID;p_{T,#mu} (GeV/c);chi2/ndf", o2::framework::HistType::kTH2F, {{200, 0, 10}, {200, 0.0f, 20}}, false);
334-
fRegistry.add("Track/positive/hChi2MatchMCHMFT_Pt", "chi2 match MCH-MFT;p_{T,#mu} (GeV/c);chi2/ndf", o2::framework::HistType::kTH2F, {{200, 0, 10}, {100, 0.0f, 50}}, false);
334+
fRegistry.add("Track/positive/hChi2MatchMCHMFT_Pt", "chi2 match MCH-MFT;p_{T,#mu} (GeV/c);chi2/ndf", o2::framework::HistType::kTH2F, {{200, 0, 10}, {200, 0.0f, 100}}, false);
335335
fRegistry.add("Track/positive/hMFTClusterMap", "MFT cluster map", o2::framework::HistType::kTH1F, {{1024, -0.5, 1023.5}}, false);
336-
fRegistry.add("Track/positive/hdR_Chi2MatchMCHMFT", "dr vs. matching chi2 MCH-MFT;chi2 match MCH-MFT;#DeltaR;", o2::framework::HistType::kTH2F, {{200, 0, 50}, {200, 0, 0.5}}, false);
336+
fRegistry.add("Track/positive/hdR_Chi2MatchMCHMFT", "dr vs. matching chi2 MCH-MFT;chi2 match MCH-MFT;#DeltaR;", o2::framework::HistType::kTH2F, {{200, 0.0f, 100}, {200, 0, 0.5}}, false);
337337
fRegistry.addClone("Track/positive/", "Track/negative/");
338338
}
339339
}

‎PWGEM/Dilepton/Core/SingleTrackQCMC.h‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ struct SingleTrackQCMC {
358358
}
359359
if (cfgFillQA) {
360360
fRegistry.add("Track/PromptLF/positive/hEtaPhi_MatchMCHMID", "#eta vs. #varphi of matched MCHMID", o2::framework::HistType::kTH2F, {{180, 0, 2.f * M_PI}, {80, -4, -2}}, false);
361-
fRegistry.add("Track/PromptLF/positive/hdEtadPhi", "#Delta#eta vs. #Delta#varphi between MFT-MCH-MID and MCH-MID;#varphi_{sa} - #varphi_{gl} (rad.);#eta_{sa} - #eta_{gl}", o2::framework::HistType::kTH2F, {{90, -M_PI / 4, M_PI / 4}, {100, -0.5, +0.5}}, false);
361+
fRegistry.add("Track/PromptLF/positive/hsDelta", "diff. between GL and associated SA;p_{T}^{gl} (GeV/c);(p_{T}^{sa} - p_{T}^{gl})/p_{T}^{gl};#Delta#eta;#Delta#varphi (rad.);", o2::framework::HistType::kTHnSparseF, {axis_pt, {100, -0.5, +0.5}, {100, -0.5, +0.5}, {90, -M_PI / 4, M_PI / 4}}, false);
362362
fRegistry.add("Track/PromptLF/positive/hQoverPt", "q/pT;q/p_{T} (GeV/c)^{-1}", o2::framework::HistType::kTH1F, {{1000, -5, 5}}, false);
363363
fRegistry.add("Track/PromptLF/positive/hTrackType", "track type", o2::framework::HistType::kTH1F, {{6, -0.5f, 5.5}}, false);
364364
fRegistry.add("Track/PromptLF/positive/hDCAxy", "DCAxy;DCA_{xy} (cm)", o2::framework::HistType::kTH1F, {{100, 0.f, 1.0f}}, false);
@@ -377,12 +377,12 @@ struct SingleTrackQCMC {
377377
fRegistry.add("Track/PromptLF/positive/hChi2_Pt", "chi2;p_{T,#mu} (GeV/c);chi2/ndf", o2::framework::HistType::kTH2F, {{200, 0, 10}, {200, 0.0f, 20}}, false);
378378
fRegistry.add("Track/PromptLF/positive/hChi2MFT_Pt", "chi2MFT;p_{T,#mu} (GeV/c);chi2/ndf", o2::framework::HistType::kTH2F, {{200, 0, 10}, {200, 0.0f, 20}}, false);
379379
fRegistry.add("Track/PromptLF/positive/hChi2MatchMCHMID_Pt", "chi2 match MCH-MID;p_{T,#mu} (GeV/c);chi2/ndf", o2::framework::HistType::kTH2F, {{200, 0, 10}, {200, 0.0f, 20}}, false);
380-
fRegistry.add("Track/PromptLF/positive/hChi2MatchMCHMFT_Pt", "chi2 match MCH-MFT;p_{T,#mu} (GeV/c);chi2/ndf", o2::framework::HistType::kTH2F, {{200, 0, 10}, {100, 0.0f, 50}}, false);
380+
fRegistry.add("Track/PromptLF/positive/hChi2MatchMCHMFT_Pt", "chi2 match MCH-MFT;p_{T,#mu} (GeV/c);chi2/ndf", o2::framework::HistType::kTH2F, {{200, 0, 10}, {200, 0.0f, 100}}, false);
381381
fRegistry.add("Track/PromptLF/positive/hMFTClusterMap", "MFT cluster map", o2::framework::HistType::kTH1F, {{1024, -0.5, 1023.5}}, false);
382382
fRegistry.add("Track/PromptLF/positive/hPtGen_DeltaPtOverPtGen", "muon p_{T} resolution;p_{T}^{gen} (GeV/c);(p_{T}^{rec} - p_{T}^{gen})/p_{T}^{gen}", o2::framework::HistType::kTH2F, {{200, 0, 10}, {200, -1.0f, 1.0f}}, true);
383383
fRegistry.add("Track/PromptLF/positive/hPtGen_DeltaEta", "muon #eta resolution;p_{T}^{gen} (GeV/c);#eta^{rec} - #eta^{gen}", o2::framework::HistType::kTH2F, {{200, 0, 10}, {100, -0.05f, 0.05f}}, true);
384384
fRegistry.add("Track/PromptLF/positive/hPtGen_DeltaPhi", "muon #varphi resolution;p_{T}^{gen} (GeV/c);#varphi^{rec} - #varphi^{gen} (rad.)", o2::framework::HistType::kTH2F, {{200, 0, 10}, {100, -0.05f, 0.05f}}, true);
385-
fRegistry.add("Track/PromptLF/positive/hdR_Chi2MatchMCHMFT", "dr vs. matching chi2 MCH-MFT;chi2 match MCH-MFT;#DeltaR;", o2::framework::HistType::kTH2F, {{200, 0, 50}, {200, 0, 0.5}}, false);
385+
fRegistry.add("Track/PromptLF/positive/hdR_Chi2MatchMCHMFT", "dr vs. matching chi2 MCH-MFT;chi2 match MCH-MFT;#DeltaR;", o2::framework::HistType::kTH2F, {{200, 0.0f, 100}, {200, 0, 0.5}}, false);
386386
}
387387
fRegistry.addClone("Track/PromptLF/positive/", "Track/PromptLF/negative/");
388388
fRegistry.addClone("Track/PromptLF/", "Track/NonPromptLF/");
@@ -741,6 +741,7 @@ struct SingleTrackQCMC {
741741
float dca_xy = o2::aod::pwgem::dilepton::utils::emtrackutil::fwdDcaXYinSigma(track);
742742
float deta = track.etaMatchedMCHMID() - track.eta();
743743
float dphi = track.phiMatchedMCHMID() - track.phi();
744+
float reldpt = (track.ptMatchedMCHMID() - track.pt()) / track.pt();
744745
o2::math_utils::bringToPMPi(dphi);
745746

746747
float weight = 1.f;
@@ -756,7 +757,7 @@ struct SingleTrackQCMC {
756757
}
757758
if (cfgFillQA) {
758759
fRegistry.fill(HIST("Track/") + HIST(lepton_source_types[lepton_source_id]) + HIST("positive/hEtaPhi_MatchMCHMID"), track.phiMatchedMCHMID(), track.etaMatchedMCHMID(), weight);
759-
fRegistry.fill(HIST("Track/") + HIST(lepton_source_types[lepton_source_id]) + HIST("positive/hdEtadPhi"), dphi, deta, weight);
760+
fRegistry.fill(HIST("Track/") + HIST(lepton_source_types[lepton_source_id]) + HIST("positive/hsDelta"), track.pt(), reldpt, deta, dphi, weight);
760761
fRegistry.fill(HIST("Track/") + HIST(lepton_source_types[lepton_source_id]) + HIST("positive/hQoverPt"), track.sign() / track.pt());
761762
fRegistry.fill(HIST("Track/") + HIST(lepton_source_types[lepton_source_id]) + HIST("positive/hTrackType"), track.trackType());
762763
fRegistry.fill(HIST("Track/") + HIST(lepton_source_types[lepton_source_id]) + HIST("positive/hDCAxy"), std::sqrt(std::pow(track.fwdDcaX(), 2) + std::pow(track.fwdDcaY(), 2)));
@@ -789,7 +790,7 @@ struct SingleTrackQCMC {
789790
}
790791
if (cfgFillQA) {
791792
fRegistry.fill(HIST("Track/") + HIST(lepton_source_types[lepton_source_id]) + HIST("negative/hEtaPhi_MatchMCHMID"), track.phiMatchedMCHMID(), track.etaMatchedMCHMID(), weight);
792-
fRegistry.fill(HIST("Track/") + HIST(lepton_source_types[lepton_source_id]) + HIST("negative/hdEtadPhi"), dphi, deta, weight);
793+
fRegistry.fill(HIST("Track/") + HIST(lepton_source_types[lepton_source_id]) + HIST("negative/hsDelta"), track.pt(), reldpt, deta, dphi, weight);
793794
fRegistry.fill(HIST("Track/") + HIST(lepton_source_types[lepton_source_id]) + HIST("negative/hQoverPt"), track.sign() / track.pt());
794795
fRegistry.fill(HIST("Track/") + HIST(lepton_source_types[lepton_source_id]) + HIST("negative/hTrackType"), track.trackType());
795796
fRegistry.fill(HIST("Track/") + HIST(lepton_source_types[lepton_source_id]) + HIST("negative/hDCAxy"), std::sqrt(std::pow(track.fwdDcaX(), 2) + std::pow(track.fwdDcaY(), 2)));
@@ -1055,6 +1056,9 @@ struct SingleTrackQCMC {
10551056
if (cfgEventGeneratorType >= 0 && mccollision_from_track.getSubGeneratorId() != cfgEventGeneratorType) {
10561057
continue;
10571058
}
1059+
if (cfgRequireTrueAssociation && (mctrack.emmceventId() != collision.emmceventId())) {
1060+
continue;
1061+
}
10581062

10591063
if (dielectroncuts.cfg_pid_scheme == static_cast<int>(DielectronCut::PIDSchemes::kPIDML)) {
10601064
if (!cut.template IsSelectedTrack<false>(track)) {
@@ -1074,6 +1078,9 @@ struct SingleTrackQCMC {
10741078
if (cfgEventGeneratorType >= 0 && mccollision_from_track.getSubGeneratorId() != cfgEventGeneratorType) {
10751079
continue;
10761080
}
1081+
if (cfgRequireTrueAssociation && (mctrack.emmceventId() != collision.emmceventId())) {
1082+
continue;
1083+
}
10771084
if (!cut.template IsSelectedTrack<false>(track)) {
10781085
continue;
10791086
}

‎PWGEM/Dilepton/Tasks/checkMCPairTemplate.cxx‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2804,6 +2804,9 @@ struct checkMCPairTemplate {
28042804
if (cfgEventGeneratorType >= 0 && mccollision_from_neg.getSubGeneratorId() != cfgEventGeneratorType) {
28052805
continue;
28062806
}
2807+
if (cfgRequireTrueAssociation && (mcpos.emmceventId() != collision.emmceventId() || mcneg.emmceventId() != collision.emmceventId())) {
2808+
continue;
2809+
}
28072810

28082811
if (isPairOK(pos, neg, cut, tracks)) {
28092812
passed_pairIds.emplace_back(std::make_pair(pos.globalIndex(), neg.globalIndex()));
@@ -2820,6 +2823,9 @@ struct checkMCPairTemplate {
28202823
if (cfgEventGeneratorType >= 0 && mccollision_from_pos2.getSubGeneratorId() != cfgEventGeneratorType) {
28212824
continue;
28222825
}
2826+
if (cfgRequireTrueAssociation && (mcpos1.emmceventId() != collision.emmceventId() || mcpos2.emmceventId() != collision.emmceventId())) {
2827+
continue;
2828+
}
28232829

28242830
if (isPairOK(pos1, pos2, cut, tracks)) {
28252831
passed_pairIds.emplace_back(std::make_pair(pos1.globalIndex(), pos2.globalIndex()));
@@ -2836,6 +2842,9 @@ struct checkMCPairTemplate {
28362842
if (cfgEventGeneratorType >= 0 && mccollision_from_neg2.getSubGeneratorId() != cfgEventGeneratorType) {
28372843
continue;
28382844
}
2845+
if (cfgRequireTrueAssociation && (mcneg1.emmceventId() != collision.emmceventId() || mcneg2.emmceventId() != collision.emmceventId())) {
2846+
continue;
2847+
}
28392848
if (isPairOK(neg1, neg2, cut, tracks)) {
28402849
passed_pairIds.emplace_back(std::make_pair(neg1.globalIndex(), neg2.globalIndex()));
28412850
}

‎PWGHF/HFC/DataModel/CorrelationTables.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,8 @@ DECLARE_SOA_TABLE(LcRecoInfo, "AOD", "LCRECOINFO", //! Lc candidates Reconstruct
218218
aod::hf_correlation_lc_hadron::MLc,
219219
aod::hf_correlation_lc_hadron::PtLc,
220220
aod::hf_correlation_lc_hadron::MlScoreBkg,
221-
aod::hf_correlation_lc_hadron::MlScorePrompt);
221+
aod::hf_correlation_lc_hadron::MlScorePrompt,
222+
aod::hf_correlation_lc_hadron::PoolBin);
222223

223224
DECLARE_SOA_TABLE(LcGenInfo, "AOD", "LCGENOINFO", //! Lc candidates Generated Information
224225
aod::hf_correlation_lc_hadron::IsPrompt);

0 commit comments

Comments
 (0)