Skip to content

Commit fb666cf

Browse files
fkrizekfkrizek
authored
Merge pull request AliceO2Group#13 from alibuild/alibot-cleanup-4240
Please consider the following formatting changes to AliceO2Group#4240
2 parents 9a27699 + cc6d9a6 commit fb666cf

File tree

1 file changed

+51
-53
lines changed

1 file changed

+51
-53
lines changed

‎PWGJE/Tasks/ChJetTriggerQATask.cxx‎

Lines changed: 51 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -106,40 +106,39 @@ struct ChJetTriggerQATask {
106106
eventSelection = JetDerivedDataUtilities::initialiseEventSelection(static_cast<std::string>(evSel));
107107
trackSelection = JetDerivedDataUtilities::initialiseTrackSelection(static_cast<std::string>(trackSelections));
108108

109-
//Basic histos
110-
spectra.add("vertexZ", "z vertex", {HistType::kTH1F, {{400, -20., +20.}}});
111-
spectra.add("ptphiTrackInclGood","pT vs phi inclusive good tracks",{HistType::kTH2F, {{100, 0., +100.}, {60, 0, TMath::TwoPi()}}});
112-
spectra.add("ptetaTrackInclGood","pT vs eta inclusive good tracks",{HistType::kTH2F, {{100, 0., +100.}, {80, -1., 1.}}});
113-
spectra.add("ptJetChInclFidVol","inclusive charged jet pT in fiducial volume",{HistType::kTH1F, {{200, 0., +200.}}});
114-
spectra.add("ptphiJetChInclFidVol","inclusive charged jet pT vs phi in fiducial volume",{HistType::kTH2F, {{100, 0., +100.}, {60, 0, TMath::TwoPi()}}});
115-
spectra.add("ptphiJetChInclFullVol","inclusive charged jet pT vs phi in full TPC volume",{HistType::kTH2F, {{100, 0., +100.}, {60, 0, TMath::TwoPi()}}});
116-
spectra.add("ptetaJetChInclFidVol","inclusive charged jet pT vs eta in fiducial volume",{HistType::kTH2F, {{100, 0., +100.}, {80, -1., 1.}}});
117-
spectra.add("ptetaJetChInclFullVol","inclusive charged jet pT vs eta in full TPC volume",{HistType::kTH2F, {{100, 0., +100.}, {80, -1., 1.}}});
118-
spectra.add("ptetaLeadingJetFullVol","pT vs eta leading jet",{HistType::kTH2F, {{100, 0., +100.}, {80, -1., 1.}}});
119-
spectra.add("ptphiLeadingJetFullVol","pT vs phi leading jet",{HistType::kTH2F, {{100, 0., +100.}, {60, 0, TMath::TwoPi()}}});
120-
121-
//Supplementary plots
122-
if(bAddSupplementHistosToOutput){
123-
spectra.add("ptJetChInclFullVol","inclusive charged jet pT in full volume",{HistType::kTH1F, {{200, 0., +200.}}});
124-
spectra.add("phietaTrackAllInclGood","phi vs eta all inclusive good tracks",{HistType::kTH2F, {{80, -1., 1.}, {60, 0, TMath::TwoPi()}}});
125-
spectra.add("phietaTrackHighPtInclGood","phi vs eta inclusive good tracks with pT > 10 GeV",{HistType::kTH2F, {{80, -1., 1.}, {60, 0, TMath::TwoPi()}}});
126-
spectra.add("phietaJetChInclFidVol","inclusive charged jet phi vs eta in fiducial volume",{HistType::kTH2F, {{80, -1., 1.}, {60, 0, TMath::TwoPi()}}});
127-
spectra.add("phietaJetChInclFullVol","inclusive charged jet phi vs eta in full TPC volume",{HistType::kTH2F, {{80, -1., 1.}, {60, 0, TMath::TwoPi()}}});
128-
spectra.add("phietaJetChInclHighPtFidVol","inclusive charged jet phi vs eta in fiducial volume",{HistType::kTH2F, {{80, -1., 1.}, {60, 0, TMath::TwoPi()}}});
129-
spectra.add("phietaJetChInclHighPtFullVol","inclusive charged jet phi vs eta in full TPC volume",{HistType::kTH2F, {{80, -1., 1.}, {60, 0, TMath::TwoPi()}}});
130-
spectra.add("ptetaLeadingTrack","pT vs eta leading tracks",{HistType::kTH2F, {{100, 0., +100.}, {80, -1., 1.}}});
131-
spectra.add("ptphiLeadingTrack","pT vs phi leading tracks",{HistType::kTH2F, {{100, 0., +100.}, {60, 0, TMath::TwoPi()}}});
132-
spectra.add("jetAreaFullVol","area of all jets in full TPC volume",{HistType::kTH2F, {{100, 0., +100.}, {50, 0., 2.}}});
133-
spectra.add("jetAreaFidVol","area of all jets in fiducial volume",{HistType::kTH2F, {{100, 0., +100.}, {50, 0., 2.}}});
109+
// Basic histos
110+
spectra.add("vertexZ", "z vertex", {HistType::kTH1F, {{400, -20., +20.}}});
111+
spectra.add("ptphiTrackInclGood", "pT vs phi inclusive good tracks", {HistType::kTH2F, {{100, 0., +100.}, {60, 0, TMath::TwoPi()}}});
112+
spectra.add("ptetaTrackInclGood", "pT vs eta inclusive good tracks", {HistType::kTH2F, {{100, 0., +100.}, {80, -1., 1.}}});
113+
spectra.add("ptJetChInclFidVol", "inclusive charged jet pT in fiducial volume", {HistType::kTH1F, {{200, 0., +200.}}});
114+
spectra.add("ptphiJetChInclFidVol", "inclusive charged jet pT vs phi in fiducial volume", {HistType::kTH2F, {{100, 0., +100.}, {60, 0, TMath::TwoPi()}}});
115+
spectra.add("ptphiJetChInclFullVol", "inclusive charged jet pT vs phi in full TPC volume", {HistType::kTH2F, {{100, 0., +100.}, {60, 0, TMath::TwoPi()}}});
116+
spectra.add("ptetaJetChInclFidVol", "inclusive charged jet pT vs eta in fiducial volume", {HistType::kTH2F, {{100, 0., +100.}, {80, -1., 1.}}});
117+
spectra.add("ptetaJetChInclFullVol", "inclusive charged jet pT vs eta in full TPC volume", {HistType::kTH2F, {{100, 0., +100.}, {80, -1., 1.}}});
118+
spectra.add("ptetaLeadingJetFullVol", "pT vs eta leading jet", {HistType::kTH2F, {{100, 0., +100.}, {80, -1., 1.}}});
119+
spectra.add("ptphiLeadingJetFullVol", "pT vs phi leading jet", {HistType::kTH2F, {{100, 0., +100.}, {60, 0, TMath::TwoPi()}}});
120+
121+
// Supplementary plots
122+
if (bAddSupplementHistosToOutput) {
123+
spectra.add("ptJetChInclFullVol", "inclusive charged jet pT in full volume", {HistType::kTH1F, {{200, 0., +200.}}});
124+
spectra.add("phietaTrackAllInclGood", "phi vs eta all inclusive good tracks", {HistType::kTH2F, {{80, -1., 1.}, {60, 0, TMath::TwoPi()}}});
125+
spectra.add("phietaTrackHighPtInclGood", "phi vs eta inclusive good tracks with pT > 10 GeV", {HistType::kTH2F, {{80, -1., 1.}, {60, 0, TMath::TwoPi()}}});
126+
spectra.add("phietaJetChInclFidVol", "inclusive charged jet phi vs eta in fiducial volume", {HistType::kTH2F, {{80, -1., 1.}, {60, 0, TMath::TwoPi()}}});
127+
spectra.add("phietaJetChInclFullVol", "inclusive charged jet phi vs eta in full TPC volume", {HistType::kTH2F, {{80, -1., 1.}, {60, 0, TMath::TwoPi()}}});
128+
spectra.add("phietaJetChInclHighPtFidVol", "inclusive charged jet phi vs eta in fiducial volume", {HistType::kTH2F, {{80, -1., 1.}, {60, 0, TMath::TwoPi()}}});
129+
spectra.add("phietaJetChInclHighPtFullVol", "inclusive charged jet phi vs eta in full TPC volume", {HistType::kTH2F, {{80, -1., 1.}, {60, 0, TMath::TwoPi()}}});
130+
spectra.add("ptetaLeadingTrack", "pT vs eta leading tracks", {HistType::kTH2F, {{100, 0., +100.}, {80, -1., 1.}}});
131+
spectra.add("ptphiLeadingTrack", "pT vs phi leading tracks", {HistType::kTH2F, {{100, 0., +100.}, {60, 0, TMath::TwoPi()}}});
132+
spectra.add("jetAreaFullVol", "area of all jets in full TPC volume", {HistType::kTH2F, {{100, 0., +100.}, {50, 0., 2.}}});
133+
spectra.add("jetAreaFidVol", "area of all jets in fiducial volume", {HistType::kTH2F, {{100, 0., +100.}, {50, 0., 2.}}});
134134
}
135135

136-
//3D histogram
137-
if(bAddBigHistosToOutput){
138-
spectra.add("fLeadJetChPtVsLeadingTrack","inclusive charged jet pT in TPC volume",{HistType::kTH2F, {{200, 0., +200.}, {200, 0., +200.}}});
139-
spectra.add("tracksThatWereNotJetConstituentsPtEtaPhi","PtEtaPhi of tracksThatWereNotjetConsituents in full volume",
140-
{HistType::kTH3F, {{100, 0., +100.}, {40, -1., 1.}, {60, 0., TMath::TwoPi()}}});
136+
// 3D histogram
137+
if (bAddBigHistosToOutput) {
138+
spectra.add("fLeadJetChPtVsLeadingTrack", "inclusive charged jet pT in TPC volume", {HistType::kTH2F, {{200, 0., +200.}, {200, 0., +200.}}});
139+
spectra.add("tracksThatWereNotJetConstituentsPtEtaPhi", "PtEtaPhi of tracksThatWereNotjetConsituents in full volume",
140+
{HistType::kTH3F, {{100, 0., +100.}, {40, -1., 1.}, {60, 0., TMath::TwoPi()}}});
141141
}
142-
143142
}
144143

145144
// declare filters on collisions
@@ -164,11 +163,11 @@ struct ChJetTriggerQATask {
164163
return;
165164
}
166165

167-
if ((bLowPtTrigger && JetDerivedDataUtilities::selectChargedTrigger(collision, JetDerivedDataUtilities::JTrigSelCh::chargedLow)) || (bHighPtTrigger && JetDerivedDataUtilities::selectChargedTrigger(collision, JetDerivedDataUtilities::JTrigSelCh::chargedHigh)) || ((!bLowPtTrigger)&&(!bHighPtTrigger))) {
168-
//bLowPtTrigger=1 and bHighPtTrigger=0 --> fill histos with low trigger only
169-
//bLowPtTrigger=0 and bHighPtTrigger=1 --> fill histos with high trigger only
170-
//bLowPtTrigger=1 and bHighPtTrigger=1 --> fill histos with mixture of low and high trigger
171-
//bLowPtTrigger=0 and bHighPtTrigger=0 --> fill histos with minimum bias ie. ignore trigger decision
166+
if ((bLowPtTrigger && JetDerivedDataUtilities::selectChargedTrigger(collision, JetDerivedDataUtilities::JTrigSelCh::chargedLow)) || (bHighPtTrigger && JetDerivedDataUtilities::selectChargedTrigger(collision, JetDerivedDataUtilities::JTrigSelCh::chargedHigh)) || ((!bLowPtTrigger) && (!bHighPtTrigger))) {
167+
// bLowPtTrigger=1 and bHighPtTrigger=0 --> fill histos with low trigger only
168+
// bLowPtTrigger=0 and bHighPtTrigger=1 --> fill histos with high trigger only
169+
// bLowPtTrigger=1 and bHighPtTrigger=1 --> fill histos with mixture of low and high trigger
170+
// bLowPtTrigger=0 and bHighPtTrigger=0 --> fill histos with minimum bias ie. ignore trigger decision
172171

173172
float leadingJetPt = -1.0;
174173
float leadingJetEta = -2.0;
@@ -191,10 +190,10 @@ struct ChJetTriggerQATask {
191190
continue;
192191
}
193192

194-
if(bAddBigHistosToOutput){
193+
if (bAddBigHistosToOutput) {
195194
v.SetPtEtaPhiM(trk.pt(), trk.eta(), trk.phi(), 0.139);
196195
acceptedTracks.push_back(GoodTrack(v, false, trk.globalIndex()));
197-
}
196+
}
198197

199198
spectra.fill(
200199
HIST("ptphiTrackInclGood"), trk.pt(),
@@ -203,11 +202,11 @@ struct ChJetTriggerQATask {
203202
HIST("ptetaTrackInclGood"), trk.pt(),
204203
trk.eta()); // Inclusive Track pT vs eta spectrum in TPC volume
205204

206-
if(bAddSupplementHistosToOutput){
205+
if (bAddSupplementHistosToOutput) {
207206
spectra.fill(
208207
HIST("phietaTrackAllInclGood"), trk.eta(),
209208
trk.phi()); // Inclusive Track pT vs eta spectrum in TPC volume
210-
209+
211210
if (trk.pt() > 5.0) {
212211
spectra.fill(
213212
HIST("phietaTrackHighPtInclGood"), trk.eta(),
@@ -223,8 +222,7 @@ struct ChJetTriggerQATask {
223222
}
224223
}
225224

226-
227-
if(bAddSupplementHistosToOutput){
225+
if (bAddSupplementHistosToOutput) {
228226
if (leadingTrackPt > -1.) {
229227
spectra.fill(HIST("ptphiLeadingTrack"), leadingTrackPt,
230228
leadingTrackPhi);
@@ -244,21 +242,21 @@ struct ChJetTriggerQATask {
244242
}
245243

246244
// access jet constituents as tracks
247-
if(bAddBigHistosToOutput){
245+
if (bAddBigHistosToOutput) {
248246
for (auto& jct : jet.tracks_as<TrackCandidates>()) {
249247
for (UInt_t itr = 0; itr < acceptedTracks.size(); itr++) {
250248
if (acceptedTracks[itr].globalIndex == jct.globalIndex()) {
251-
249+
252250
acceptedTracks[itr].isJetConstituent = true; // initialization
253251
break;
254252
}
255253
}
256254
}
257-
}
255+
}
258256
}
259257
}
260258

261-
if(bAddBigHistosToOutput){
259+
if (bAddBigHistosToOutput) {
262260
for (UInt_t itr = 0; itr < acceptedTracks.size(); itr++) {
263261
if (!acceptedTracks[itr].isJetConstituent) {
264262
spectra.fill(HIST("tracksThatWereNotJetConstituentsPtEtaPhi"), acceptedTracks[itr].lv.Pt(), acceptedTracks[itr].lv.Eta(), TVector2::Phi_0_2pi(acceptedTracks[itr].lv.Phi()));
@@ -271,7 +269,7 @@ struct ChJetTriggerQATask {
271269
spectra.fill(HIST("ptetaLeadingJetFullVol"), leadingJetPt, leadingJetEta);
272270
}
273271

274-
if(bAddBigHistosToOutput){
272+
if (bAddBigHistosToOutput) {
275273
if (leadingJetPt > -1. && leadingTrackPt > -1.) {
276274
spectra.fill(HIST("fLeadJetChPtVsLeadingTrack"), leadingTrackPt,
277275
leadingJetPt); // leading jet pT versus leading track pT
@@ -285,28 +283,28 @@ struct ChJetTriggerQATask {
285283
spectra.fill(HIST("ptphiJetChInclFidVol"), jet.pt(), jet.phi());
286284
spectra.fill(HIST("ptetaJetChInclFidVol"), jet.pt(), jet.eta());
287285

288-
if(bAddSupplementHistosToOutput){
286+
if (bAddSupplementHistosToOutput) {
289287
spectra.fill(HIST("phietaJetChInclFidVol"), jet.eta(), jet.phi());
290288
if (jet.pt() > 10.0) {
291289
spectra.fill(HIST("phietaJetChInclHighPtFidVol"), jet.eta(), jet.phi());
292290
}
293291
spectra.fill(HIST("jetAreaFidVol"), jet.pt(), jet.area());
294-
}
292+
}
295293
}
296294

297295
if (fabs(jet.eta()) < static_cast<float>(cfgTPCVolume)) {
298296
spectra.fill(HIST("ptphiJetChInclFullVol"), jet.pt(), jet.phi());
299297
spectra.fill(HIST("ptetaJetChInclFullVol"), jet.pt(), jet.eta());
300298

301-
if(bAddSupplementHistosToOutput){
302-
spectra.fill(HIST("ptJetChInclFullVol"), jet.pt());
299+
if (bAddSupplementHistosToOutput) {
300+
spectra.fill(HIST("ptJetChInclFullVol"), jet.pt());
303301

304-
spectra.fill(HIST("phietaJetChInclFullVol"), jet.eta(), jet.phi());
302+
spectra.fill(HIST("phietaJetChInclFullVol"), jet.eta(), jet.phi());
305303
if (jet.pt() > 10.0) {
306304
spectra.fill(HIST("phietaJetChInclHighPtFullVol"), jet.eta(), jet.phi());
307305
}
308306
spectra.fill(HIST("jetAreaFullVol"), jet.pt(), jet.area());
309-
}
307+
}
310308
}
311309
}
312310
}

0 commit comments

Comments
 (0)