Skip to content

Commit e0e1ebc

Browse files
clang fixes
1 parent d9f8f5d commit e0e1ebc

File tree

2 files changed

+13
-18
lines changed

2 files changed

+13
-18
lines changed

PWGJE/Tasks/jetFinderQA.cxx

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ struct JetFinderQATask {
9292
Configurable<bool> doMultCutCheck{"doMultCutCheck", false, "decide to apply multCutCheck or not"};
9393
Configurable<bool> multCutCheck_applyRCTSelections{"multCutCheck_applyRCTSelections", true, "decide to apply RCT selections"};
9494

95-
9695
std::vector<bool> filledJetR_Both;
9796
std::vector<bool> filledJetR_Low;
9897
std::vector<bool> filledJetR_High;
@@ -394,7 +393,7 @@ struct JetFinderQATask {
394393
registry.add("h2_occupancy_ntracksselptetacuts_postsel", "occupancy vs N_{tracks}; occupancy; N_{tracks}", {HistType::kTH2I, {occupancyAxis, nTracksAxis}});
395394
}
396395

397-
if (doprocessQcMultCutCheck){
396+
if (doprocessQcMultCutCheck) {
398397
std::vector<double> centralityBinning{0., 10., 50., 70., 100};
399398
AxisSpec centAxis = {centralityBinning, "centrality (%)"};
400399
bool doSumw2 = true;
@@ -410,7 +409,7 @@ struct JetFinderQATask {
410409
registry.add("h_collisions", "event status;event status;entries", {HistType::kTH1F, {{4, 0.0, 4.0}}});
411410
registry.add("h2_centrality_collisions", "centrality vs collisions; centrality; collisions", {HistType::kTH2F, {centAxis, {4, 0.0, 4.0}}});
412411
// registry.add("h2_mccollision_pthardfromweight_pthardfromhepmcxsection", "ptHard from weight vs ptHard from HepMCXSections; ptHard_weight; ptHard_hepmcxsections", {HistType::kTH2F, {{200, 0.0, 200.0}, {200, 0.0, 200.0}}});
413-
412+
414413
registry.add("h_collisions_weighted", "event status;event status;entries", {HistType::kTH1F, {{4, 0.0, 4.0}}}, doSumw2);
415414
registry.add("h2_centrality_collisions_weighted", "centrality vs collisions; centrality; collisions", {HistType::kTH2F, {centAxis, {4, 0.0, 4.0}}}, doSumw2);
416415
// registry.add("h2_mccollision_pthardfromweight_pthardfromhepmcxsection_weighted", "ptHard from weight vs ptHard from HepMCXSections; ptHard_weight; ptHard_hepmcxsections", {HistType::kTH2F, {{200, 0.0, 200.0}, {200, 0.0, 200.0}}}, doSumw2);
@@ -446,8 +445,8 @@ struct JetFinderQATask {
446445

447446
Filter trackCuts = (aod::jtrack::pt >= trackPtMin && aod::jtrack::pt < trackPtMax && aod::jtrack::eta > trackEtaMin && aod::jtrack::eta < trackEtaMax);
448447
Filter eventCuts = (nabs(aod::jcollision::posZ) < vertexZCut &&
449-
((checkCentFT0M ? aod::jcollision::centFT0M : aod::jcollision::centFT0C) >= centralityMin) &&
450-
((checkCentFT0M ? aod::jcollision::centFT0M : aod::jcollision::centFT0C) < centralityMax));
448+
((checkCentFT0M ? aod::jcollision::centFT0M : aod::jcollision::centFT0C) >= centralityMin) &&
449+
((checkCentFT0M ? aod::jcollision::centFT0M : aod::jcollision::centFT0C) < centralityMax));
451450
PresliceUnsorted<soa::Filtered<aod::JetCollisionsMCD>> CollisionsPerMCPCollision = aod::jmccollisionlb::mcCollisionId;
452451
PresliceUnsorted<soa::Join<aod::JetMcCollisions, aod::JMcCollisionPIs>> McCollisionsPerMCPCollision = aod::jmccollision::mcCollisionId;
453452

@@ -870,7 +869,6 @@ struct JetFinderQATask {
870869
registry.fill(HIST("h2_centrality_rhorandomconerandomtrackdirectionwithouttwoleadingjets"), collision.centFT0M(), randomConePtWithoutTwoLeadJet - M_PI * randomConeR * randomConeR * collision.rho());
871870
}
872871

873-
874872
enum JCollisionSubGeneratorId {
875873
none = -1,
876874
mbGap = 0
@@ -926,7 +924,7 @@ struct JetFinderQATask {
926924
registry.fill(HIST("h_collisions_weighted"), 3.5, eventWeight);
927925
}
928926

929-
if (multCutCheck_analyseMBGapEvents == mbGapSelectionRequirement::mbGapOnly && collision.getSubGeneratorId() != JCollisionSubGeneratorId::mbGap){
927+
if (multCutCheck_analyseMBGapEvents == mbGapSelectionRequirement::mbGapOnly && collision.getSubGeneratorId() != JCollisionSubGeneratorId::mbGap) {
930928
return false;
931929
} else if (multCutCheck_analyseMBGapEvents == mbGapSelectionRequirement::mbGapSkip && collision.getSubGeneratorId() == JCollisionSubGeneratorId::mbGap) {
932930
return false;
@@ -1487,13 +1485,12 @@ struct JetFinderQATask {
14871485
registry.fill(HIST("h2_occupancy_ntracksall_postsel"), occupancy, nTracksAll);
14881486
registry.fill(HIST("h2_occupancy_ntrackssel_postsel"), occupancy, nTracksAllAcceptanceAndSelected);
14891487
registry.fill(HIST("h2_occupancy_ntracksselptetacuts_postsel"), occupancy, nTracksInAcceptanceAndSelected);
1490-
14911488
}
14921489
PROCESS_SWITCH(JetFinderQATask, processOccupancyQA, "occupancy QA on jet derived data", false);
14931490

14941491
void processQcMultCutCheck(soa::Filtered<soa::Join<aod::JetCollisions, aod::BkgChargedRhos>>::iterator const& collision,
1495-
soa::Join<aod::ChargedMCDetectorLevelJets, aod::ChargedMCDetectorLevelJetConstituents> const& mcdjets,
1496-
soa::Filtered<soa::Join<aod::JetTracks, aod::JTrackExtras, aod::JTrackPIs>> const& tracks)
1492+
soa::Join<aod::ChargedMCDetectorLevelJets, aod::ChargedMCDetectorLevelJetConstituents> const& mcdjets,
1493+
soa::Filtered<soa::Join<aod::JetTracks, aod::JTrackExtras, aod::JTrackPIs>> const& tracks)
14971494
{
14981495
bool fillHistograms = true;
14991496
bool isWeighted = true;
@@ -1504,24 +1501,23 @@ struct JetFinderQATask {
15041501
registry.fill(HIST("h_collisions_zvertex"), collision.posZ(), eventWeight);
15051502

15061503
bool hasJetAboveMultCut = false;
1507-
for (auto const& mcdjet: mcdjets) {
1508-
if (mcdjet.tracksIds().size() > multCutCheck_proportionalFactor*mcdjet.pt() + multCutCheck_abscissaAtOrigin) {
1504+
for (auto const& mcdjet : mcdjets) {
1505+
if (mcdjet.tracksIds().size() > multCutCheck_proportionalFactor * mcdjet.pt() + multCutCheck_abscissaAtOrigin) {
15091506
hasJetAboveMultCut = true;
15101507
}
15111508
}
15121509
if (doMultCutCheck && hasJetAboveMultCut == false) {
15131510
return;
15141511
}
15151512

1516-
15171513
registry.fill(HIST("h_collisions_ntracks"), tracks.size(), eventWeight);
15181514
registry.fill(HIST("h2_centrality_ntracks"), collision.centFT0M(), tracks.size(), eventWeight);
15191515
registry.fill(HIST("h_collisions_njets"), mcdjets.size(), eventWeight);
15201516
registry.fill(HIST("h2_centrality_njets"), collision.centFT0M(), mcdjets.size(), eventWeight);
15211517
registry.fill(HIST("h2_ntracks_rho"), tracks.size(), collision.rho(), eventWeight);
15221518
registry.fill(HIST("h2_centrality_rho"), collision.centFT0M(), collision.rho(), eventWeight);
15231519

1524-
for (auto const& track: tracks) {
1520+
for (auto const& track : tracks) {
15251521
registry.fill(HIST("h2_centrality_track_pt"), collision.centFT0M(), track.pt(), eventWeight);
15261522
registry.fill(HIST("h2_centrality_track_eta"), collision.centFT0M(), track.eta(), eventWeight);
15271523
registry.fill(HIST("h2_track_pt_track_sigma1overpt"), track.pt(), track.sigma1Pt(), eventWeight);
@@ -1530,7 +1526,7 @@ struct JetFinderQATask {
15301526
registry.fill(HIST("h2_track_pt_high_track_sigmapt"), track.pt(), track.sigma1Pt() * track.pt(), eventWeight);
15311527
}
15321528

1533-
for (auto const& mcdjet: mcdjets) {
1529+
for (auto const& mcdjet : mcdjets) {
15341530
registry.fill(HIST("h_jet_pt"), mcdjet.pt(), eventWeight);
15351531
registry.fill(HIST("h_jet_eta"), mcdjet.eta(), eventWeight);
15361532
registry.fill(HIST("h_jet_phi"), mcdjet.phi(), eventWeight);
@@ -1543,7 +1539,7 @@ struct JetFinderQATask {
15431539
registry.fill(HIST("h2_jet_pt_jet_ntracks"), mcdjet.pt(), mcdjet.tracksIds().size(), eventWeight);
15441540
for (const auto& constituent : mcdjet.template tracks_as<soa::Filtered<soa::Join<aod::JetTracks, aod::JTrackExtras, aod::JTrackPIs>>>()) {
15451541
registry.fill(HIST("h2_jet_pt_track_pt"), mcdjet.pt(), constituent.pt(), eventWeight);
1546-
}
1542+
}
15471543
}
15481544
}
15491545
PROCESS_SWITCH(JetFinderQATask, processQcMultCutCheck, "processing QC on collision, track and jet quantities after cut on collision based on jet quantities;", false);

PWGJE/Tasks/trackEfficiency.cxx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ struct TrackEfficiency {
120120
} else {
121121
const auto& aodTrack = jetTrack.template track_as<soa::Join<aod::Tracks, aod::TracksExtra, aod::TracksDCA>>();
122122
if (effSystMinNCrossedRowsTPCUseAlternateCut) {
123-
customTrackSelection.SetMinNCrossedRowsTPC(120 - 5./jetTrack.pt());
123+
customTrackSelection.SetMinNCrossedRowsTPC(120 - 5. / jetTrack.pt());
124124
}
125125
if (customTrackSelection.IsSelected(aodTrack)) {
126126
return true;
@@ -1252,7 +1252,6 @@ struct TrackEfficiency {
12521252
}
12531253
PROCESS_SWITCH(TrackEfficiency, processTrackSelectionHistograms, "plots distributions of variables that are cut on during track selection", false);
12541254

1255-
12561255
void processOccupancyQA(soa::Filtered<aod::JetCollisions>::iterator const& collision, aod::JetTracks const& tracks)
12571256
{
12581257
float centrality = checkCentFT0M ? collision.centFT0M() : collision.centFT0C();

0 commit comments

Comments
 (0)