@@ -154,8 +154,6 @@ struct JEPFlowAnalysis {
154154
155155 Configurable<bool > cfgSelEvtTwoHP{" cfgSelEvtTwoHP" , false , " event selection with two high pT" };
156156 Configurable<float > cfgHighPtSel{" cfgHighPtSel" , 5.0 , " pT threshold with cfgSelEvtTwoHP" };
157- Configurable<float > cfgTwoLPAngle{" cfgTwoLPAngle" , 0.5 , " azimuthal difference between two LP" };
158- Configurable<float > cfgEtaBalancing{" cfgEtaBalancing" , 0.5 , " pseudorapidity difference between two LP" };
159157
160158 Configurable<std::string> cfgDetName{" cfgDetName" , " FT0C" , " The name of detector to be analyzed" };
161159 Configurable<std::string> cfgRefAName{" cfgRefAName" , " TPCPos" , " The name of detector for reference A" };
@@ -195,14 +193,8 @@ struct JEPFlowAnalysis {
195193
196194 float activity = -1 .;
197195 float qOvecM = -1 .;
198-
199- float leadingPt = -1 .;
200- float leadingPhi = -999 .;
201- float leadingEta = -999 .;
202-
203- float subleadingPt = -1 .;
204- float subleadingPhi = -999 .;
205- float subleadingEta = -999 .;
196+ float highestPt = -1 .;
197+ float hPtPhi = -999 .;
206198
207199 std::vector<TProfile3D*> shiftprofile{};
208200 std::string fullCCDBShiftCorrPath;
@@ -431,49 +423,20 @@ struct JEPFlowAnalysis {
431423 q2selLow = q2Map->GetBinContent (q2Map->GetXaxis ()->FindBin (i + 2 ), q2Map->GetYaxis ()->FindBin (cent), q2Map->GetZaxis ()->FindBin (1 . - cfgQ2SelFrac));
432424 }
433425
434-
435426 if (cfgSelEvtTwoHP && i == 0 ) {
436- leadingPt = 0.0 ;
437- leadingPhi = 0.0 ;
438- leadingEta = 0.0 ;
439-
440- subleadingPt = 0.0 ;
441- subleadingPhi = 0.0 ;
442- subleadingEta = 0.0 ;
443-
444427 nHighPt = 0 ;
445428 for (const auto & track : tracks) {
446429 if (cfgTrkSelFlag && trackSel (track))
447430 continue ;
448431
449- if (leadingPt < track.pt ()) {
450- subleadingPt = leadingPt;
451- subleadingPhi = leadingPhi;
452- subleadingEta = leadingEta;
453-
454- leadingPt = track.pt ();
455- leadingPhi = track.phi ();
456- leadingEta = track.eta ();
457- } else if (track.pt () > subleadingPt) {
458- subleadingPt = track.pt ();
459- subleadingPhi = track.phi ();
460- subleadingEta = track.eta ();
461- }
462-
463- if (track.pt () > cfgHighPtSel)
464- nHighPt++;
432+ if (track.pt () > cfgHighPtSel)
433+ nHighPt++;
465434 }
466435 }
467436
468437 if (cfgSelEvtTwoHP && nHighPt < minnHighPt)
469438 continue ;
470439
471- if (std::abs (RecoDecay::constrainAngle (leadingPhi - subleadingPhi, 0 ) - constants::math::PI ) > cfgTwoLPAngle)
472- continue ;
473-
474- if (std::abs (leadingEta + subleadingEta) > cfgEtaBalancing)
475- continue ;
476-
477440 epFlowHistograms.fill (HIST (" EpDet" ), i + 2 , cent, eps[0 ]);
478441 epFlowHistograms.fill (HIST (" EpRefA" ), i + 2 , cent, eps[1 ]);
479442 epFlowHistograms.fill (HIST (" EpRefB" ), i + 2 , cent, eps[2 ]);
@@ -523,13 +486,17 @@ struct JEPFlowAnalysis {
523486 continue ;
524487 }
525488
526- leadingPt = 0.0 ;
527- leadingPhi = 0.0 ;
528- leadingEta = 0.0 ;
489+ highestPt = 0.0 ;
490+ hPtPhi = 0.0 ;
529491 for (const auto & track : tracks) {
530492 if (cfgTrkSelFlag && trackSel (track))
531493 continue ;
532494
495+ if (highestPt < track.pt ()) {
496+ highestPt = track.pt ();
497+ hPtPhi = track.phi ();
498+ }
499+
533500 if (cfgEffCor) {
534501 weight = getEfficiencyCorrection (effMap, track.eta (), track.pt (), cent, coll.posZ ());
535502 }
@@ -558,14 +525,14 @@ struct JEPFlowAnalysis {
558525 }
559526 }
560527 if (i == 0 ) { // second harmonic only
561- epFlowHistograms.fill (HIST (" hQoverM" ), cent, leadingPt , qOvecM);
562- epFlowHistograms.fill (HIST (" hActivity" ), cent, leadingPt , activity);
528+ epFlowHistograms.fill (HIST (" hQoverM" ), cent, highestPt , qOvecM);
529+ epFlowHistograms.fill (HIST (" hActivity" ), cent, highestPt , activity);
563530
564531 epFlowHistograms.fill (HIST (" hQoverM2M" ), cent, coll.qvecAmp ()[detId], qOvecM);
565532 epFlowHistograms.fill (HIST (" hQoverM2Q2" ), cent, q2Mag, qOvecM);
566533
567- epFlowHistograms.fill (HIST (" hQoverMdphi" ), cent, RecoDecay::constrainAngle (leadingPhi - eps[0 ], -constants::math::PI ), qOvecM);
568- epFlowHistograms.fill (HIST (" hActivitydphi" ), cent, RecoDecay::constrainAngle (leadingPhi - eps[0 ], -constants::math::PI ), leadingPt , activity);
534+ epFlowHistograms.fill (HIST (" hQoverMdphi" ), cent, RecoDecay::constrainAngle (hPtPhi - eps[0 ], -constants::math::PI ), qOvecM);
535+ epFlowHistograms.fill (HIST (" hActivitydphi" ), cent, RecoDecay::constrainAngle (hPtPhi - eps[0 ], -constants::math::PI ), highestPt , activity);
569536 }
570537 }
571538 }
0 commit comments