@@ -72,6 +72,11 @@ using MyCollisionsMC = soa::Join<aod::Collisions, aod::EvSels, aod::CentFT0Cs, a
7272using MyTracksMC = soa::Join<aod::Tracks, aod::TracksExtra, aod::TracksDCA, aod::TrackSelection, aod::McTrackLabels>;
7373
7474struct JEPFlowAnalysis {
75+ enum Q2selMethod {
76+ kNosel = 0 ,
77+ kHsel ,
78+ kHistsel
79+ };
7580
7681 Service<o2::framework::O2DatabasePDG> pdg;
7782
@@ -199,6 +204,7 @@ struct JEPFlowAnalysis {
199204 float q2selLow = 0 .;
200205
201206 int nHighPt = 0 ;
207+ int minnHighPt = 2 ;
202208
203209 std::vector<float > ft0RelGainConst{};
204210 std::vector<float > fv0RelGainConst{};
@@ -411,7 +417,7 @@ struct JEPFlowAnalysis {
411417
412418 q2Mag = std::sqrt (std::pow (qx_shifted[0 ], 2 ) + std::pow (qy_shifted[0 ], 2 ));
413419
414- if (cfgq2analysis == 2 ) {
420+ if (cfgq2analysis == kHistsel ) {
415421 q2selHigh = q2Map->GetBinContent (q2Map->GetXaxis ()->FindBin (i + 2 ), q2Map->GetYaxis ()->FindBin (cent), q2Map->GetZaxis ()->FindBin (cfgQ2SelFrac));
416422 q2selLow = q2Map->GetBinContent (q2Map->GetXaxis ()->FindBin (i + 2 ), q2Map->GetYaxis ()->FindBin (cent), q2Map->GetZaxis ()->FindBin (1 . - cfgQ2SelFrac));
417423 }
@@ -427,7 +433,7 @@ struct JEPFlowAnalysis {
427433 }
428434 }
429435
430- if (cfgSelEvtTwoHP && nHighPt < 2 )
436+ if (cfgSelEvtTwoHP && nHighPt < minnHighPt )
431437 continue ;
432438
433439 epFlowHistograms.fill (HIST (" EpDet" ), i + 2 , cent, eps[0 ]);
@@ -453,7 +459,7 @@ struct JEPFlowAnalysis {
453459 epFlowHistograms.fill (HIST (" EpResQvecEvslRefARefBxx" ), i + 2 , cent, qx_shifted[1 ] * qx_shifted[2 ] + qy_shifted[1 ] * qy_shifted[2 ]);
454460 }
455461
456- if (cfgq2analysis == 1 ) {
462+ if (cfgq2analysis == kHsel ) {
457463 if (q2sel (q2Mag, true )) {
458464 epFlowHistograms.fill (HIST (" EpResQvecDetRefAxx_q2high" ), i + 2 , cent, qx_shifted[0 ] * qx_shifted[1 ] + qy_shifted[0 ] * qy_shifted[1 ]);
459465 epFlowHistograms.fill (HIST (" EpResQvecDetRefBxx_q2high" ), i + 2 , cent, qx_shifted[0 ] * qx_shifted[2 ] + qy_shifted[0 ] * qy_shifted[2 ]);
@@ -463,7 +469,7 @@ struct JEPFlowAnalysis {
463469 epFlowHistograms.fill (HIST (" EpResQvecDetRefBxx_q2low" ), i + 2 , cent, qx_shifted[0 ] * qx_shifted[2 ] + qy_shifted[0 ] * qy_shifted[2 ]);
464470 epFlowHistograms.fill (HIST (" EpResQvecRefARefBxx_q2low" ), i + 2 , cent, qx_shifted[1 ] * qx_shifted[2 ] + qy_shifted[1 ] * qy_shifted[2 ]);
465471 }
466- } else if (cfgq2analysis == 2 ) {
472+ } else if (cfgq2analysis == kHistsel ) {
467473 if (q2Mag > q2selHigh) {
468474 epFlowHistograms.fill (HIST (" EpResQvecDetRefAxx_q2high" ), i + 2 , cent, qx_shifted[0 ] * qx_shifted[1 ] + qy_shifted[0 ] * qy_shifted[1 ]);
469475 epFlowHistograms.fill (HIST (" EpResQvecDetRefBxx_q2high" ), i + 2 , cent, qx_shifted[0 ] * qx_shifted[2 ] + qy_shifted[0 ] * qy_shifted[2 ]);
@@ -503,13 +509,13 @@ struct JEPFlowAnalysis {
503509 epFlowHistograms.fill (HIST (" SPvnxx" ), i + 2 , cent, track.pt (), track.eta (), (std::cos (track.phi () * static_cast <float >(i + 2 )) * qx_shifted[0 ] + std::sin (track.phi () * static_cast <float >(i + 2 )) * qy_shifted[0 ]), weight);
504510 epFlowHistograms.fill (HIST (" SPvnxy" ), i + 2 , cent, track.pt (), track.eta (), (std::sin (track.phi () * static_cast <float >(i + 2 )) * qx_shifted[0 ] - std::cos (track.phi () * static_cast <float >(i + 2 )) * qy_shifted[0 ]), weight);
505511
506- if (cfgq2analysis == 1 ) {
512+ if (cfgq2analysis == kHsel ) {
507513 if (q2sel (q2Mag, true )) {
508514 epFlowHistograms.fill (HIST (" SPvnxx_q2high" ), i + 2 , cent, track.pt (), track.eta (), (std::cos (track.phi () * static_cast <float >(i + 2 )) * qx_shifted[0 ] + std::sin (track.phi () * static_cast <float >(i + 2 )) * qy_shifted[0 ]), weight);
509515 } else if (q2sel (q2Mag, false )) {
510516 epFlowHistograms.fill (HIST (" SPvnxx_q2low" ), i + 2 , cent, track.pt (), track.eta (), (std::cos (track.phi () * static_cast <float >(i + 2 )) * qx_shifted[0 ] + std::sin (track.phi () * static_cast <float >(i + 2 )) * qy_shifted[0 ]), weight);
511517 }
512- } else if (cfgq2analysis == 2 ) {
518+ } else if (cfgq2analysis == kHistsel ) {
513519 if (q2Mag > q2selHigh) {
514520 epFlowHistograms.fill (HIST (" SPvnxx_q2high" ), i + 2 , cent, track.pt (), track.eta (), (std::cos (track.phi () * static_cast <float >(i + 2 )) * qx_shifted[0 ] + std::sin (track.phi () * static_cast <float >(i + 2 )) * qy_shifted[0 ]), weight);
515521 } else if (q2Mag < q2selLow) {
0 commit comments