Skip to content

Commit f5c9042

Browse files
monamelopmonamelop
committed
[PWGJE] fix MC efficiency workflow
1 parent 616a803 commit f5c9042

1 file changed

Lines changed: 19 additions & 32 deletions

File tree

‎PWGJE/Tasks/jetDsSpecSubs.cxx‎

Lines changed: 19 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,12 @@ struct JetDsSpecSubs {
8080

8181
using DsDataJets = soa::Join<aod::DsChargedJets, aod::DsChargedJetConstituents>;
8282
using DsMCDJets = soa::Join<aod::DsChargedMCDetectorLevelJets, aod::DsChargedMCDetectorLevelJetConstituents, aod::DsChargedMCDetectorLevelJetsMatchedToDsChargedMCParticleLevelJets>;
83-
using DsMCPJets = soa::Join<aod::DsChargedMCParticleLevelJets, aod::DsChargedMCParticleLevelJetConstituents, aod::DsChargedMCDetectorLevelJetsMatchedToDsChargedMCParticleLevelJets>;
83+
//using DsMCPJets = soa::Join<aod::DsChargedMCParticleLevelJets, aod::DsChargedMCParticleLevelJetConstituents, aod::DsChargedMCDetectorLevelJetsMatchedToDsChargedMCParticleLevelJets>;
8484

8585
// Slices for access to proper HF MCD jet collision that is associated to MCCollision
8686
PresliceUnsorted<aod::JetCollisionsMCD> collisionsPerMCCollisionPreslice = aod::jmccollisionlb::mcCollisionId;
8787
Preslice<DsMCDJets> dsMCDJetsPerEXPCollisionPreslice = aod::jet::collisionId;
88-
Preslice<DsMCPJets> dsMCPJetsPerMCCollisionPreslice = aod::jet::mcCollisionId;
88+
//Preslice<DsMCPJets> dsMCPJetsPerMCCollisionPreslice = aod::jet::mcCollisionId;
8989

9090
// Configurables
9191
Configurable<float> vertexZCut{"vertexZCut", 10.0f, "Accepted z-vertex range"};
@@ -165,21 +165,21 @@ struct JetDsSpecSubs {
165165
{"hSparse_ds_mcd", ";m_{D_{S}}^{rec};#it{p}_{T,D_{S}}^{det};#it{p}_{T,jet}^{det};z^{D_{S},jet}_{||, det};#DeltaR_{D_{S},jet}^{det}", {HistType::kTHnSparseF, {{60, 1.7, 2.1}, {60, 0., 100.}, {60, 0., 100.}, {60, 0., 2.}, {60, 0., 1.0}}}},
166166

167167
// MC particle-level histograms
168-
{"h_dsjet_counter_mcp", ";type;counts", {HistType::kTH1F, {{3, 0., 3.}}}},
169-
{"h_jet_pt_mcp", "particle-level jet pT;#it{p}_{T,jet}^{part} (GeV/#it{c});entries", {HistType::kTH1F, {{200, 0., 200.}}}},
170-
{"h_jet_eta_mcp", "particle-level jet #eta;#eta_{jet}^{part};entries", {HistType::kTH1F, {{100, -1.0, 1.0}}}},
171-
{"h_jet_phi_mcp", "particle-level jet #phi;#phi_{jet}^{part};entries", {HistType::kTH1F, {{80, -1.0, 7.}}}},
172-
173-
{"h_ds_pt_mcp", ";#it{p}_{T,D_{S}}^{part} (GeV/#it{c});entries", {HistType::kTH1F, {{1000, 0., 100.}}}},
174-
{"h_ds_eta_mcp", ";#eta_{D_{S}}^{part};entries", {HistType::kTH1F, {{250, -1., 1.}}}},
175-
{"h_ds_phi_mcp", ";#phi_{D_{S}}^{part};entries", {HistType::kTH1F, {{250, -1., 7.}}}},
176-
177-
{"h_ds_jet_pt_mcp", ";#it{p}_{T,D_{S} jet}^{part} (GeV/#it{c});entries", {HistType::kTH1F, {{1000, 0., 100.}}}},
178-
{"h_ds_jet_eta_mcp", ";#eta_{D_{S} jet}^{part};entries", {HistType::kTH1F, {{250, -1., 1.}}}},
179-
{"h_ds_jet_phi_mcp", ";#phi_{D_{S} jet}^{part};entries", {HistType::kTH1F, {{250, -1., 7.}}}},
180-
{"h_ds_jet_projection_mcp", ";z^{D_{S},jet}_{||, part};entries", {HistType::kTH1F, {{1000, 0., 2.}}}},
181-
{"h_ds_jet_distance_mcp", ";#DeltaR_{D_{S},jet}^{part};entries", {HistType::kTH1F, {{1000, 0., 1.}}}},
182-
{"hSparse_ds_mcp", ";#it{p}_{T,D_{S}}^{part};#it{p}_{T,jet}^{part};z^{D_{S},jet}_{||, part};#DeltaR_{D_{S},jet}^{part}", {HistType::kTHnSparseF, {{60, 0., 100.}, {60, 0., 100.}, {60, 0., 2.}, {60, 0., 1.0}}}},
168+
//{"h_dsjet_counter_mcp", ";type;counts", {HistType::kTH1F, {{3, 0., 3.}}}},
169+
//{"h_jet_pt_mcp", "particle-level jet pT;#it{p}_{T,jet}^{part} (GeV/#it{c});entries", {HistType::kTH1F, {{200, 0., 200.}}}},
170+
//{"h_jet_eta_mcp", "particle-level jet #eta;#eta_{jet}^{part};entries", {HistType::kTH1F, {{100, -1.0, 1.0}}}},
171+
//{"h_jet_phi_mcp", "particle-level jet #phi;#phi_{jet}^{part};entries", {HistType::kTH1F, {{80, -1.0, 7.}}}},
172+
173+
//{"h_ds_pt_mcp", ";#it{p}_{T,D_{S}}^{part} (GeV/#it{c});entries", {HistType::kTH1F, {{1000, 0., 100.}}}},
174+
//{"h_ds_eta_mcp", ";#eta_{D_{S}}^{part};entries", {HistType::kTH1F, {{250, -1., 1.}}}},
175+
//{"h_ds_phi_mcp", ";#phi_{D_{S}}^{part};entries", {HistType::kTH1F, {{250, -1., 7.}}}},
176+
177+
//{"h_ds_jet_pt_mcp", ";#it{p}_{T,D_{S} jet}^{part} (GeV/#it{c});entries", {HistType::kTH1F, {{1000, 0., 100.}}}},
178+
//{"h_ds_jet_eta_mcp", ";#eta_{D_{S} jet}^{part};entries", {HistType::kTH1F, {{250, -1., 1.}}}},
179+
//{"h_ds_jet_phi_mcp", ";#phi_{D_{S} jet}^{part};entries", {HistType::kTH1F, {{250, -1., 7.}}}},
180+
//{"h_ds_jet_projection_mcp", ";z^{D_{S},jet}_{||, part};entries", {HistType::kTH1F, {{1000, 0., 2.}}}},
181+
//{"h_ds_jet_distance_mcp", ";#DeltaR_{D_{S},jet}^{part};entries", {HistType::kTH1F, {{1000, 0., 1.}}}},
182+
//{"hSparse_ds_mcp", ";#it{p}_{T,D_{S}}^{part};#it{p}_{T,jet}^{part};z^{D_{S},jet}_{||, part};#DeltaR_{D_{S},jet}^{part}", {HistType::kTHnSparseF, {{60, 0., 100.}, {60, 0., 100.}, {60, 0., 2.}, {60, 0., 1.0}}}},
183183
}};
184184
//========
185185
// INIT
@@ -195,11 +195,6 @@ struct JetDsSpecSubs {
195195
hData->GetXaxis()->SetBinLabel(2, "Ds candidates");
196196
hData->GetXaxis()->SetBinLabel(3, "Ds jets with >=1 cand.");
197197

198-
auto hMcp = registry.get<TH1>(HIST("h_dsjet_counter_mcp"));
199-
hMcp->GetXaxis()->SetBinLabel(1, "Ds-jet entries");
200-
hMcp->GetXaxis()->SetBinLabel(2, "Ds particles");
201-
hMcp->GetXaxis()->SetBinLabel(3, "Ds jets with >=1 particle");
202-
203198
// Labels
204199
auto mcCollisionCounter = registry.get<TH1>(HIST("McEffCol"));
205200
mcCollisionCounter->GetXaxis()->SetBinLabel(BinMCColCntr::All, "mccollisions");
@@ -388,14 +383,12 @@ struct JetDsSpecSubs {
388383
//==============
389384
template <typename MCDJetsPerMCCollissionPreslice,
390385
typename DsMCDJets,
391-
typename CandidatesMCD,
392-
typename CandidatesMCP>
386+
typename CandidatesMCD>
393387
void analyseMonteCarloEfficiency(MCDJetsPerMCCollissionPreslice const& jetmcdpreslice,
394388
aod::JetMcCollisions const& mccollisions,
395389
aod::JetCollisionsMCD const& collisions,
396390
DsMCDJets const& mcdjets,
397391
CandidatesMCD const& /*mcdCandidates*/,
398-
CandidatesMCP const& /*mcpCandidates*/,
399392
aod::JetTracks const& tracks)
400393
{
401394
for (const auto& mccollision : mccollisions) {
@@ -480,23 +473,17 @@ struct JetDsSpecSubs {
480473
void processMonteCarloEfficiencyDs(aod::JetMcCollisions const& mccollisions,
481474
aod::JetCollisionsMCD const& collisions,
482475
DsMCDJets const& mcdjets,
483-
DsMCPJets const& mcpjets,
484476
aod::CandidatesDsMCD const& mcdCandidates,
485-
aod::CandidatesDsMCP const& mcpCandidates,
486477
aod::JetTracks const& jettracks)
487478
{
488479

489480
analyseMonteCarloEfficiency<Preslice<DsMCDJets>,
490481
DsMCDJets,
491-
DsMCPJets,
492-
aod::CandidatesDsMCD,
493-
aod::CandidatesDsMCP>(dsMCDJetsPerEXPCollisionPreslice,
482+
aod::CandidatesDsMCD>(dsMCDJetsPerEXPCollisionPreslice,
494483
mccollisions,
495484
collisions,
496485
mcdjets,
497-
mcpjets,
498486
mcdCandidates,
499-
mcpCandidates,
500487
jettracks);
501488
}
502489
PROCESS_SWITCH(JetDsSpecSubs, processMonteCarloEfficiencyDs, "Non-matched and matched MC Ds and jets", false);

0 commit comments

Comments
 (0)