Skip to content

Commit f84fa2e

Browse files
Archita-DashArchita-Dash
authored
Merge pull request #18 from alibuild/alibot-cleanup-10395
[PWGJE] Please consider the following formatting changes to AliceO2Group#10395
2 parents fb07d39 + 66d70ec commit f84fa2e

1 file changed

Lines changed: 19 additions & 20 deletions

File tree

‎PWGJE/Tasks/fullJetSpectraPP.cxx‎

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -255,22 +255,21 @@ struct FullJetSpectrapp {
255255

256256
registry.add("h2_matchedjet_etaphiDet", "Det jet #eta vs jet #varphi; #eta_{jet};#varphi_{jet}", {HistType::kTH2F, {{100, -1., 1.}, {160, -1., 7.}}});
257257
registry.add("h2_matchedjet_etaphiPart", "Part jet #eta vs jet #varphi; #eta_{jet};#varphi_{jet}", {HistType::kTH2F, {{100, -1., 1.}, {160, -1., 7.}}});
258-
registry.add("h2_matchedjet_deltaEtaCorr", "Correlation between Det Eta and Part Eta; #eta_{jet,det}; #eta_{jet,part}", {HistType::kTH2F, {{100, -1., 1.},{100, -1., 1.}}});
259-
registry.add("h2_matchedjet_deltaPhiCorr", "Correlation between Det Phi and Part Phi; #varphi_{jet,det}; #varphi_{jet,part}", {HistType::kTH2F, {{160, 0., 7.},{160, 0., 7.}}});
258+
registry.add("h2_matchedjet_deltaEtaCorr", "Correlation between Det Eta and Part Eta; #eta_{jet,det}; #eta_{jet,part}", {HistType::kTH2F, {{100, -1., 1.}, {100, -1., 1.}}});
259+
registry.add("h2_matchedjet_deltaPhiCorr", "Correlation between Det Phi and Part Phi; #varphi_{jet,det}; #varphi_{jet,part}", {HistType::kTH2F, {{160, 0., 7.}, {160, 0., 7.}}});
260260

261261
registry.add("h2_full_jet_energyscalePart", "Jet Energy Scale (part); p_{T,part} (GeV/c); (p_{T,det} - p_{T,part})/p_{T,part}", {HistType::kTH2F, {{400, 0., 400.}, {200, -1., 1.}}});
262262
registry.add("h3_full_jet_energyscalePart", "R dependence of Jet Energy Scale (Part); #it{R}_{jet};p_{T,det} (GeV/c); (p_{T,det} - p_{T,part})/p_{T,part}", {HistType::kTH3F, {{jetRadiiBins, ""}, {400, 0., 400.}, {200, -1., 1.}}});
263263
registry.add("h2_full_jet_etaresolutionPart", ";p_{T,part} (GeV/c); (#eta_{jet,det} - #eta_{jet,part})/#eta_{jet,part}", {HistType::kTH2F, {{400, 0., 400.}, {100, -1., 1.}}});
264264
registry.add("h2_full_jet_phiresolutionPart", ";p_{T,part} (GeV/c); (#varphi_{jet,det} - #varphi_{jet,part})/#varphi_{jet,part}", {HistType::kTH2F, {{400, 0., 400.}, {160, -1., 7.}}});
265-
registry.add("h2_full_jet_energyscaleChargedPart", "Jet Energy Scale (charged part); p_{T,part} (GeV/c); (p_{T,det} - p_{T,part})/p_{T,part}", {HistType::kTH2F,{{400, 0., 400.}, {200, -1.,1.}}});
266-
registry.add("h2_full_jet_energyscaleNeutralPart", "Jet Energy Scale (neutral part); p_{T,part} (GeV/c); (p_{T,det} - p_{T,part})/p_{T,part}", {HistType::kTH2F,{{400, 0., 400.}, {200, -1.,1.}}});
267-
registry.add("h2_full_jet_energyscaleChargedVsFullPart", "Jet Energy Scale (charged part, vs. full jet pt); p_{T,part} (GeV/c); (p_{T,det} - p_{T,part})/p_{T,part}", {HistType::kTH2F,{{400, 0., 400.}, {200, -1.,1.}}});
268-
registry.add("h2_full_jet_energyscaleNeutralVsFullPart", "Jet Energy Scale (neutral part, vs. full jet pt); p_{T,part} (GeV/c); (p_{T,det} - p_{T,part})/p_{T,part}", {HistType::kTH2F,{{400, 0., 400.}, {200, -1.,1.}}});
265+
registry.add("h2_full_jet_energyscaleChargedPart", "Jet Energy Scale (charged part); p_{T,part} (GeV/c); (p_{T,det} - p_{T,part})/p_{T,part}", {HistType::kTH2F, {{400, 0., 400.}, {200, -1., 1.}}});
266+
registry.add("h2_full_jet_energyscaleNeutralPart", "Jet Energy Scale (neutral part); p_{T,part} (GeV/c); (p_{T,det} - p_{T,part})/p_{T,part}", {HistType::kTH2F, {{400, 0., 400.}, {200, -1., 1.}}});
267+
registry.add("h2_full_jet_energyscaleChargedVsFullPart", "Jet Energy Scale (charged part, vs. full jet pt); p_{T,part} (GeV/c); (p_{T,det} - p_{T,part})/p_{T,part}", {HistType::kTH2F, {{400, 0., 400.}, {200, -1., 1.}}});
268+
registry.add("h2_full_jet_energyscaleNeutralVsFullPart", "Jet Energy Scale (neutral part, vs. full jet pt); p_{T,part} (GeV/c); (p_{T,det} - p_{T,part})/p_{T,part}", {HistType::kTH2F, {{400, 0., 400.}, {200, -1., 1.}}});
269269
registry.add("h2_full_fakemcdjets", "Fake MCD Jets; p_{T,det} (GeV/c); NCounts", {HistType::kTH2F, {{350, 0., 350.}, {100, 0., 100.}}});
270270
registry.add("h2_full_fakemcpjets", "Fake MCP Jets; p_{T,part} (GeV/c); NCounts", {HistType::kTH2F, {{350, 0., 350.}, {100, 0., 100.}}});
271271
// Response Matrix
272272
registry.add("h_full_jet_ResponseMatrix", "Full Jets Response Matrix; p_{T,det} (GeV/c); p_{T,part} (GeV/c)", {HistType::kTH2F, {{200, 0., 200.}, {200, 0., 200.}}});
273-
274273
}
275274

276275
// Label the histograms
@@ -327,7 +326,7 @@ struct FullJetSpectrapp {
327326
void fillJetHistograms(T const& jet, float weight = 1.0)
328327
{
329328
float pTHat = 10. / (std::pow(weight, 1.0 / pTHatExponent));
330-
if (jet.pt() > pTHatMaxMCD * pTHat || pTHat < pTHatAbsoluteMin) { // for MCD jets only to remove outliers; setting pTHatMaxMCD = 1 improves purity
329+
if (jet.pt() > pTHatMaxMCD * pTHat || pTHat < pTHatAbsoluteMin) { // for MCD jets only to remove outliers; setting pTHatMaxMCD = 1 improves purity
331330
return;
332331
}
333332

@@ -391,7 +390,7 @@ struct FullJetSpectrapp {
391390
void fillMCPHistograms(T const& jet, float weight = 1.0)
392391
{
393392
float pTHat = 10. / (std::pow(weight, 1.0 / pTHatExponent));
394-
if (jet.pt() > pTHatMaxMCP * pTHat || pTHat < pTHatAbsoluteMin) { // MCP outlier rejection
393+
if (jet.pt() > pTHatMaxMCP * pTHat || pTHat < pTHatAbsoluteMin) { // MCP outlier rejection
395394
return;
396395
}
397396
float neutralEnergy = 0.0;
@@ -437,7 +436,7 @@ struct FullJetSpectrapp {
437436
{
438437
double sumtrackE = 0.0;
439438
float pTHat = 10. / (std::pow(weight, 1.0 / pTHatExponent));
440-
if (pTHat < pTHatAbsoluteMin) { // Track outlier rejection
439+
if (pTHat < pTHatAbsoluteMin) { // Track outlier rejection
441440
return;
442441
}
443442
for (auto const& track : tracks) {
@@ -467,18 +466,18 @@ struct FullJetSpectrapp {
467466
template <typename T, typename U>
468467
void fillMatchedHistograms(T const& jetBase, float weight = 1.0)
469468
{
470-
float pTHat = 10. / (std::pow(weight, 1.0 / pTHatExponent));
471-
if (jetBase.pt() > pTHatMaxMCD * pTHat || pTHat < pTHatAbsoluteMin) {
472-
return;
473-
}
469+
float pTHat = 10. / (std::pow(weight, 1.0 / pTHatExponent));
470+
if (jetBase.pt() > pTHatMaxMCD * pTHat || pTHat < pTHatAbsoluteMin) {
471+
return;
472+
}
474473

475474
if (jetBase.has_matchedJetGeo()) { // geometrical jet matching only needed for pp - here,matching Base(Det.level) with Tag (Part. level) jets
476475
registry.fill(HIST("h_full_matchedmcdjet_tablesize"), jetBase.size(), weight);
477476
registry.fill(HIST("h_full_matchedmcdjet_ntracks"), jetBase.tracksIds().size(), weight);
478477
registry.fill(HIST("h2_matchedjet_etaphiDet"), jetBase.eta(), jetBase.phi(), weight);
479478

480479
for (auto& jetTag : jetBase.template matchedJetGeo_as<std::decay_t<U>>()) {
481-
if (jetTag.pt() > pTHatMaxMCP * pTHat || pTHat < pTHatAbsoluteMin) { // MCP outlier rejection
480+
if (jetTag.pt() > pTHatMaxMCP * pTHat || pTHat < pTHatAbsoluteMin) { // MCP outlier rejection
482481
continue;
483482
}
484483
auto deltaEta = jetBase.eta() - jetTag.eta();
@@ -796,12 +795,12 @@ struct FullJetSpectrapp {
796795
registry.fill(HIST("h2_full_fakemcpjets"), mcpjet.pt(), fakemcpjet, 1.0);
797796
continue;
798797
}
799-
}// mcpjet loop
798+
} // mcpjet loop
800799

801-
// // Fill MCD jet histograms if a valid MCP jet match was found within the EMCAL region
802-
// registry.fill(HIST("h_full_matchedmcpjet_eta"), mcpjet.eta(), 1.0);
803-
// registry.fill(HIST("h_full_matchedmcpjet_phi"), mcpjet.phi(), 1.0);
804-
fillMatchedHistograms<typename JetTableMCDMatchedJoined::iterator, JetTableMCPMatchedJoined>(mcdjet);
800+
// // Fill MCD jet histograms if a valid MCP jet match was found within the EMCAL region
801+
// registry.fill(HIST("h_full_matchedmcpjet_eta"), mcpjet.eta(), 1.0);
802+
// registry.fill(HIST("h_full_matchedmcpjet_phi"), mcpjet.phi(), 1.0);
803+
fillMatchedHistograms<typename JetTableMCDMatchedJoined::iterator, JetTableMCPMatchedJoined>(mcdjet);
805804
} // mcdjet loop
806805
}
807806
PROCESS_SWITCH(FullJetSpectrapp, processJetsMCPMCDMatched, "Full Jet finder MCP matched to MCD", false);

0 commit comments

Comments
 (0)