@@ -157,10 +157,6 @@ struct HfCorrelatorHfeHadrons {
157157
158158 double deltaPhi = -999 ;
159159 double deltaEta = -999 ;
160- double deltaPhi1 = -999 ;
161- double deltaEta1 = -999 ;
162- double deltaPhi2 = -999 ;
163- double deltaEta2 = -999 ;
164160 double ptHadron = -999 ;
165161 double etaHadron = -999 ;
166162 double phiHadron = -999 ;
@@ -169,25 +165,25 @@ struct HfCorrelatorHfeHadrons {
169165 continue ;
170166 }
171167 registry.fill (HIST (" hptElectron" ), ptElectron);
172- int isLSElectron = 0 ;
173- int isULSElectron = 0 ;
174- if (eTrack.isLSElectron () > 0 ) {
175- for (int i = 0 ; i < eTrack.isLSElectron (); ++i) {
168+ int lsElCounts = 0 ;
169+ int ulsElCounts = 0 ;
170+ if (eTrack.lsElPairCount () > 0 ) {
171+ for (int i = 0 ; i < eTrack.lsElPairCount (); ++i) {
176172
177- ++isLSElectron ;
173+ ++lsElCounts ;
178174 registry.fill (HIST (" hLSElectronBin" ), poolBin);
179175 }
180176 }
181- if (eTrack.isULSElectron () > 0 ) {
182- for (int i = 0 ; i < eTrack.isULSElectron (); ++i) {
177+ if (eTrack.ulsElPairCount () > 0 ) {
178+ for (int i = 0 ; i < eTrack.ulsElPairCount (); ++i) {
183179
184- ++isULSElectron ;
180+ ++ulsElCounts ;
185181 registry.fill (HIST (" hULSElectronBin" ), poolBin);
186182 }
187183 }
188184
189185 registry.fill (HIST (" hElectronBin" ), poolBin);
190- entryElectron (phiElectron, etaElectron, ptElectron, isLSElectron, isULSElectron , poolBin, gCollisionId , timeStamp);
186+ entryElectron (phiElectron, etaElectron, ptElectron, lsElCounts, ulsElCounts , poolBin, gCollisionId , timeStamp);
191187
192188 for (const auto & hTrack : tracks) {
193189 // Apply Hadron cut
@@ -209,28 +205,27 @@ struct HfCorrelatorHfeHadrons {
209205 phiHadron = hTrack.phi ();
210206 etaHadron = hTrack.eta ();
211207
212- deltaPhi1 = RecoDecay::constrainAngle (phiElectron - phiHadron, -o2::constants::math::PIHalf);
213- deltaEta1 = etaElectron - etaHadron;
208+ deltaPhi = RecoDecay::constrainAngle (phiElectron - phiHadron, -o2::constants::math::PIHalf);
209+ deltaEta = etaElectron - etaHadron;
214210 registry.fill (HIST (" hInclusiveEHCorrel" ), ptElectron, ptHadron, deltaPhi, deltaEta);
215- registry.fill (HIST (" hLSEHCorrel" ), ptElectron, ptHadron, deltaPhi1, deltaEta1);
216- registry.fill (HIST (" hULSEHCorrel" ), ptElectron, ptHadron, deltaPhi2, deltaEta2);
217211
218- int isLSElectroncorr = 0 ;
219- int isULSElectroncorr = 0 ;
220- if (eTrack.isLSElectron () > 0 ) {
221- for (int i = 0 ; i < eTrack.isLSElectron (); ++i) {
212+ int lsPairElcorr = 0 ;
213+ int ulsPairElcorr = 0 ;
214+ if (eTrack.lsElPairCount () > 0 ) {
215+ for (int i = 0 ; i < eTrack.lsElPairCount (); ++i) {
222216
223- ++isLSElectroncorr;
217+ ++lsPairElcorr;
218+ registry.fill (HIST (" hLSEHCorrel" ), ptElectron, ptHadron, deltaPhi, deltaEta);
224219 }
225220 }
226- if (eTrack.isULSElectron () > 0 ) {
227- for (int i = 0 ; i < eTrack.isULSElectron (); ++i) {
221+ if (eTrack.ulsElPairCount () > 0 ) {
222+ for (int i = 0 ; i < eTrack.ulsElPairCount (); ++i) {
228223
229224 registry.fill (HIST (" hULSEHCorrel" ), ptElectron, ptHadron, deltaPhi, deltaEta);
230- ++isULSElectroncorr ;
225+ ++ulsPairElcorr ;
231226 }
232227 }
233- entryElectronHadronPair (deltaPhi, deltaEta, ptElectron, ptHadron, poolBin, isLSElectroncorr, isULSElectroncorr );
228+ entryElectronHadronPair (deltaPhi, deltaEta, ptElectron, ptHadron, poolBin, lsPairElcorr, ulsPairElcorr );
234229
235230 } // end Hadron Track loop
236231 cntElectron++;
@@ -276,23 +271,23 @@ struct HfCorrelatorHfeHadrons {
276271 deltaEtaMix = etaElectronMix - etaHadronMix;
277272
278273 registry.fill (HIST (" hMixEventInclusiveEHCorrl" ), ptElectronMix, ptHadronMix, deltaPhiMix, deltaEtaMix);
279- int isLSElectroncorr = 0 ;
280- int isULSElectroncorr = 0 ;
281- if (t1.isLSElectron () > 0 ) {
282- for (int i = 0 ; i < t1.isLSElectron (); ++i) {
274+ int lsElPairCorr = 0 ;
275+ int ulsElPairCorr = 0 ;
276+ if (t1.lsElPairCount () > 0 ) {
277+ for (int i = 0 ; i < t1.lsElPairCount (); ++i) {
283278
284279 registry.fill (HIST (" hMixEventLSEHCorrel" ), ptElectronMix, ptHadronMix, deltaPhiMix, deltaEtaMix);
285- ++isLSElectroncorr ;
280+ ++lsElPairCorr ;
286281 }
287282 }
288- if (t1.isULSElectron () > 0 ) {
289- for (int i = 0 ; i < t1.isULSElectron (); ++i) {
283+ if (t1.ulsElPairCount () > 0 ) {
284+ for (int i = 0 ; i < t1.ulsElPairCount (); ++i) {
290285
291286 registry.fill (HIST (" hMixEventULSEHCorrel" ), ptElectronMix, ptHadronMix, deltaPhiMix, deltaEtaMix);
292- ++isULSElectroncorr ;
287+ ++ulsElPairCorr ;
293288 }
294289 }
295- entryElectronHadronPair (deltaPhiMix, deltaEtaMix, ptElectronMix, ptHadronMix, poolBin, isLSElectroncorr, isULSElectroncorr );
290+ entryElectronHadronPair (deltaPhiMix, deltaEtaMix, ptElectronMix, ptHadronMix, poolBin, lsElPairCorr, ulsElPairCorr );
296291 }
297292 }
298293
0 commit comments