@@ -194,120 +194,119 @@ struct HfCorrelatorHfeHadrons {
194194 registry.fill (HIST (" hptHadron" ), hTrack.pt ());
195195 entryHadron (hTrack.phi (), hTrack.eta (), hTrack.pt (), poolBin, gCollisionId , timeStamp);
196196 }
197-
198- for (const auto & hTrack : tracks) {
199- if (!selAssoHadron (hTrack)) {
200- continue ;
201- }
202- registry.fill (HIST (" hTracksBin" ), poolBin);
203- entryHadron (hTrack.phi (), hTrack.eta (), hTrack.pt (), poolBin, gCollisionId , timeStamp);
204-
205- }
206197
207- // Construct Deta Phi between electrons and hadrons
208-
209- double ptElectron = -999 ;
210- double phiElectron = -999 ;
211- double etaElectron = -999 ;
212-
213- for (const auto & eTrack : electron) {
214- ptElectron = eTrack.ptTrack ();
215- phiElectron = eTrack.phiTrack ();
216- etaElectron = eTrack.etaTrack ();
217- bool acceptElectron = false ;
218-
219- double deltaPhi = -999 ;
220- double deltaEta = -999 ;
221- double ptHadron = -999 ;
222- double etaHadron = -999 ;
223- double phiHadron = -999 ;
224- if (eTrack.isEmcal ()) {
225- // EMCal electron
226- if (requireEmcal) {
227- acceptElectron = true ;
198+ for (const auto & hTrack : tracks) {
199+ if (!selAssoHadron (hTrack)) {
200+ continue ;
228201 }
229- } else {
230- // Non-EMCal electron
231- if (!requireEmcal) {
232- // Apply sigma cut
233- if (std::abs (eTrack.tofNSigmaElTrack ()) < tofNSigmaEl) {
234- if (eTrack.tpcNSigmaElTrack () > tpcNsigmaElectronMin && eTrack.tpcNSigmaElTrack () < tpcNsigmaElectronMax) {
235- registry.fill (HIST (" hTofnSigmaVsP" ), eTrack.tofNSigmaElTrack (), eTrack.ptTrack ());
236- registry.fill (HIST (" hTpcnSigmaVsP" ), eTrack.tpcNSigmaElTrack (), eTrack.ptTrack ());
237- acceptElectron = true ;
202+ registry.fill (HIST (" hTracksBin" ), poolBin);
203+ entryHadron (hTrack.phi (), hTrack.eta (), hTrack.pt (), poolBin, gCollisionId , timeStamp);
204+ }
205+
206+ // Construct Deta Phi between electrons and hadrons
207+
208+ double ptElectron = -999 ;
209+ double phiElectron = -999 ;
210+ double etaElectron = -999 ;
211+
212+ for (const auto & eTrack : electron) {
213+ ptElectron = eTrack.ptTrack ();
214+ phiElectron = eTrack.phiTrack ();
215+ etaElectron = eTrack.etaTrack ();
216+ bool acceptElectron = false ;
217+
218+ double deltaPhi = -999 ;
219+ double deltaEta = -999 ;
220+ double ptHadron = -999 ;
221+ double etaHadron = -999 ;
222+ double phiHadron = -999 ;
223+ if (eTrack.isEmcal ()) {
224+ // EMCal electron
225+ if (requireEmcal) {
226+ acceptElectron = true ;
227+ }
228+ } else {
229+ // Non-EMCal electron
230+ if (!requireEmcal) {
231+ // Apply sigma cut
232+ if (std::abs (eTrack.tofNSigmaElTrack ()) < tofNSigmaEl) {
233+ if (eTrack.tpcNSigmaElTrack () > tpcNsigmaElectronMin && eTrack.tpcNSigmaElTrack () < tpcNsigmaElectronMax) {
234+ registry.fill (HIST (" hTofnSigmaVsP" ), eTrack.tofNSigmaElTrack (), eTrack.ptTrack ());
235+ registry.fill (HIST (" hTpcnSigmaVsP" ), eTrack.tpcNSigmaElTrack (), eTrack.ptTrack ());
236+ acceptElectron = true ;
237+ }
238238 }
239239 }
240240 }
241- }
242241
243- if (!acceptElectron)
244- continue ; // skip electron if not passing criteria
242+ if (!acceptElectron)
243+ continue ; // skip electron if not passing criteria
245244
246- registry.fill (HIST (" hptElectron" ), ptElectron);
247- int nElectronLS = 0 ;
248- int nElectronUS = 0 ;
249- if (eTrack.nElPairLS () > 0 ) {
250- for (int i = 0 ; i < eTrack.nElPairLS (); ++i) {
245+ registry.fill (HIST (" hptElectron" ), ptElectron);
246+ int nElectronLS = 0 ;
247+ int nElectronUS = 0 ;
248+ if (eTrack.nElPairLS () > 0 ) {
249+ for (int i = 0 ; i < eTrack.nElPairLS (); ++i) {
251250
252- ++nElectronLS;
253- registry.fill (HIST (" hLSElectronBin" ), poolBin);
251+ ++nElectronLS;
252+ registry.fill (HIST (" hLSElectronBin" ), poolBin);
253+ }
254254 }
255- }
256- if (eTrack.nElPairUS () > 0 ) {
257- for (int i = 0 ; i < eTrack.nElPairUS (); ++i) {
255+ if (eTrack.nElPairUS () > 0 ) {
256+ for (int i = 0 ; i < eTrack.nElPairUS (); ++i) {
258257
259- ++nElectronUS;
260- registry.fill (HIST (" hULSElectronBin" ), poolBin);
258+ ++nElectronUS;
259+ registry.fill (HIST (" hULSElectronBin" ), poolBin);
260+ }
261261 }
262- }
263-
264- if (!skipEventTableFilling) {
265- registry.fill (HIST (" hElectronBin" ), poolBin);
266- entryElectron (phiElectron, etaElectron, ptElectron, nElectronLS, nElectronUS, poolBin, gCollisionId , timeStamp);
267- }
268262
269- for (const auto & hTrack : tracks) {
270- // Apply Hadron cut
271- if (!selAssoHadron (hTrack)) {
272- continue ;
273- }
274- ptHadron = hTrack.pt ();
275- phiHadron = hTrack.phi ();
276- etaHadron = hTrack.eta ();
277- if (hTrack.globalIndex () == eTrack.trackId ()) {
278- continue ;
263+ if (!skipEventTableFilling) {
264+ registry.fill (HIST (" hElectronBin" ), poolBin);
265+ entryElectron (phiElectron, etaElectron, ptElectron, nElectronLS, nElectronUS, poolBin, gCollisionId , timeStamp);
279266 }
280267
281- if (ptCondition && (ptElectron < ptHadron)) {
282- continue ;
283- }
268+ for (const auto & hTrack : tracks) {
269+ // Apply Hadron cut
270+ if (!selAssoHadron (hTrack)) {
271+ continue ;
272+ }
273+ ptHadron = hTrack.pt ();
274+ phiHadron = hTrack.phi ();
275+ etaHadron = hTrack.eta ();
276+ if (hTrack.globalIndex () == eTrack.trackId ()) {
277+ continue ;
278+ }
284279
285- deltaPhi = RecoDecay::constrainAngle (phiElectron - phiHadron, -o2::constants::math::PIHalf);
286- deltaEta = etaElectron - etaHadron ;
287- registry. fill ( HIST ( " hInclusiveEHCorrel " ), ptElectron, ptHadron, deltaPhi, deltaEta);
280+ if (ptCondition && (ptElectron < ptHadron)) {
281+ continue ;
282+ }
288283
289- int nElHadLSCorr = 0 ;
290- int nElHadUSCorr = 0 ;
291- if (eTrack.nElPairLS () > 0 ) {
292- for (int i = 0 ; i < eTrack.nElPairLS (); ++i) {
284+ deltaPhi = RecoDecay::constrainAngle (phiElectron - phiHadron, -o2::constants::math::PIHalf);
285+ deltaEta = etaElectron - etaHadron;
286+ registry.fill (HIST (" hInclusiveEHCorrel" ), ptElectron, ptHadron, deltaPhi, deltaEta);
293287
294- ++nElHadLSCorr;
295- registry.fill (HIST (" hLSEHCorrel" ), ptElectron, ptHadron, deltaPhi, deltaEta);
288+ int nElHadLSCorr = 0 ;
289+ int nElHadUSCorr = 0 ;
290+ if (eTrack.nElPairLS () > 0 ) {
291+ for (int i = 0 ; i < eTrack.nElPairLS (); ++i) {
292+
293+ ++nElHadLSCorr;
294+ registry.fill (HIST (" hLSEHCorrel" ), ptElectron, ptHadron, deltaPhi, deltaEta);
295+ }
296296 }
297- }
298- if (eTrack.nElPairUS () > 0 ) {
299- for (int i = 0 ; i < eTrack.nElPairUS (); ++i) {
297+ if (eTrack.nElPairUS () > 0 ) {
298+ for (int i = 0 ; i < eTrack.nElPairUS (); ++i) {
300299
301- registry.fill (HIST (" hULSEHCorrel" ), ptElectron, ptHadron, deltaPhi, deltaEta);
302- ++nElHadUSCorr;
300+ registry.fill (HIST (" hULSEHCorrel" ), ptElectron, ptHadron, deltaPhi, deltaEta);
301+ ++nElHadUSCorr;
302+ }
303303 }
304- }
305- entryElectronHadronPair (deltaPhi, deltaEta, ptElectron, ptHadron, poolBin, nElHadLSCorr, nElHadUSCorr);
304+ entryElectronHadronPair (deltaPhi, deltaEta, ptElectron, ptHadron, poolBin, nElHadLSCorr, nElHadUSCorr);
306305
307- } // end Hadron Track loop
306+ } // end Hadron Track loop
308307
309- } // end Electron loop
310- }
308+ } // end Electron loop
309+ }
311310
312311 // mix event electron-hadron correlation
313312
0 commit comments