Skip to content

Commit 6ce5a84

Browse files
authored
Merge pull request #29 from alibuild/alibot-cleanup-13324
Please consider the following formatting changes to #13324
2 parents f97090a + 1a9be54 commit 6ce5a84

File tree

1 file changed

+23
-26
lines changed

1 file changed

+23
-26
lines changed

PWGJE/Tasks/fullJetSpectra.cxx

Lines changed: 23 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -457,13 +457,13 @@ struct FullJetSpectra {
457457
registry.add("h2_track_etaphi", "jet_track #eta vs jet_track #varphi; #eta_{track};#varphi_{track}", {HistType::kTH2F, {{500, -5., 5.}, {160, -1., 7.}}}, doSumw2);
458458
registry.add("h2_jet_etaphi", "jet #eta vs jet #varphi; #eta_{jet};#varphi_{jet}", {HistType::kTH2F, {{100, -1., 1.}, {160, -1., 7.}}}, doSumw2);
459459

460-
//NEW: Jet constituent histograms for each hadronic correction mode
460+
// NEW: Jet constituent histograms for each hadronic correction mode
461461
registry.add("h_full_jet_neutralconstituents_energy_uncorr", "Jet neutral cluster energy (uncorr)", {HistType::kTH1F, {{400, 0., 400.}}}, doSumw2);
462462
registry.add("h_full_jet_neutralconstituents_energy_corr_oneTrack100", "Jet neutral cluster energy (corr 1track100)", {HistType::kTH1F, {{400, 0., 400.}}}, doSumw2);
463463
registry.add("h_full_jet_neutralconstituents_energy_corr_oneTrack70", "Jet neutral cluster energy (corr 1track70)", {HistType::kTH1F, {{400, 0., 400.}}}, doSumw2);
464464
registry.add("h_full_jet_neutralconstituents_energy_corr_allTracks100", "Jet neutral cluster energy (corr alltracks100)", {HistType::kTH1F, {{400, 0., 400.}}}, doSumw2);
465465
registry.add("h_full_jet_neutralconstituents_energy_corr_allTracks70", "Jet neutral cluster energy (corr alltracks70)", {HistType::kTH1F, {{400, 0., 400.}}}, doSumw2);
466-
//Corrected NEF histograms for the corresponding correction mode
466+
// Corrected NEF histograms for the corresponding correction mode
467467
registry.add("h2_full_jet_nef_uncorr", "Jet pT vs NEF (uncorr); p_{T,jet}; NEF", {HistType::kTH2F, {{350, 0., 350.}, {100, 0., 1.}}}, doSumw2);
468468
registry.add("h2_full_jet_nef_corr_oneTrack100", "Jet pT vs NEF (corr, 1track100); p_{T,jet}; NEF", {HistType::kTH2F, {{350, 0., 350.}, {100, 0., 1.}}}, doSumw2);
469469
registry.add("h2_full_jet_nef_corr_oneTrack70", "Jet pT vs NEF (corr, 1track70); p_{T,jet}; NEF", {HistType::kTH2F, {{350, 0., 350.}, {100, 0., 1.}}}, doSumw2);
@@ -776,7 +776,7 @@ struct FullJetSpectra {
776776
registry.fill(HIST("h_full_jet_phi"), jet.phi(), weight);
777777
registry.fill(HIST("h2_jet_etaphi"), jet.eta(), jet.phi(), weight);
778778

779-
//Sums for each correction mode
779+
// Sums for each correction mode
780780
double neutralEnergy_uncorr = 0.0;
781781
double neutralEnergy_corr_oneTrack100 = 0.0;
782782
double neutralEnergy_corr_oneTrack70 = 0.0;
@@ -814,18 +814,17 @@ struct FullJetSpectra {
814814
registry.fill(HIST("h_full_jet_neutralconstituents_energy_uncorr"), cluster.energy(), weight);
815815

816816
if (cluster.energyCorrectedOneTrack1()) {
817-
registry.fill(HIST("h_full_jet_neutralconstituents_energy_corr_oneTrack100"), cluster.energyCorrectedOneTrack1(), weight);
817+
registry.fill(HIST("h_full_jet_neutralconstituents_energy_corr_oneTrack100"), cluster.energyCorrectedOneTrack1(), weight);
818818
}
819-
if (cluster.energyCorrectedOneTrack2()) {
820-
registry.fill(HIST("h_full_jet_neutralconstituents_energy_corr_oneTrack70"), cluster.energyCorrectedOneTrack2(), weight);
819+
if (cluster.energyCorrectedOneTrack2()) {
820+
registry.fill(HIST("h_full_jet_neutralconstituents_energy_corr_oneTrack70"), cluster.energyCorrectedOneTrack2(), weight);
821821
}
822-
if (cluster.energyCorrectedAllTracks1()) {
823-
registry.fill(HIST("h_full_jet_neutralconstituents_energy_corr_allTracks100"), cluster.energyCorrectedAllTracks1(), weight);
822+
if (cluster.energyCorrectedAllTracks1()) {
823+
registry.fill(HIST("h_full_jet_neutralconstituents_energy_corr_allTracks100"), cluster.energyCorrectedAllTracks1(), weight);
824824
}
825-
if (cluster.energyCorrectedAllTracks2()) {
826-
registry.fill(HIST("h_full_jet_neutralconstituents_energy_corr_allTracks70"), cluster.energyCorrectedAllTracks2(), weight);
825+
if (cluster.energyCorrectedAllTracks2()) {
826+
registry.fill(HIST("h_full_jet_neutralconstituents_energy_corr_allTracks70"), cluster.energyCorrectedAllTracks2(), weight);
827827
}
828-
829828
}
830829
// auto nef = neutralEnergy / jet.energy();
831830
// registry.fill(HIST("h2_full_jet_nef"), jet.pt(), nef, weight);
@@ -970,18 +969,18 @@ struct FullJetSpectra {
970969
sumclusterE_corr_allTracks70 += cluster.energyCorrectedAllTracks2();
971970

972971
registry.fill(HIST("h_cluster_energy_uncorr"), cluster.energy(), weight);
973-
if (cluster.energyCorrectedOneTrack1()) {
974-
registry.fill(HIST("h_cluster_energy_corr_oneTrack100"), cluster.energyCorrectedOneTrack1(), weight);
975-
}
976-
if (cluster.energyCorrectedOneTrack2()) {
977-
registry.fill(HIST("h_cluster_energy_corr_oneTrack70"), cluster.energyCorrectedOneTrack2(), weight);
978-
}
979-
if (cluster.energyCorrectedAllTracks1()) {
980-
registry.fill(HIST("h_cluster_energy_corr_allTracks100"), cluster.energyCorrectedAllTracks1(), weight);
981-
}
982-
if (cluster.energyCorrectedAllTracks2()) {
983-
registry.fill(HIST("h_cluster_energy_corr_allTracks70"), cluster.energyCorrectedAllTracks2(), weight);
984-
}
972+
if (cluster.energyCorrectedOneTrack1()) {
973+
registry.fill(HIST("h_cluster_energy_corr_oneTrack100"), cluster.energyCorrectedOneTrack1(), weight);
974+
}
975+
if (cluster.energyCorrectedOneTrack2()) {
976+
registry.fill(HIST("h_cluster_energy_corr_oneTrack70"), cluster.energyCorrectedOneTrack2(), weight);
977+
}
978+
if (cluster.energyCorrectedAllTracks1()) {
979+
registry.fill(HIST("h_cluster_energy_corr_allTracks100"), cluster.energyCorrectedAllTracks1(), weight);
980+
}
981+
if (cluster.energyCorrectedAllTracks2()) {
982+
registry.fill(HIST("h_cluster_energy_corr_allTracks70"), cluster.energyCorrectedAllTracks2(), weight);
983+
}
985984

986985
registry.fill(HIST("h_clusterTime"), cluster.time(), weight);
987986
registry.fill(HIST("h_cluster_pt"), clusterpt, weight);
@@ -992,7 +991,6 @@ struct FullJetSpectra {
992991
registry.fill(HIST("h_cluster_energysum_corr_oneTrack70"), sumclusterE_corr_oneTrack70, weight);
993992
registry.fill(HIST("h_cluster_energysum_corr_allTracks100"), sumclusterE_corr_allTracks100, weight);
994993
registry.fill(HIST("h_cluster_energysum_corr_allTracks70"), sumclusterE_corr_allTracks70, weight);
995-
996994
}
997995
}
998996

@@ -1903,7 +1901,7 @@ struct FullJetSpectra {
19031901
PROCESS_SWITCH(FullJetSpectra, processCleanup, "Periodic cleanup", true);
19041902
*/
19051903
void processDataTracks(soa::Filtered<EMCCollisionsData>::iterator const& collision, soa::Filtered<aod::JetTracks> const& tracks,
1906-
ClusterWithCorrections const& clusters) //replaced "soa::Filtered<aod::JetClusters>" with ClusterWithCorrections to include the hadcorr tables
1904+
ClusterWithCorrections const& clusters) // replaced "soa::Filtered<aod::JetClusters>" with ClusterWithCorrections to include the hadcorr tables
19071905
{
19081906
bool eventAccepted = false;
19091907

@@ -2215,7 +2213,6 @@ struct FullJetSpectra {
22152213
neutralEnergy_corr_oneTrack70 += jetcluster.energyCorrectedOneTrack2();
22162214
neutralEnergy_corr_allTracks100 += jetcluster.energyCorrectedAllTracks1();
22172215
neutralEnergy_corr_allTracks70 += jetcluster.energyCorrectedAllTracks2();
2218-
22192216
}
22202217
auto jetEnergy = jet.energy();
22212218

0 commit comments

Comments
 (0)