Skip to content

Commit 2d80e02

Browse files
wefeng1110wefeng1110
authored
Adjust the PR format for the jetSpectraCharged.cxx
1 parent 31c334c commit 2d80e02

File tree

1 file changed

+33
-35
lines changed

1 file changed

+33
-35
lines changed

‎PWGJE/Tasks/jetSpectraCharged.cxx‎

Lines changed: 33 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ struct JetSpectraChargedTask {
105105
registry.add("h_jet_pt", "jet pT;#it{p}_{T,jet} (GeV/#it{c}); counts", {HistType::kTH1F, {jetPtAxisRhoAreaSub}});
106106
registry.add("h_jet_eta", "jet eta;#eta; counts", {HistType::kTH1F, {jetEtaAxis}});
107107
registry.add("h_jet_phi", "jet phi;#phi; counts", {HistType::kTH1F, {PhiAxis}});
108-
if(doprocessQCWeighted){
108+
if (doprocessQCWeighted){
109109
registry.add("h_collisions_weighted", "event status;event status;entries", {HistType::kTH1F, {{4, 0.0, 4.0}}});
110110
}
111111
}
@@ -120,7 +120,7 @@ struct JetSpectraChargedTask {
120120
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}});
121121
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}});
122122
registry.add("h3_jet_pt_eta_phi_rhoareasubtracted", "jet_pt_eta_phi_rhoareasubtracted", {HistType::kTH3F, {jetPtAxisRhoAreaSub, jetEtaAxis, PhiAxis}});
123-
if(doprocessSpectraMCDWeighted){
123+
if (doprocessSpectraMCDWeighted){
124124
registry.add("h_jet_phat", "jet #hat{p};#hat{p} (GeV/#it{c});entries", {HistType::kTH1F, {{1000, 0, 1000}}});
125125
registry.add("h_jet_phat_weighted", "jet #hat{p};#hat{p} (GeV/#it{c});entries", {HistType::kTH1F, {{1000, 0, 1000}}});
126126
}
@@ -132,23 +132,23 @@ struct JetSpectraChargedTask {
132132
}
133133

134134
if (doprocessJetsMatched || doprocessJetsMatchedWeighted) {
135-
if(checkGeoMatched){
135+
if (checkGeoMatched){
136136
registry.add("h2_jet_pt_tag_jet_pt_base_matchedgeo", "pT tag vs. pT base;#it{p}_{T,jet}^{tag} (GeV/#it{c});#it{p}_{T,jet}^{base} (GeV/#it{c})", {HistType::kTH2F, {jetPtAxis, jetPtAxis}});
137137
registry.add("h2_jet_eta_tag_jet_eta_base_matchedgeo", "Eta tag vs. Eta base;#eta_{jet}^{tag};#eta_{jet}^{base}", {HistType::kTH2F, {jetEtaAxis, jetEtaAxis}});
138138
registry.add("h2_jet_phi_tag_jet_phi_base_matchedgeo", "Phi tag vs. Phi base;#varphi_{jet}^{tag};#varphi_{jet}^{base}", {HistType::kTH2F, {PhiAxis, PhiAxis}});
139139
registry.add("h2_jet_ntracks_tag_jet_ntracks_base_matchedgeo", "Ntracks tag vs. Ntracks base;N_{jet tracks}^{tag};N_{jet tracks}^{base}", {HistType::kTH2F, {{200, -0.5, 199.5}, {200, -0.5, 199.5}}});
140140
registry.add("h2_jet_pt_tag_jet_pt_diff_matchedgeo", "jet tag pT vs. delta pT / jet tag pt;#it{p}_{T,jet}^{tag} (GeV/#it{c}); (#it{p}_{T,jet}^{tag} (GeV/#it{c}) - #it{p}_{T,jet}^{base} (GeV/#it{c})) / #it{p}_{T,jet}^{tag} (GeV/#it{c})", {HistType::kTH2F, {jetPtAxis, {1000, -5.0, 2.0}}});
141141
registry.add("h2_jet_pt_base_jet_pt_diff_matchedgeo", "jet base pT vs. delta pT / jet base pt;#it{p}_{T,jet}^{tag} (GeV/#it{c}); (#it{p}_{T,jet}^{tag} (GeV/#it{c}) - #it{p}_{T,jet}^{base} (GeV/#it{c})) / #it{p}_{T,jet}^{tag} (GeV/#it{c})", {HistType::kTH2F, {jetPtAxis, {1000, -5.0, 2.0}}});
142142
}
143-
if(checkPtMatched){
143+
if (checkPtMatched){
144144
registry.add("h2_jet_pt_tag_jet_pt_base_matchedpt", "pT tag vs. pT base;#it{p}_{T,jet}^{tag} (GeV/#it{c});#it{p}_{T,jet}^{base} (GeV/#it{c})", {HistType::kTH2F, {jetPtAxis, jetPtAxis}});
145145
registry.add("h2_jet_eta_tag_jet_eta_base_matchedpt", "Eta tag vs. Eta base;#eta_{jet}^{tag};#eta_{jet}^{base}", {HistType::kTH2F, {jetEtaAxis, jetEtaAxis}});
146146
registry.add("h2_jet_phi_tag_jet_phi_base_matchedpt", "Phi tag vs. Phi base;#varphi_{jet}^{tag};#varphi_{jet}^{base}", {HistType::kTH2F, {PhiAxis, PhiAxis}});
147147
registry.add("h2_jet_ntracks_tag_jet_ntracks_base_matchedpt", "Ntracks tag vs. Ntracks base;N_{jet tracks}^{tag};N_{jet tracks}^{base}", {HistType::kTH2F, {{200, -0.5, 199.5}, {200, -0.5, 199.5}}});
148148
registry.add("h2_jet_pt_tag_jet_pt_diff_matchedpt", "jet tag pT vs. delta pT / jet tag pt;#it{p}_{T,jet}^{tag} (GeV/#it{c}); (#it{p}_{T,jet}^{tag} (GeV/#it{c}) - #it{p}_{T,jet}^{base} (GeV/#it{c})) / #it{p}_{T,jet}^{tag} (GeV/#it{c})", {HistType::kTH2F, {jetPtAxis, {1000, -5.0, 2.0}}});
149149
registry.add("h2_jet_pt_base_jet_pt_diff_matchedpt", "jet base pT vs. delta pT / jet base pt;#it{p}_{T,jet}^{tag} (GeV/#it{c}); (#it{p}_{T,jet}^{tag} (GeV/#it{c}) - #it{p}_{T,jet}^{base} (GeV/#it{c})) / #it{p}_{T,jet}^{tag} (GeV/#it{c})", {HistType::kTH2F, {jetPtAxis, {1000, -5.0, 2.0}}});
150150
}
151-
if(checkGeoPtMatched){
151+
if (checkGeoPtMatched){
152152
registry.add("h2_jet_pt_tag_jet_pt_base_matchedgeopt", "pT tag vs. pT base;#it{p}_{T,jet}^{tag} (GeV/#it{c});#it{p}_{T,jet}^{base} (GeV/#it{c})", {HistType::kTH2F, {jetPtAxis, jetPtAxis}});
153153
registry.add("h2_jet_eta_tag_jet_eta_base_matchedgeopt", "Eta tag vs. Eta base;#eta_{jet}^{tag};#eta_{jet}^{base}", {HistType::kTH2F, {jetEtaAxis, jetEtaAxis}});
154154
registry.add("h2_jet_phi_tag_jet_phi_base_matchedgeopt", "Phi tag vs. Phi base;#varphi_{jet}^{tag};#varphi_{jet}^{base}", {HistType::kTH2F, {PhiAxis, PhiAxis}});
@@ -158,7 +158,7 @@ struct JetSpectraChargedTask {
158158
}
159159
}
160160

161-
if(doprocessJetsMatchedSubtracted){
161+
if (doprocessJetsMatchedSubtracted){
162162
registry.add("h2_jet_pt_tag_jet_pt_base_corr_matchedgeo", "pT tag vs. corr pT base;#it{p}_{T,jet}^{tag} (GeV/#it{c});#it{p}_{T,jet}^{base} (GeV/#it{c})", {HistType::kTH2F, {jetPtAxis, jetPtAxis}});
163163
registry.add("h2_jet_pt_tag_jet_pt_diff_corr_matchedgeo", "jet tag pT vs. corr delta pT / jet tag pt;#it{p}_{T,jet}^{tag} (GeV/#it{c}); (#it{p}_{T,jet}^{tag} (GeV/#it{c}) - #it{p}_{T,jet}^{base} (GeV/#it{c})) / #it{p}_{T,jet}^{tag} (GeV/#it{c})", {HistType::kTH2F, {jetPtAxis, {1000, -5.0, 2.0}}});
164164
registry.add("h2_jet_pt_base_jet_pt_diff_corr_matchedgeo", "jet base pT vs. corr delta pT / jet base pt;#it{p}_{T,jet}^{tag} (GeV/#it{c}); (#it{p}_{T,jet}^{tag} (GeV/#it{c}) - #it{p}_{T,jet}^{base} (GeV/#it{c})) / #it{p}_{T,jet}^{tag} (GeV/#it{c})", {HistType::kTH2F, {jetPtAxis, {1000, -5.0, 2.0}}});
@@ -209,7 +209,7 @@ struct JetSpectraChargedTask {
209209
{
210210
if (jet.r() == round(selectedJetsRadius * 100.0f)) {
211211
Double_t jetcorrpt = jet.pt() - (rho * jet.area());
212-
//fill jet histograms after area-based subtraction
212+
// fill jet histograms after area-based subtraction
213213
registry.fill(HIST("h_jet_pt_rhoareasubtracted"), jetcorrpt, weight);
214214
registry.fill(HIST("h2_centrality_jet_pt_rhoareasubtracted"), centrality, jetcorrpt, weight);
215215
registry.fill(HIST("h2_centrality_jet_eta_rhoareasubtracted"), centrality, jet.eta(), weight);
@@ -239,8 +239,8 @@ struct JetSpectraChargedTask {
239239
template <typename TTracks>
240240
void fillTrackHistograms(TTracks const& track, float weight = 1.0)
241241
{
242-
registry.fill(HIST("h_track_pt"), track.pt(), weight);
243-
registry.fill(HIST("h2_track_eta_track_phi"), track.eta(), track.phi(), weight);
242+
registry.fill(HIST("h_track_pt"), track.pt(), weight);
243+
registry.fill(HIST("h2_track_eta_track_phi"), track.eta(), track.phi(), weight);
244244
}
245245

246246
template <typename TBase, typename TTag>
@@ -250,8 +250,8 @@ struct JetSpectraChargedTask {
250250
if (jetBase.pt() > pTHatMaxMCD * pTHat) {
251251
return;
252252
}
253-
//fill geometry matched histograms
254-
if(checkGeoMatched){
253+
// fill geometry matched histograms
254+
if (checkGeoMatched){
255255
if (jetBase.has_matchedJetGeo()) {
256256
for (auto& jetTag : jetBase.template matchedJetGeo_as<std::decay_t<TTag>>()) {
257257
if (jetTag.pt() > pTHatMaxMCD * pTHat) {
@@ -263,14 +263,14 @@ struct JetSpectraChargedTask {
263263
registry.fill(HIST("h2_jet_eta_tag_jet_eta_base_matchedgeo"), jetTag.eta(), jetBase.eta(), weight);
264264
registry.fill(HIST("h2_jet_phi_tag_jet_phi_base_matchedgeo"), jetTag.phi(), jetBase.phi(), weight);
265265
registry.fill(HIST("h2_jet_ntracks_tag_jet_ntracks_base_matchedgeo"), jetTag.tracksIds().size(), jetBase.tracksIds().size(), weight);
266-
registry.fill(HIST("h2_jet_pt_tag_jet_pt_diff_matchedgeo"), jetTag.pt(), dpt / jetTag.pt(), weight);
267-
registry.fill(HIST("h2_jet_pt_base_jet_pt_diff_matchedgeo"), jetBase.pt(), dpt / jetBase.pt(), weight);
266+
registry.fill(HIST("h2_jet_pt_tag_jet_pt_diff_matchedgeo"), jetTag.pt(), dpt / jetTag.pt(), weight);
267+
registry.fill(HIST("h2_jet_pt_base_jet_pt_diff_matchedgeo"), jetBase.pt(), dpt / jetBase.pt(), weight);
268268
}
269269
}
270270
}
271271
}
272-
//fill pt matched histograms
273-
if(checkPtMatched){
272+
// fill pt matched histograms
273+
if (checkPtMatched){
274274
if (jetBase.has_matchedJetPt()) {
275275
for (auto& jetTag : jetBase.template matchedJetPt_as<std::decay_t<TTag>>()) {
276276
if (jetTag.pt() > pTHatMaxMCD * pTHat) {
@@ -282,14 +282,14 @@ struct JetSpectraChargedTask {
282282
registry.fill(HIST("h2_jet_eta_tag_jet_eta_base_matchedpt"), jetTag.eta(), jetBase.eta(), weight);
283283
registry.fill(HIST("h2_jet_phi_tag_jet_phi_base_matchedpt"), jetTag.phi(), jetBase.phi(), weight);
284284
registry.fill(HIST("h2_jet_ntracks_tag_jet_ntracks_base_matchedpt"), jetTag.tracksIds().size(), jetBase.tracksIds().size(), weight);
285-
registry.fill(HIST("h2_jet_pt_tag_jet_pt_diff_matchedpt"), jetTag.pt(), dpt / jetTag.pt(), weight);
286-
registry.fill(HIST("h2_jet_pt_base_jet_pt_diff_matchedpt"), jetBase.pt(), dpt / jetBase.pt(), weight);
285+
registry.fill(HIST("h2_jet_pt_tag_jet_pt_diff_matchedpt"), jetTag.pt(), dpt / jetTag.pt(), weight);
286+
registry.fill(HIST("h2_jet_pt_base_jet_pt_diff_matchedpt"), jetBase.pt(), dpt / jetBase.pt(), weight);
287287
}
288288
}
289289
}
290290
}
291-
//fill geometry and pt histograms:
292-
if(checkGeoPtMatched){
291+
// fill geometry and pt histograms:
292+
if (checkGeoPtMatched){
293293
if (jetBase.has_matchedJetGeo() && jetBase.has_matchedJetPt()) {
294294
for (auto& jetTag : jetBase.template matchedJetGeo_as<std::decay_t<TTag>>()) {
295295
if (jetTag.pt() > pTHatMaxMCD * pTHat) {
@@ -301,8 +301,8 @@ struct JetSpectraChargedTask {
301301
registry.fill(HIST("h2_jet_eta_tag_jet_eta_base_matchedgeopt"), jetTag.eta(), jetBase.eta(), weight);
302302
registry.fill(HIST("h2_jet_phi_tag_jet_phi_base_matchedgeopt"), jetTag.phi(), jetBase.phi(), weight);
303303
registry.fill(HIST("h2_jet_ntracks_tag_jet_ntracks_base_matchedgeopt"), jetTag.tracksIds().size(), jetBase.tracksIds().size(), weight);
304-
registry.fill(HIST("h2_jet_pt_tag_jet_pt_diff_matchedgeopt"), jetTag.pt(), dpt / jetTag.pt(), weight);
305-
registry.fill(HIST("h2_jet_pt_base_jet_pt_diff_matchedgeopt"), jetBase.pt(), dpt / jetBase.pt(), weight);
304+
registry.fill(HIST("h2_jet_pt_tag_jet_pt_diff_matchedgeopt"), jetTag.pt(), dpt / jetTag.pt(), weight);
305+
registry.fill(HIST("h2_jet_pt_base_jet_pt_diff_matchedgeopt"), jetBase.pt(), dpt / jetBase.pt(), weight);
306306

307307
}
308308
}
@@ -323,11 +323,11 @@ struct JetSpectraChargedTask {
323323
continue;
324324
}
325325
if (jetBase.r() == round(selectedJetsRadius * 100.0f)) {
326-
Double_t corrBasejetpt = jetBase.pt() - (rho* jetBase.area());
326+
Double_t corrBasejetpt = jetBase.pt() - (rho * jetBase.area());
327327
Double_t dcorrpt = jetTag.pt() - corrBasejetpt;
328328
registry.fill(HIST("h2_jet_pt_tag_jet_pt_base_corr_matchedgeo"), jetTag.pt(), corrBasejetpt, weight);
329-
registry.fill(HIST("h2_jet_pt_tag_jet_pt_diff_corr_matchedgeo"), jetTag.pt(), dcorrpt / jetTag.pt(), weight);
330-
registry.fill(HIST("h2_jet_pt_base_jet_pt_diff_corr_matchedgeo"), corrBasejetpt, dcorrpt / corrBasejetpt, weight);
329+
registry.fill(HIST("h2_jet_pt_tag_jet_pt_diff_corr_matchedgeo"), jetTag.pt(), dcorrpt / jetTag.pt(), weight);
330+
registry.fill(HIST("h2_jet_pt_base_jet_pt_diff_corr_matchedgeo"), corrBasejetpt, dcorrpt / corrBasejetpt, weight);
331331
}
332332
}
333333
}
@@ -367,7 +367,6 @@ struct JetSpectraChargedTask {
367367
registry.fill(HIST("h_jet_eta"), jet.eta());
368368
registry.fill(HIST("h_jet_phi"), jet.phi());
369369
}
370-
371370
}
372371
PROCESS_SWITCH(JetSpectraChargedTask, processQC, "collisions and track QC for Data and MCD", true);
373372

@@ -409,7 +408,6 @@ struct JetSpectraChargedTask {
409408
registry.fill(HIST("h_jet_eta"), jet.eta(), eventWeight);
410409
registry.fill(HIST("h_jet_phi"), jet.phi(), eventWeight);
411410
}
412-
413411
}
414412
PROCESS_SWITCH(JetSpectraChargedTask, processQCWeighted, "weighted collsions and tracks QC for MC", false);
415413

@@ -436,8 +434,8 @@ struct JetSpectraChargedTask {
436434
PROCESS_SWITCH(JetSpectraChargedTask, processSpectraData, "jet spectra for Data", false);
437435

438436
void processSpectraMCD(soa::Filtered<soa::Join<aod::JetCollisions, aod::BkgChargedRhos>>::iterator const& collision,
439-
soa::Join<aod::ChargedMCDetectorLevelJets, aod::ChargedMCDetectorLevelJetConstituents> const& jets,
440-
aod::JetTracks const&)
437+
soa::Join<aod::ChargedMCDetectorLevelJets, aod::ChargedMCDetectorLevelJetConstituents> const& jets,
438+
aod::JetTracks const&)
441439
{
442440
if (!jetderiveddatautilities::selectCollision(collision, eventSelection)) {
443441
return;
@@ -487,8 +485,8 @@ struct JetSpectraChargedTask {
487485
PROCESS_SWITCH(JetSpectraChargedTask, processSpectraMCDWeighted, "jet finder QA mcd with weighted events", false);
488486

489487
void processEvtWiseConstSubJetsData(soa::Filtered<aod::JetCollisions>::iterator const& collision,
490-
soa::Join<aod::ChargedEventWiseSubtractedJets, aod::ChargedEventWiseSubtractedJetConstituents> const& jets,
491-
aod::JetTracksSub const&)
488+
soa::Join<aod::ChargedEventWiseSubtractedJets, aod::ChargedEventWiseSubtractedJetConstituents> const& jets,
489+
aod::JetTracksSub const&)
492490
{
493491
if (!jetderiveddatautilities::selectCollision(collision, eventSelection)) {
494492
return;
@@ -559,7 +557,7 @@ struct JetSpectraChargedTask {
559557

560558
}
561559
}
562-
PROCESS_SWITCH(JetSpectraChargedTask, processJetsMatched, "matched mcp and mcd jets", true);
560+
PROCESS_SWITCH(JetSpectraChargedTask, processJetsMatched, "matched mcp and mcd jets", false);
563561

564562
void processJetsMatchedWeighted(soa::Filtered<aod::JetCollisions>::iterator const& collision,
565563
ChargedMCDMatchedJetsWeighted const& mcdjets,
@@ -587,7 +585,7 @@ struct JetSpectraChargedTask {
587585
}
588586
PROCESS_SWITCH(JetSpectraChargedTask, processJetsMatchedWeighted, "matched mcp and mcd jets with weighted events", false);
589587

590-
void processJetsMatchedSubtracted(soa::Filtered<soa::Join<aod::JetCollisions,aod::BkgChargedRhos>>::iterator const& collision,
588+
void processJetsMatchedSubtracted(soa::Filtered<soa::Join<aod::JetCollisions, aod::BkgChargedRhos>>::iterator const& collision,
591589
ChargedMCDMatchedJets const& mcdjets,
592590
ChargedMCPMatchedJets const&,
593591
aod::JetTracks const&, aod::JetParticles const&)
@@ -611,9 +609,9 @@ struct JetSpectraChargedTask {
611609
}
612610
}
613611
PROCESS_SWITCH(JetSpectraChargedTask, processJetsMatchedSubtracted, "matched mcp and mcd jets after subtraction", true);
614-
615612
};
616613

617-
WorkflowSpec defineDataProcessing(ConfigContext const& cfgc) {
614+
WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
615+
{
618616
return WorkflowSpec{adaptAnalysisTask<JetSpectraChargedTask>(cfgc, TaskName{"jet-charged-spectra"})};
619-
}
617+
}

0 commit comments

Comments
 (0)