Skip to content

Commit 746e3ec

Browse files
alibuildalibuild
committed
Please consider the following formatting changes
1 parent 31c334c commit 746e3ec

File tree

1 file changed

+32
-37
lines changed

1 file changed

+32
-37
lines changed

‎PWGJE/Tasks/jetSpectraCharged.cxx‎

Lines changed: 32 additions & 37 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,12 +158,11 @@ 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}}});
165165
}
166-
167166
}
168167

169168
Filter trackCuts = (aod::jtrack::pt >= trackPtMin && aod::jtrack::pt < trackPtMax && aod::jtrack::eta > trackEtaMin && aod::jtrack::eta < trackEtaMax);
@@ -209,7 +208,7 @@ struct JetSpectraChargedTask {
209208
{
210209
if (jet.r() == round(selectedJetsRadius * 100.0f)) {
211210
Double_t jetcorrpt = jet.pt() - (rho * jet.area());
212-
//fill jet histograms after area-based subtraction
211+
// fill jet histograms after area-based subtraction
213212
registry.fill(HIST("h_jet_pt_rhoareasubtracted"), jetcorrpt, weight);
214213
registry.fill(HIST("h2_centrality_jet_pt_rhoareasubtracted"), centrality, jetcorrpt, weight);
215214
registry.fill(HIST("h2_centrality_jet_eta_rhoareasubtracted"), centrality, jet.eta(), weight);
@@ -239,8 +238,8 @@ struct JetSpectraChargedTask {
239238
template <typename TTracks>
240239
void fillTrackHistograms(TTracks const& track, float weight = 1.0)
241240
{
242-
registry.fill(HIST("h_track_pt"), track.pt(), weight);
243-
registry.fill(HIST("h2_track_eta_track_phi"), track.eta(), track.phi(), weight);
241+
registry.fill(HIST("h_track_pt"), track.pt(), weight);
242+
registry.fill(HIST("h2_track_eta_track_phi"), track.eta(), track.phi(), weight);
244243
}
245244

246245
template <typename TBase, typename TTag>
@@ -250,8 +249,8 @@ struct JetSpectraChargedTask {
250249
if (jetBase.pt() > pTHatMaxMCD * pTHat) {
251250
return;
252251
}
253-
//fill geometry matched histograms
254-
if(checkGeoMatched){
252+
// fill geometry matched histograms
253+
if (checkGeoMatched) {
255254
if (jetBase.has_matchedJetGeo()) {
256255
for (auto& jetTag : jetBase.template matchedJetGeo_as<std::decay_t<TTag>>()) {
257256
if (jetTag.pt() > pTHatMaxMCD * pTHat) {
@@ -263,14 +262,14 @@ struct JetSpectraChargedTask {
263262
registry.fill(HIST("h2_jet_eta_tag_jet_eta_base_matchedgeo"), jetTag.eta(), jetBase.eta(), weight);
264263
registry.fill(HIST("h2_jet_phi_tag_jet_phi_base_matchedgeo"), jetTag.phi(), jetBase.phi(), weight);
265264
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);
265+
registry.fill(HIST("h2_jet_pt_tag_jet_pt_diff_matchedgeo"), jetTag.pt(), dpt / jetTag.pt(), weight);
266+
registry.fill(HIST("h2_jet_pt_base_jet_pt_diff_matchedgeo"), jetBase.pt(), dpt / jetBase.pt(), weight);
268267
}
269268
}
270269
}
271270
}
272-
//fill pt matched histograms
273-
if(checkPtMatched){
271+
// fill pt matched histograms
272+
if (checkPtMatched) {
274273
if (jetBase.has_matchedJetPt()) {
275274
for (auto& jetTag : jetBase.template matchedJetPt_as<std::decay_t<TTag>>()) {
276275
if (jetTag.pt() > pTHatMaxMCD * pTHat) {
@@ -282,14 +281,14 @@ struct JetSpectraChargedTask {
282281
registry.fill(HIST("h2_jet_eta_tag_jet_eta_base_matchedpt"), jetTag.eta(), jetBase.eta(), weight);
283282
registry.fill(HIST("h2_jet_phi_tag_jet_phi_base_matchedpt"), jetTag.phi(), jetBase.phi(), weight);
284283
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);
284+
registry.fill(HIST("h2_jet_pt_tag_jet_pt_diff_matchedpt"), jetTag.pt(), dpt / jetTag.pt(), weight);
285+
registry.fill(HIST("h2_jet_pt_base_jet_pt_diff_matchedpt"), jetBase.pt(), dpt / jetBase.pt(), weight);
287286
}
288287
}
289288
}
290289
}
291-
//fill geometry and pt histograms:
292-
if(checkGeoPtMatched){
290+
// fill geometry and pt histograms:
291+
if (checkGeoPtMatched) {
293292
if (jetBase.has_matchedJetGeo() && jetBase.has_matchedJetPt()) {
294293
for (auto& jetTag : jetBase.template matchedJetGeo_as<std::decay_t<TTag>>()) {
295294
if (jetTag.pt() > pTHatMaxMCD * pTHat) {
@@ -301,9 +300,8 @@ struct JetSpectraChargedTask {
301300
registry.fill(HIST("h2_jet_eta_tag_jet_eta_base_matchedgeopt"), jetTag.eta(), jetBase.eta(), weight);
302301
registry.fill(HIST("h2_jet_phi_tag_jet_phi_base_matchedgeopt"), jetTag.phi(), jetBase.phi(), weight);
303302
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);
306-
303+
registry.fill(HIST("h2_jet_pt_tag_jet_pt_diff_matchedgeopt"), jetTag.pt(), dpt / jetTag.pt(), weight);
304+
registry.fill(HIST("h2_jet_pt_base_jet_pt_diff_matchedgeopt"), jetBase.pt(), dpt / jetBase.pt(), weight);
307305
}
308306
}
309307
}
@@ -323,11 +321,11 @@ struct JetSpectraChargedTask {
323321
continue;
324322
}
325323
if (jetBase.r() == round(selectedJetsRadius * 100.0f)) {
326-
Double_t corrBasejetpt = jetBase.pt() - (rho* jetBase.area());
324+
Double_t corrBasejetpt = jetBase.pt() - (rho * jetBase.area());
327325
Double_t dcorrpt = jetTag.pt() - corrBasejetpt;
328326
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);
327+
registry.fill(HIST("h2_jet_pt_tag_jet_pt_diff_corr_matchedgeo"), jetTag.pt(), dcorrpt / jetTag.pt(), weight);
328+
registry.fill(HIST("h2_jet_pt_base_jet_pt_diff_corr_matchedgeo"), corrBasejetpt, dcorrpt / corrBasejetpt, weight);
331329
}
332330
}
333331
}
@@ -367,7 +365,6 @@ struct JetSpectraChargedTask {
367365
registry.fill(HIST("h_jet_eta"), jet.eta());
368366
registry.fill(HIST("h_jet_phi"), jet.phi());
369367
}
370-
371368
}
372369
PROCESS_SWITCH(JetSpectraChargedTask, processQC, "collisions and track QC for Data and MCD", true);
373370

@@ -409,7 +406,6 @@ struct JetSpectraChargedTask {
409406
registry.fill(HIST("h_jet_eta"), jet.eta(), eventWeight);
410407
registry.fill(HIST("h_jet_phi"), jet.phi(), eventWeight);
411408
}
412-
413409
}
414410
PROCESS_SWITCH(JetSpectraChargedTask, processQCWeighted, "weighted collsions and tracks QC for MC", false);
415411

@@ -436,8 +432,8 @@ struct JetSpectraChargedTask {
436432
PROCESS_SWITCH(JetSpectraChargedTask, processSpectraData, "jet spectra for Data", false);
437433

438434
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&)
435+
soa::Join<aod::ChargedMCDetectorLevelJets, aod::ChargedMCDetectorLevelJetConstituents> const& jets,
436+
aod::JetTracks const&)
441437
{
442438
if (!jetderiveddatautilities::selectCollision(collision, eventSelection)) {
443439
return;
@@ -487,8 +483,8 @@ struct JetSpectraChargedTask {
487483
PROCESS_SWITCH(JetSpectraChargedTask, processSpectraMCDWeighted, "jet finder QA mcd with weighted events", false);
488484

489485
void processEvtWiseConstSubJetsData(soa::Filtered<aod::JetCollisions>::iterator const& collision,
490-
soa::Join<aod::ChargedEventWiseSubtractedJets, aod::ChargedEventWiseSubtractedJetConstituents> const& jets,
491-
aod::JetTracksSub const&)
486+
soa::Join<aod::ChargedEventWiseSubtractedJets, aod::ChargedEventWiseSubtractedJetConstituents> const& jets,
487+
aod::JetTracksSub const&)
492488
{
493489
if (!jetderiveddatautilities::selectCollision(collision, eventSelection)) {
494490
return;
@@ -556,7 +552,6 @@ struct JetSpectraChargedTask {
556552
registry.fill(HIST("h_jet_eta_mcd"), mcdjet.eta());
557553
registry.fill(HIST("h_jet_phi_mcd"), mcdjet.phi());
558554
fillMatchedHistograms<ChargedMCDMatchedJets::iterator, ChargedMCPMatchedJets>(mcdjet);
559-
560555
}
561556
}
562557
PROCESS_SWITCH(JetSpectraChargedTask, processJetsMatched, "matched mcp and mcd jets", true);
@@ -587,7 +582,7 @@ struct JetSpectraChargedTask {
587582
}
588583
PROCESS_SWITCH(JetSpectraChargedTask, processJetsMatchedWeighted, "matched mcp and mcd jets with weighted events", false);
589584

590-
void processJetsMatchedSubtracted(soa::Filtered<soa::Join<aod::JetCollisions,aod::BkgChargedRhos>>::iterator const& collision,
585+
void processJetsMatchedSubtracted(soa::Filtered<soa::Join<aod::JetCollisions, aod::BkgChargedRhos>>::iterator const& collision,
591586
ChargedMCDMatchedJets const& mcdjets,
592587
ChargedMCPMatchedJets const&,
593588
aod::JetTracks const&, aod::JetParticles const&)
@@ -611,9 +606,9 @@ struct JetSpectraChargedTask {
611606
}
612607
}
613608
PROCESS_SWITCH(JetSpectraChargedTask, processJetsMatchedSubtracted, "matched mcp and mcd jets after subtraction", true);
614-
615609
};
616610

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

0 commit comments

Comments
 (0)