Skip to content

Commit d6ed7bd

Browse files
mhwang285mhwang285
committed
Include kappa and alpha in angularity denominator
1 parent 8924b5c commit d6ed7bd

4 files changed

Lines changed: 40 additions & 40 deletions

File tree

‎PWGJE/Tasks/jetFinderQA.cxx‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -558,9 +558,9 @@ struct JetFinderQATask {
558558
registry.fill(HIST("h3_jet_r_jet_pt_track_pt"), jet.r() / 100.0, jet.pt(), constituent.pt(), weight);
559559
registry.fill(HIST("h3_jet_r_jet_pt_track_eta"), jet.r() / 100.0, jet.pt(), constituent.eta(), weight);
560560
registry.fill(HIST("h3_jet_r_jet_pt_track_phi"), jet.r() / 100.0, jet.pt(), constituent.phi(), weight);
561-
angularity += std::pow(constituent.pt(), kappa) * std::pow(jetutilities::deltaR(jet, constituent), alpha);
561+
angularity += std::pow(constituent.pt(), kappa) * std::pow(jetutilities::deltaR(jet, constituent) / (jet.r() / 100.f), alpha);
562562
}
563-
angularity /= (jet.pt() * (jet.r() / 100.f));
563+
angularity /= std::pow(jet.pt(), kappa);
564564
registry.fill(HIST("h3_jet_r_jet_pt_jet_angularity"), jet.r() / 100.0, jet.pt(), angularity, weight);
565565
}
566566

@@ -656,9 +656,9 @@ struct JetFinderQATask {
656656
registry.fill(HIST("h3_jet_r_part_jet_pt_part_track_pt_part"), jet.r() / 100.0, jet.pt(), constituent.pt(), weight);
657657
registry.fill(HIST("h3_jet_r_part_jet_pt_part_track_eta_part"), jet.r() / 100.0, jet.pt(), constituent.eta(), weight);
658658
registry.fill(HIST("h3_jet_r_part_jet_pt_part_track_phi_part"), jet.r() / 100.0, jet.pt(), constituent.phi(), weight);
659-
angularity += std::pow(constituent.pt(), kappa) * std::pow(jetutilities::deltaR(jet, constituent), alpha);
659+
angularity += std::pow(constituent.pt(), kappa) * std::pow(jetutilities::deltaR(jet, constituent) / (jet.r() / 100.f), alpha);
660660
}
661-
angularity /= (jet.pt() * (jet.r() / 100.f));
661+
angularity /= std::pow(jet.pt(), kappa);
662662
registry.fill(HIST("h3_jet_r_part_jet_pt_part_jet_angularity_part"), jet.r() / 100.0, jet.pt(), angularity, weight);
663663
}
664664

@@ -687,9 +687,9 @@ struct JetFinderQATask {
687687
if (constituent.pt() > leadingTrackPtTag) {
688688
leadingTrackPtTag = constituent.pt();
689689
}
690-
angularityTag += std::pow(constituent.pt(), kappa) * std::pow(jetutilities::deltaR(jetTag, constituent), alpha);
690+
angularityTag += std::pow(constituent.pt(), kappa) * std::pow(jetutilities::deltaR(jetTag, constituent) / (jetTag.r() / 100.f), alpha);
691691
}
692-
angularityTag /= (jetTag.pt() * (jetTag.r() / 100.f));
692+
angularityTag /= std::pow(jetTag.pt(), kappa);
693693
registry.fill(HIST("h3_jet_r_jet_pt_tag_leadingtrack_pt_diff_matchedgeo"), jetBase.r() / 100.0, jetTag.pt(), (leadingTrackPtTag - leadingTrackPtBase) / leadingTrackPtTag, weight);
694694
registry.fill(HIST("h3_jet_r_jet_pt_tag_leadingtrack_fraction_diff_matchedgeo"), jetBase.r() / 100.0, jetTag.pt(), (leadingTrackPtTag / jetTag.pt()) - (leadingTrackPtBase / jetBase.pt()), weight);
695695
registry.fill(HIST("h3_jet_r_jet_pt_tag_angularity_matchedgeo"), jetBase.r() / 100.0, jetTag.pt(), angularityTag, weight);
@@ -729,9 +729,9 @@ struct JetFinderQATask {
729729
if (constituent.pt() > leadingTrackPtTag) {
730730
leadingTrackPtTag = constituent.pt();
731731
}
732-
angularityTag += std::pow(constituent.pt(), kappa) * std::pow(jetutilities::deltaR(jetTag, constituent), alpha);
732+
angularityTag += std::pow(constituent.pt(), kappa) * std::pow(jetutilities::deltaR(jetTag, constituent) / (jetTag.r() / 100.f), alpha);
733733
}
734-
angularityTag /= (jetTag.pt() * (jetTag.r() / 100.f));
734+
angularityTag /= std::pow(jetTag.pt(), kappa);
735735
registry.fill(HIST("h3_jet_r_jet_pt_tag_leadingtrack_pt_diff_matchedpt"), jetBase.r() / 100.0, jetTag.pt(), (leadingTrackPtTag - leadingTrackPtBase) / leadingTrackPtTag, weight);
736736
registry.fill(HIST("h3_jet_r_jet_pt_tag_leadingtrack_fraction_diff_matchedpt"), jetBase.r() / 100.0, jetTag.pt(), (leadingTrackPtTag / jetTag.pt()) - (leadingTrackPtBase / jetBase.pt()), weight);
737737
registry.fill(HIST("h3_jet_r_jet_pt_tag_angularity_matchedpt"), jetBase.r() / 100.0, jetTag.pt(), angularityTag, weight);
@@ -769,9 +769,9 @@ struct JetFinderQATask {
769769
if (constituent.pt() > leadingTrackPtTag) {
770770
leadingTrackPtTag = constituent.pt();
771771
}
772-
angularityTag += std::pow(constituent.pt(), kappa) * std::pow(jetutilities::deltaR(jetTag, constituent), alpha);
772+
angularityTag += std::pow(constituent.pt(), kappa) * std::pow(jetutilities::deltaR(jetTag, constituent) / (jetTag.r() / 100.f), alpha);
773773
}
774-
angularityTag /= (jetTag.pt() * (jetTag.r() / 100.f));
774+
angularityTag /= std::pow(jetTag.pt(), kappa);
775775
registry.fill(HIST("h3_jet_r_jet_pt_tag_leadingtrack_pt_diff_matchedgeopt"), jetBase.r() / 100.0, jetTag.pt(), (leadingTrackPtTag - leadingTrackPtBase) / leadingTrackPtTag, weight);
776776
registry.fill(HIST("h3_jet_r_jet_pt_tag_leadingtrack_fraction_diff_matchedgeopt"), jetBase.r() / 100.0, jetTag.pt(), (leadingTrackPtTag / jetTag.pt()) - (leadingTrackPtBase / jetBase.pt()), weight);
777777
registry.fill(HIST("h3_jet_r_jet_pt_tag_angularity_matchedgeopt"), jetBase.r() / 100.0, jetTag.pt(), angularityTag, weight);
@@ -1080,9 +1080,9 @@ struct JetFinderQATask {
10801080
if (constituent.pt() > leadingTrackPtBase) {
10811081
leadingTrackPtBase = constituent.pt();
10821082
}
1083-
angularity += std::pow(constituent.pt(), kappa) * std::pow(jetutilities::deltaR(jet, constituent), alpha);
1083+
angularity += std::pow(constituent.pt(), kappa) * std::pow(jetutilities::deltaR(jet, constituent) / (jet.r() / 100.f), alpha);
10841084
}
1085-
angularity /= (jet.pt() * (jet.r() / 100.f));
1085+
angularity /= std::pow(jet.pt(), kappa);
10861086
fillMatchedHistograms<soa::Join<aod::ChargedJets, aod::ChargedJetConstituents, aod::ChargedJetsMatchedToChargedEventWiseSubtractedJets>::iterator, soa::Join<aod::ChargedEventWiseSubtractedJets, aod::ChargedEventWiseSubtractedJetConstituents, aod::ChargedEventWiseSubtractedJetsMatchedToChargedJets>>(jet, leadingTrackPtBase, angularity);
10871087
}
10881088
}
@@ -1205,9 +1205,9 @@ struct JetFinderQATask {
12051205
if (constituent.pt() > leadingTrackPtBase) {
12061206
leadingTrackPtBase = constituent.pt();
12071207
}
1208-
angularity += std::pow(constituent.pt(), kappa) * std::pow(jetutilities::deltaR(mcdjet, constituent), alpha);
1208+
angularity += std::pow(constituent.pt(), kappa) * std::pow(jetutilities::deltaR(mcdjet, constituent) / (mcdjet.r() / 100.f), alpha);
12091209
}
1210-
angularity /= (mcdjet.pt() * (mcdjet.r() / 100.f));
1210+
angularity /= std::pow(mcdjet.pt(), kappa);
12111211
fillMatchedHistograms<soa::Join<aod::ChargedMCDetectorLevelJets, aod::ChargedMCDetectorLevelJetConstituents, aod::ChargedMCDetectorLevelJetsMatchedToChargedMCParticleLevelJets>::iterator, soa::Join<aod::ChargedMCParticleLevelJets, aod::ChargedMCParticleLevelJetConstituents, aod::ChargedMCParticleLevelJetsMatchedToChargedMCDetectorLevelJets>>(mcdjet, leadingTrackPtBase, angularity, 1., collision.mcCollision().ptHard());
12121212
}
12131213
}
@@ -1238,9 +1238,9 @@ struct JetFinderQATask {
12381238
if (constituent.pt() > leadingTrackPtBase) {
12391239
leadingTrackPtBase = constituent.pt();
12401240
}
1241-
angularity += std::pow(constituent.pt(), kappa) * std::pow(jetutilities::deltaR(mcdjet, constituent), alpha);
1241+
angularity += std::pow(constituent.pt(), kappa) * std::pow(jetutilities::deltaR(mcdjet, constituent) / (mcdjet.r() / 100.f), alpha);
12421242
}
1243-
angularity /= (mcdjet.pt() * (mcdjet.r() / 100.f));
1243+
angularity /= std::pow(mcdjet.pt(), kappa);
12441244
fillMatchedHistograms<soa::Join<aod::ChargedMCDetectorLevelJets, aod::ChargedMCDetectorLevelJetConstituents, aod::ChargedMCDetectorLevelJetsMatchedToChargedMCParticleLevelJets>::iterator, soa::Join<aod::ChargedMCParticleLevelJets, aod::ChargedMCParticleLevelJetConstituents, aod::ChargedMCParticleLevelJetsMatchedToChargedMCDetectorLevelJets>>(mcdjet, leadingTrackPtBase, angularity, collision.weight(), collision.mcCollision().ptHard());
12451245
}
12461246
}

‎PWGJE/Tasks/jetSpectraCharged.cxx‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -510,9 +510,9 @@ struct JetSpectraCharged {
510510
float angularity = 0.;
511511
for (const auto& constituent : jet.template tracks_as<aod::JetTracks>()) {
512512
registry.fill(HIST("h2_jet_pt_track_pt"), jet.pt(), constituent.pt(), weight);
513-
angularity += std::pow(constituent.pt(), kappa) * std::pow(jetutilities::deltaR(jet, constituent), alpha);
513+
angularity += std::pow(constituent.pt(), kappa) * std::pow(jetutilities::deltaR(jet, constituent) / (jet.r() / 100.f), alpha);
514514
}
515-
angularity /= (jet.pt() * (jet.r() / 100.f));
515+
angularity /= std::pow(jet.pt(), kappa);
516516
registry.fill(HIST("h2_jet_pt_jet_angularity"), jet.pt(), angularity, weight);
517517
}
518518

@@ -542,9 +542,9 @@ struct JetSpectraCharged {
542542
float angularity = 0.;
543543
for (const auto& constituent : jet.template tracks_as<aod::JetTracks>()) {
544544
registry.fill(HIST("h2_jet_pt_track_pt_rhoareasubtracted"), jetcorrpt, constituent.pt(), weight);
545-
angularity += std::pow(constituent.pt(), kappa) * std::pow(jetutilities::deltaR(jet, constituent), alpha);
545+
angularity += std::pow(constituent.pt(), kappa) * std::pow(jetutilities::deltaR(jet, constituent) / (jet.r() / 100.f), alpha);
546546
}
547-
angularity /= (jet.pt() * (jet.r() / 100.f));
547+
angularity /= std::pow(jet.pt(), kappa);
548548
registry.fill(HIST("h2_jet_pt_jet_angularity_rhoareasubtracted"), jetcorrpt, angularity, weight);
549549
}
550550

@@ -566,9 +566,9 @@ struct JetSpectraCharged {
566566
float angularity = 0.;
567567
for (const auto& constituent : jet.template tracks_as<aod::JetParticles>()) {
568568
registry.fill(HIST("h2_jet_pt_part_track_pt_part"), jet.pt(), constituent.pt(), weight);
569-
angularity += std::pow(constituent.pt(), kappa) * std::pow(jetutilities::deltaR(jet, constituent), alpha);
569+
angularity += std::pow(constituent.pt(), kappa) * std::pow(jetutilities::deltaR(jet, constituent) / (jet.r() / 100.f), alpha);
570570
}
571-
angularity /= (jet.pt() * (jet.r() / 100.f));
571+
angularity /= std::pow(jet.pt(), kappa);
572572
registry.fill(HIST("h2_jet_pt_jet_angularity_part"), jet.pt(), angularity, weight);
573573
}
574574

@@ -621,9 +621,9 @@ struct JetSpectraCharged {
621621
double dpt = jetMCD.pt() - jetMCP.pt();
622622
float angularityMcd = 0.;
623623
for (const auto& constituent : jetMCD.template tracks_as<aod::JetTracks>()) {
624-
angularityMcd += std::pow(constituent.pt(), kappa) * std::pow(jetutilities::deltaR(jetMCD, constituent), alpha);
624+
angularityMcd += std::pow(constituent.pt(), kappa) * std::pow(jetutilities::deltaR(jetMCD, constituent) / (jetMCD.r() / 100.f), alpha);
625625
}
626-
angularityMcd /= (jetMCD.pt() * (jetMCD.r() / 100.f));
626+
angularityMcd /= std::pow(jetMCD.pt(), kappa);
627627
if (jetfindingutilities::isInEtaAcceptance(jetMCD, jetEtaMin, jetEtaMax, trackEtaMin, trackEtaMax)) {
628628
registry.fill(HIST("h2_jet_pt_mcd_jet_pt_mcp_matchedgeo_mcdetaconstraint"), jetMCD.pt(), jetMCP.pt(), weight);
629629
if (jetfindingutilities::isInEtaAcceptance(jetMCP, jetEtaMin, jetEtaMax, trackEtaMin, trackEtaMax)) {
@@ -660,9 +660,9 @@ struct JetSpectraCharged {
660660
double dpt = jetMCD.pt() - jetMCP.pt();
661661
float angularityMcd = 0.;
662662
for (const auto& constituent : jetMCD.template tracks_as<aod::JetTracks>()) {
663-
angularityMcd += std::pow(constituent.pt(), kappa) * std::pow(jetutilities::deltaR(jetMCD, constituent), alpha);
663+
angularityMcd += std::pow(constituent.pt(), kappa) * std::pow(jetutilities::deltaR(jetMCD, constituent) / (jetMCD.r() / 100.f), alpha);
664664
}
665-
angularityMcd /= (jetMCD.pt() * (jetMCD.r() / 100.f));
665+
angularityMcd /= std::pow(jetMCD.pt(), kappa);
666666
if (jetfindingutilities::isInEtaAcceptance(jetMCD, jetEtaMin, jetEtaMax, trackEtaMin, trackEtaMax)) {
667667
registry.fill(HIST("h2_jet_pt_mcd_jet_pt_mcp_matchedpt_mcdetaconstraint"), jetMCD.pt(), jetMCP.pt(), weight);
668668
if (jetfindingutilities::isInEtaAcceptance(jetMCP, jetEtaMin, jetEtaMax, trackEtaMin, trackEtaMax)) {
@@ -699,9 +699,9 @@ struct JetSpectraCharged {
699699
double dpt = jetMCD.pt() - jetMCP.pt();
700700
float angularityMcd = 0.;
701701
for (const auto& constituent : jetMCD.template tracks_as<aod::JetTracks>()) {
702-
angularityMcd += std::pow(constituent.pt(), kappa) * std::pow(jetutilities::deltaR(jetMCD, constituent), alpha);
702+
angularityMcd += std::pow(constituent.pt(), kappa) * std::pow(jetutilities::deltaR(jetMCD, constituent) / (jetMCD.r() / 100.f), alpha);
703703
}
704-
angularityMcd /= (jetMCD.pt() * (jetMCD.r() / 100.f));
704+
angularityMcd /= std::pow(jetMCD.pt(), kappa);
705705
if (jetfindingutilities::isInEtaAcceptance(jetMCD, jetEtaMin, jetEtaMax, trackEtaMin, trackEtaMax)) {
706706
registry.fill(HIST("h2_jet_pt_mcd_jet_pt_mcp_matchedgeopt_mcdetaconstraint"), jetMCD.pt(), jetMCP.pt(), weight);
707707
if (jetfindingutilities::isInEtaAcceptance(jetMCP, jetEtaMin, jetEtaMax, trackEtaMin, trackEtaMax)) {
@@ -743,7 +743,7 @@ struct JetSpectraCharged {
743743
double dcorrpt = corrBasejetpt - corrTagjetpt;
744744
float angularityMcd = 0.;
745745
for (const auto& constituent : jetMCD.template tracks_as<aod::JetTracks>()) {
746-
angularityMcd += std::pow(constituent.pt(), kappa) * std::pow(jetutilities::deltaR(jetMCD, constituent), alpha);
746+
angularityMcd += std::pow(constituent.pt(), kappa) * std::pow(jetutilities::deltaR(jetMCD, constituent) / (jetMCD.r() / 100.f), alpha);
747747
}
748748
angularityMcd /= (corrBasejetpt * (jetMCD.r() / 100.f));
749749
if (jetfindingutilities::isInEtaAcceptance(jetMCD, jetEtaMin, jetEtaMax, trackEtaMin, trackEtaMax)) {

‎PWGJE/Tasks/jetSpectraChargedGen.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,9 +157,9 @@ struct JetSpectraChargedGen {
157157
float angularity = 0.0f;
158158
for (const auto& constituent : jet.template tracks_as<aod::JetParticles>()) {
159159
registry.fill(HIST("h2_jet_pt_part_track_pt_part"), jet.pt(), constituent.pt(), weight);
160-
angularity += std::pow(constituent.pt(), kappa) * std::pow(jetutilities::deltaR(jet, constituent), alpha);
160+
angularity += std::pow(constituent.pt(), kappa) * std::pow(jetutilities::deltaR(jet, constituent) / (jet.r() / 100.f), alpha);
161161
}
162-
angularity /= (jet.pt() * (jet.r() / 100.0f));
162+
angularity /= std::pow(jet.pt(), kappa);
163163
registry.fill(HIST("h2_jet_pt_jet_angularity_part"), jet.pt(), angularity, weight);
164164
}
165165

‎PWGJE/Tasks/jetTutorial.cxx‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -246,9 +246,9 @@ struct JetTutorialTask {
246246
registry.fill(HIST("h_jet_ntracks"), jet.tracksIds().size());
247247
double angularity = 0.0;
248248
for (auto& jetConstituent : jet.tracks_as<aod::JetTracks>()) {
249-
angularity += std::pow(jetConstituent.pt(), kappa) * std::pow(jetutilities::deltaR(jet, jetConstituent), alpha);
249+
angularity += std::pow(jetConstituent.pt(), kappa) * std::pow(jetutilities::deltaR(jet, jetConstituent) / (jet.r() / 100.f), alpha);
250250
}
251-
angularity /= (jet.pt() * (jet.r() / 100.f));
251+
angularity /= std::pow(jet.pt(), kappa);
252252
registry.fill(HIST("h_jet_angularity"), angularity);
253253
}
254254
}
@@ -274,14 +274,14 @@ struct JetTutorialTask {
274274
registry.fill(HIST("h_full_jet_nclusters"), jet.clustersIds().size());
275275
double angularity = 0.0;
276276
for (auto& jetConstituent : jet.tracks_as<aod::JetTracks>()) {
277-
angularity += std::pow(jetConstituent.pt(), kappa) * std::pow(jetutilities::deltaR(jet, jetConstituent), alpha);
277+
angularity += std::pow(jetConstituent.pt(), kappa) * std::pow(jetutilities::deltaR(jet, jetConstituent) / (jet.r() / 100.f), alpha);
278278
}
279279

280280
for (auto& jetCluster : jet.clusters_as<aod::JetClusters>()) {
281-
angularity += std::pow(jetCluster.energy(), kappa) * std::pow(jetutilities::deltaR(jet, jetCluster), alpha);
281+
angularity += std::pow(jetCluster.energy(), kappa) * std::pow(jetutilities::deltaR(jet, jetCluster) / (jet.r() / 100.f), alpha);
282282
}
283283

284-
registry.fill(HIST("h_full_jet_angularity"), angularity / (jet.pt() * round(jet.r() * 100.0f)));
284+
registry.fill(HIST("h_full_jet_angularity"), angularity / std::pow(jet.pt(), kappa));
285285
}
286286
}
287287
PROCESS_SWITCH(JetTutorialTask, processDataSubstructureFull, "full jet substructure", false);
@@ -291,9 +291,9 @@ struct JetTutorialTask {
291291
for (auto& jet : jets) {
292292
double angularity = 0.0;
293293
for (auto& jetConstituent : jet.tracks_as<aod::JetParticles>()) {
294-
angularity += std::pow(jetConstituent.pt(), kappa) * std::pow(jetutilities::deltaR(jet, jetConstituent), alpha);
294+
angularity += std::pow(jetConstituent.pt(), kappa) * std::pow(jetutilities::deltaR(jet, jetConstituent) / (jet.r() / 100.f), alpha);
295295
}
296-
angularity /= (jet.pt() * (jet.r() / 100.f));
296+
angularity /= std::pow(jet.pt(), kappa);
297297
registry.fill(HIST("h_part_jet_angularity"), angularity, mcCollision.weight());
298298
}
299299
}
@@ -369,9 +369,9 @@ struct JetTutorialTask {
369369
registry.fill(HIST("h_jet_ntracks"), jet.tracksIds().size());
370370
double angularity = 0.0;
371371
for (auto& jetConstituent : jet.tracks_as<aod::JetTracksSub>()) {
372-
angularity += std::pow(jetConstituent.pt(), kappa) * std::pow(jetutilities::deltaR(jet, jetConstituent), alpha);
372+
angularity += std::pow(jetConstituent.pt(), kappa) * std::pow(jetutilities::deltaR(jet, jetConstituent) / (jet.r() / 100.f), alpha);
373373
}
374-
angularity /= (jet.pt() * (jet.r() / 100.f));
374+
angularity /= std::pow(jet.pt(), kappa);
375375
registry.fill(HIST("h_jet_angularity_constsub"), angularity);
376376
}
377377
}

0 commit comments

Comments
 (0)