Skip to content

Commit 7261bd3

Browse files
wefeng1110wefeng1110
authored
[PWGJE] Fix a bug in JetMatching function (#10164)
1 parent 219d934 commit 7261bd3

File tree

1 file changed

+56
-30
lines changed

1 file changed

+56
-30
lines changed

‎PWGJE/Tasks/jetSpectraCharged.cxx‎

Lines changed: 56 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -100,12 +100,15 @@ struct JetSpectraCharged {
100100
AxisSpec jetEtaAxis = {nBinsEta, -1.0, 1.0, "#eta"};
101101

102102
if (doprocessQC || doprocessQCWeighted) {
103+
registry.add("h_track_pt", "track #it{p}_{T} ; #it{p}_{T,track} (GeV/#it{c})", {HistType::kTH1F, {trackPtAxis}});
104+
registry.add("h2_track_eta_track_phi", "track eta vs. track phi; #eta; #phi; counts", {HistType::kTH2F, {trackEtaAxis, phiAxis}});
105+
}
106+
107+
if (doprocessCollisions || doprocessCollisionsWeighted) {
103108
registry.add("h_collisions", "event status;event status;entries", {HistType::kTH1F, {{4, 0.0, 4.0}}});
104109
registry.add("h2_centrality_occupancy", "centrality vs occupancy; centrality; occupancy", {HistType::kTH2F, {centralityAxis, {60, 0, 30000}}});
105110
registry.add("h_collisions_Zvertex", "position of collision ;#it{Z} (cm)", {HistType::kTH1F, {{300, -15.0, 15.0}}});
106-
registry.add("h_track_pt", "track #it{p}_{T} ; #it{p}_{T,track} (GeV/#it{c})", {HistType::kTH1F, {trackPtAxis}});
107-
registry.add("h2_track_eta_track_phi", "track eta vs. track phi; #eta; #phi; counts", {HistType::kTH2F, {trackEtaAxis, phiAxis}});
108-
if (doprocessQCWeighted) {
111+
if (doprocessCollisionsWeighted) {
109112
registry.add("h_collisions_weighted", "event status;event status;entries", {HistType::kTH1F, {{4, 0.0, 4.0}}});
110113
}
111114
}
@@ -120,7 +123,7 @@ struct JetSpectraCharged {
120123
registry.add("h2_jet_pt_jet_area", "jet #it{p}_{T,jet} vs. Area_{jet}; #it{p}_{T,jet} (GeV/#it{c}); Area_{jet}", {HistType::kTH2F, {jetPtAxis, {150, 0., 1.5}}});
121124
registry.add("h2_jet_pt_jet_ntracks", "jet #it{p}_{T,jet} vs. N_{jet tracks}; #it{p}_{T,jet} (GeV/#it{c}); N_{jet, tracks}", {HistType::kTH2F, {jetPtAxis, {200, -0.5, 199.5}}});
122125
registry.add("h2_jet_pt_track_pt", "jet #it{p}_{T,jet} vs. #it{p}_{T,track}; #it{p}_{T,jet} (GeV/#it{c}); #it{p}_{T,track} (GeV/#it{c})", {HistType::kTH2F, {jetPtAxis, trackPtAxis}});
123-
registry.add("h3_jet_pt_eta_phi", "jet pt vs. eta vs. phi", {HistType::kTH3F, {jetPtAxis, jetEtaAxis, phiAxis}});
126+
registry.add("h3_jet_pt_jet_eta_jet_phi", "jet pt vs. eta vs. phi", {HistType::kTH3F, {jetPtAxis, jetEtaAxis, phiAxis}});
124127
if (doprocessSpectraMCDWeighted) {
125128
registry.add("h_jet_phat", "jet #hat{p};#hat{p} (GeV/#it{c});entries", {HistType::kTH1F, {{1000, 0, 1000}}});
126129
registry.add("h_jet_phat_weighted", "jet #hat{p};#hat{p} (GeV/#it{c});entries", {HistType::kTH1F, {{1000, 0, 1000}}});
@@ -138,7 +141,7 @@ struct JetSpectraCharged {
138141
registry.add("h2_jet_pt_jet_ntracks_rhoareasubtracted", "jet #it{p}_{T,jet} vs. N_{jet tracks}; #it{p}_{T,jet} (GeV/#it{c}); N_{jet, tracks}", {HistType::kTH2F, {jetPtAxis, {200, -0.5, 199.5}}});
139142
registry.add("h2_jet_pt_jet_corr_pt_rhoareasubtracted", "jet #it{p}_{T,jet} vs. #it{p}_{T,corr}; #it{p}_{T,jet} (GeV/#it{c}); #it{p}_{T,corr} (GeV/#it{c})", {HistType::kTH2F, {jetPtAxis, jetPtAxisRhoAreaSub}});
140143
registry.add("h2_jet_pt_track_pt_rhoareasubtracted", "jet #it{p}_{T,jet} vs. #it{p}_{T,track}; #it{p}_{T,jet} (GeV/#it{c}); #it{p}_{T,track} (GeV/#it{c})", {HistType::kTH2F, {jetPtAxisRhoAreaSub, trackPtAxis}});
141-
registry.add("h3_jet_pt_eta_phi_rhoareasubtracted", "jet_pt_eta_phi_rhoareasubtracted", {HistType::kTH3F, {jetPtAxisRhoAreaSub, jetEtaAxis, phiAxis}});
144+
registry.add("h3_jet_pt_jet_eta_jet_phi_rhoareasubtracted", "jet_pt_eta_phi_rhoareasubtracted", {HistType::kTH3F, {jetPtAxisRhoAreaSub, jetEtaAxis, phiAxis}});
142145
}
143146

144147
if (doprocessSpectraMCP || doprocessSpectraMCPWeighted) {
@@ -157,7 +160,7 @@ struct JetSpectraCharged {
157160
registry.add("h2_jet_pt_part_jet_area_part", "part jet #it{p}_{T,jet} vs. Area_{jet}; #it{p}_{T,jet}^{part} (GeV/#it{c}); Area_{jet}^{part}", {HistType::kTH2F, {jetPtAxis, {150, 0., 1.5}}});
158161
registry.add("h2_jet_pt_part_jet_ntracks_part", "part jet #it{p}_{T,jet} vs. N_{jet tracks}; #it{p}_{T,jet}^{part} (GeV/#it{c}); N_{jet, tracks}^{part}", {HistType::kTH2F, {jetPtAxis, {200, -0.5, 199.5}}});
159162
registry.add("h2_jet_pt_part_track_pt_part", "part jet #it{p}_{T,jet} vs. #it{p}_{T,track}; #it{p}_{T,jet}^{part} (GeV/#it{c}); #it{p}_{T,track}^{part} (GeV/#it{c})", {HistType::kTH2F, {jetPtAxisRhoAreaSub, trackPtAxis}});
160-
registry.add("h3_jet_pt_eta_phi_part", "part jet pt vs. eta vs. phi", {HistType::kTH3F, {jetPtAxis, jetEtaAxis, phiAxis}});
163+
registry.add("h3_jet_pt_jet_eta_jet_phi_part", "part jet pt vs. eta vs. phi", {HistType::kTH3F, {jetPtAxis, jetEtaAxis, phiAxis}});
161164
if (doprocessSpectraMCPWeighted) {
162165
registry.add("h2_jet_ptcut_part", "p_{T} cut;p_{T,jet}^{part} (GeV/#it{c});N;entries", {HistType::kTH2F, {{300, 0, 300}, {20, 0, 5}}});
163166
registry.add("h_jet_phat_part_weighted", "jet #hat{p};#hat{p} (GeV/#it{c});entries", {HistType::kTH1F, {{1000, 0, 1000}}});
@@ -180,7 +183,7 @@ struct JetSpectraCharged {
180183
registry.add("h_jet_phi_part_rhoareasubtracted", "part jet #varphi;#varphi^{part}; counts", {HistType::kTH1F, {phiAxis}});
181184
registry.add("h2_jet_pt_part_jet_area_part_rhoareasubtracted", "part jet #it{p}_{T,jet} vs. Area_{jet}; #it{p}_{T,jet}^{part} (GeV/#it{c}); Area_{jet}^{part}", {HistType::kTH2F, {jetPtAxisRhoAreaSub, {150, 0., 1.5}}});
182185
registry.add("h2_jet_pt_part_jet_ntracks_part_rhoareasubtracted", "part jet #it{p}_{T,jet} vs. N_{jet tracks}; #it{p}_{T,jet}^{part} (GeV/#it{c}); N_{jet, tracks}{part}", {HistType::kTH2F, {jetPtAxisRhoAreaSub, {200, -0.5, 199.5}}});
183-
registry.add("h3_jet_pt_eta_phi_part_rhoareasubtracted", "part jet pt vs. eta vs.phi", {HistType::kTH3F, {jetPtAxisRhoAreaSub, jetEtaAxis, phiAxis}});
186+
registry.add("h3_jet_pt_jet_eta_jet_phi_part_rhoareasubtracted", "part jet pt vs. eta vs.phi", {HistType::kTH3F, {jetPtAxisRhoAreaSub, jetEtaAxis, phiAxis}});
184187
}
185188

186189
if (doprocessEvtWiseConstSubJetsData || doprocessEvtWiseConstSubJetsMCD) {
@@ -280,7 +283,7 @@ struct JetSpectraCharged {
280283
registry.fill(HIST("h2_centrality_jet_phi"), centrality, jet.phi(), weight);
281284
registry.fill(HIST("h2_jet_pt_jet_area"), jet.pt(), jet.area(), weight);
282285
registry.fill(HIST("h2_jet_pt_jet_ntracks"), jet.pt(), jet.tracksIds().size(), weight);
283-
registry.fill(HIST("h3_jet_pt_eta_phi"), jet.pt(), jet.eta(), jet.phi(), weight);
286+
registry.fill(HIST("h3_jet_pt_jet_eta_jet_phi"), jet.pt(), jet.eta(), jet.phi(), weight);
284287
}
285288

286289
for (const auto& constituent : jet.template tracks_as<aod::JetTracks>()) {
@@ -297,7 +300,7 @@ struct JetSpectraCharged {
297300
registry.fill(HIST("h_jet_pt_rhoareasubtracted"), jetcorrpt, weight);
298301
registry.fill(HIST("h2_centrality_jet_pt_rhoareasubtracted"), centrality, jetcorrpt, weight);
299302
registry.fill(HIST("h2_jet_pt_jet_corr_pt_rhoareasubtracted"), jet.pt(), jetcorrpt, weight);
300-
registry.fill(HIST("h3_jet_pt_eta_phi_rhoareasubtracted"), jetcorrpt, jet.eta(), jet.phi(), weight);
303+
registry.fill(HIST("h3_jet_pt_jet_eta_jet_phi_rhoareasubtracted"), jetcorrpt, jet.eta(), jet.phi(), weight);
301304
if (jetcorrpt > 0) {
302305
registry.fill(HIST("h_jet_eta_rhoareasubtracted"), jet.eta(), weight);
303306
registry.fill(HIST("h_jet_phi_rhoareasubtracted"), jet.phi(), weight);
@@ -321,7 +324,7 @@ struct JetSpectraCharged {
321324
registry.fill(HIST("h_jet_pt_part"), jet.pt(), weight);
322325
registry.fill(HIST("h_jet_eta_part"), jet.eta(), weight);
323326
registry.fill(HIST("h_jet_phi_part"), jet.phi(), weight);
324-
registry.fill(HIST("h3_jet_pt_eta_phi_part"), jet.pt(), jet.eta(), jet.phi(), weight);
327+
registry.fill(HIST("h3_jet_pt_jet_eta_jet_phi_part"), jet.pt(), jet.eta(), jet.phi(), weight);
325328
registry.fill(HIST("h2_jet_pt_part_jet_area_part"), jet.pt(), jet.area(), weight);
326329
registry.fill(HIST("h2_jet_pt_part_jet_ntracks_part"), jet.pt(), jet.tracksIds().size(), weight);
327330
}
@@ -338,7 +341,7 @@ struct JetSpectraCharged {
338341
// fill mcp jet histograms
339342
double jetcorrpt = jet.pt() - (rho * jet.area());
340343
registry.fill(HIST("h_jet_pt_part_rhoareasubtracted"), jetcorrpt, weight);
341-
registry.fill(HIST("h3_jet_pt_eta_phi_part_rhoareasubtracted"), jetcorrpt, jet.eta(), jet.phi(), weight);
344+
registry.fill(HIST("h3_jet_pt_jet_eta_jet_phi_part_rhoareasubtracted"), jetcorrpt, jet.eta(), jet.phi(), weight);
342345
if (jetcorrpt > 0) {
343346
registry.fill(HIST("h_jet_eta_part_rhoareasubtracted"), jet.eta(), weight);
344347
registry.fill(HIST("h_jet_phi_part_rhoareasubtracted"), jet.phi(), weight);
@@ -461,46 +464,32 @@ struct JetSpectraCharged {
461464
void processQC(soa::Filtered<aod::JetCollisions>::iterator const& collision,
462465
soa::Filtered<soa::Join<aod::JetTracks, aod::JTrackExtras>> const& tracks)
463466
{
464-
registry.fill(HIST("h_collisions"), 0.5);
465467
if (!jetderiveddatautilities::selectCollision(collision, eventSelectionBits)) {
466468
return;
467469
}
468-
registry.fill(HIST("h_collisions"), 1.5);
469470
if (collision.trackOccupancyInTimeRange() < trackOccupancyInTimeRangeMin || trackOccupancyInTimeRangeMax < collision.trackOccupancyInTimeRange()) {
470471
return;
471472
}
472-
registry.fill(HIST("h_collisions"), 2.5);
473-
registry.fill(HIST("h2_centrality_occupancy"), collision.centrality(), collision.trackOccupancyInTimeRange());
474-
registry.fill(HIST("h_collisions_Zvertex"), collision.posZ());
475-
476473
for (auto const& track : tracks) {
477474
if (!jetderiveddatautilities::selectTrack(track, trackSelection)) {
478475
continue;
479476
}
480477
fillTrackHistograms(track, collision.centrality());
481478
}
482479
}
483-
PROCESS_SWITCH(JetSpectraCharged, processQC, "collisions and track QC for Data and MCD", true);
480+
PROCESS_SWITCH(JetSpectraCharged, processQC, "collisions and track QC for Data and MCD", false);
484481

485482
void processQCWeighted(soa::Join<aod::JetCollisions, aod::JMcCollisionLbs>::iterator const& collision,
486483
aod::JetMcCollisions const&,
487484
soa::Filtered<soa::Join<aod::JetTracks, aod::JTrackExtras>> const& tracks)
488485
{
489486
float eventWeight = collision.mcCollision().weight();
490-
registry.fill(HIST("h_collisions"), 0.5);
491-
registry.fill(HIST("h_collisions_weighted"), 0.5, eventWeight);
492487
if (!jetderiveddatautilities::selectCollision(collision, eventSelectionBits)) {
493488
return;
494489
}
495-
registry.fill(HIST("h_collisions"), 1.5);
496-
registry.fill(HIST("h_collisions_weighted"), 1.5, eventWeight);
497490
if (collision.trackOccupancyInTimeRange() < trackOccupancyInTimeRangeMin || trackOccupancyInTimeRangeMax < collision.trackOccupancyInTimeRange()) {
498491
return;
499492
}
500-
registry.fill(HIST("h_collisions"), 2.5);
501-
registry.fill(HIST("h_collisions_weighted"), 2.5, eventWeight);
502-
registry.fill(HIST("h_collisions_Zvertex"), collision.posZ(), eventWeight);
503-
504493
for (auto const& track : tracks) {
505494
if (!jetderiveddatautilities::selectTrack(track, trackSelection)) {
506495
continue;
@@ -510,6 +499,43 @@ struct JetSpectraCharged {
510499
}
511500
PROCESS_SWITCH(JetSpectraCharged, processQCWeighted, "weighted collsions and tracks QC for MC", false);
512501

502+
void processCollisions(soa::Filtered<aod::JetCollisions>::iterator const& collision)
503+
{
504+
registry.fill(HIST("h_collisions"), 0.5);
505+
if (!jetderiveddatautilities::selectCollision(collision, eventSelectionBits)) {
506+
return;
507+
}
508+
registry.fill(HIST("h_collisions"), 1.5);
509+
if (collision.trackOccupancyInTimeRange() < trackOccupancyInTimeRangeMin || trackOccupancyInTimeRangeMax < collision.trackOccupancyInTimeRange()) {
510+
return;
511+
}
512+
registry.fill(HIST("h_collisions"), 2.5);
513+
registry.fill(HIST("h2_centrality_occupancy"), collision.centrality(), collision.trackOccupancyInTimeRange());
514+
registry.fill(HIST("h_collisions_Zvertex"), collision.posZ());
515+
}
516+
PROCESS_SWITCH(JetSpectraCharged, processCollisions, "collisions Data and MCD", true);
517+
518+
void processCollisionsWeighted(soa::Join<aod::JetCollisions, aod::JMcCollisionLbs>::iterator const& collision,
519+
aod::JetMcCollisions const&)
520+
{
521+
float eventWeight = collision.mcCollision().weight();
522+
registry.fill(HIST("h_collisions"), 0.5);
523+
registry.fill(HIST("h_collisions_weighted"), 0.5, eventWeight);
524+
if (!jetderiveddatautilities::selectCollision(collision, eventSelectionBits)) {
525+
return;
526+
}
527+
registry.fill(HIST("h_collisions"), 1.5);
528+
registry.fill(HIST("h_collisions_weighted"), 1.5, eventWeight);
529+
if (collision.trackOccupancyInTimeRange() < trackOccupancyInTimeRangeMin || trackOccupancyInTimeRangeMax < collision.trackOccupancyInTimeRange()) {
530+
return;
531+
}
532+
registry.fill(HIST("h_collisions"), 2.5);
533+
registry.fill(HIST("h_collisions_weighted"), 2.5, eventWeight);
534+
registry.fill(HIST("h2_centrality_occupancy"), collision.centrality(), collision.trackOccupancyInTimeRange());
535+
registry.fill(HIST("h_collisions_Zvertex"), collision.posZ(), eventWeight);
536+
}
537+
PROCESS_SWITCH(JetSpectraCharged, processCollisionsWeighted, "weighted collsions for MCD", false);
538+
513539
void processSpectraData(soa::Filtered<aod::JetCollisions>::iterator const& collision,
514540
soa::Join<aod::ChargedJets, aod::ChargedJetConstituents> const& jets,
515541
aod::JetTracks const&)
@@ -660,7 +686,7 @@ struct JetSpectraCharged {
660686
occupancyIsGood = true;
661687
}
662688
} else {
663-
for (auto& collision : collisions) {
689+
for (auto const& collision : collisions) {
664690
if (jetderiveddatautilities::selectCollision(collision, eventSelectionBits)) {
665691
hasSel8Coll = true;
666692
}
@@ -717,7 +743,7 @@ struct JetSpectraCharged {
717743
bool hasSel8Coll = false;
718744
bool centralityIsGood = false;
719745
bool occupancyIsGood = false;
720-
for (auto& collision : collisions) {
746+
for (auto const& collision : collisions) {
721747
if (jetderiveddatautilities::selectCollision(collision, eventSelectionBits)) {
722748
hasSel8Coll = true;
723749
}
@@ -770,7 +796,7 @@ struct JetSpectraCharged {
770796
registry.fill(HIST("h_mcColl_counts"), 2.5);
771797

772798
bool hasSel8Coll = false;
773-
for (auto& collision : collisions) {
799+
for (auto const& collision : collisions) {
774800
if (jetderiveddatautilities::selectCollision(collision, eventSelectionBits)) {
775801
hasSel8Coll = true;
776802
}
@@ -932,7 +958,7 @@ struct JetSpectraCharged {
932958
if (!isAcceptedJet<aod::JetTracks>(mcdjet)) {
933959
continue;
934960
}
935-
fillGeoMatchedCorrHistograms<ChargedMCDMatchedJets::iterator, ChargedMCPMatchedJets>(mcdjet, collision.rho());
961+
fillGeoMatchedCorrHistograms<ChargedMCDMatchedJets::iterator, ChargedMCPMatchedJets>(mcdjet, collision.rho(), mcrho);
936962
}
937963
}
938964
}

0 commit comments

Comments
 (0)