@@ -100,8 +100,8 @@ struct Dilepton {
100100 Configurable<std::string> spresoHistName{" spresoHistName" , " h1_R2_FT0M_BPos_BNeg" , " histogram name of SP resolution file" };
101101
102102 Configurable<int > cfgAnalysisType{" cfgAnalysisType" , static_cast <int >(o2::aod::pwgem::dilepton::utils::pairutil::DileptonAnalysisType::kQC ), " kQC:0, kUPC:1, kFlowV2:2, kFlowV3:3, kPolarization:4, kHFll:5" };
103- Configurable<int > cfgEP2Estimator_for_Mix{" cfgEP2Estimator_for_Mix" , 3 , " FT0M:0, FT0A:1, FT0C:2, BTot:3, BPos:4, BNeg:5" };
104- Configurable<int > cfgQvecEstimator{" cfgQvecEstimator" , 2 , " FT0M:0, FT0A:1, FT0C:2, FV0A :3, BTot :4, BPos :5, BNeg :6" };
103+ Configurable<int > cfgEP2Estimator_for_Mix{" cfgEP2Estimator_for_Mix" , 3 , " FT0M:0, FT0A:1, FT0C:2, BTot:3, BPos:4, BNeg:5, FV0A:6 " };
104+ Configurable<int > cfgQvecEstimator{" cfgQvecEstimator" , 2 , " FT0M:0, FT0A:1, FT0C:2, BTot :3, BPos :4, BNeg :5, FV0A :6" };
105105 Configurable<int > cfgCentEstimator{" cfgCentEstimator" , 2 , " FT0M:0, FT0A:1, FT0C:2" };
106106 Configurable<int > cfgOccupancyEstimator{" cfgOccupancyEstimator" , 0 , " FT0C:0, Track:1" };
107107 Configurable<float > cfgCentMin{" cfgCentMin" , -1 , " min. centrality" };
@@ -525,7 +525,7 @@ struct Dilepton {
525525
526526 void addhistograms ()
527527 {
528- const std::string qvec_det_names[6 ] = {" FT0M" , " FT0A" , " FT0C" , " BTot" , " BPos" , " BNeg" };
528+ const std::string qvec_det_names[7 ] = {" FT0M" , " FT0A" , " FT0C" , " BTot" , " BPos" , " BNeg" , " FV0A " };
529529
530530 std::string mass_axis_title = " m_{ll} (GeV/c^{2})" ;
531531 std::string pair_pt_axis_title = " p_{T,ll} (GeV/c)" ;
@@ -973,23 +973,23 @@ struct Dilepton {
973973 std::array<float , 2 > q2ft0m = {collision.q2xft0m (), collision.q2yft0m ()};
974974 std::array<float , 2 > q2ft0a = {collision.q2xft0a (), collision.q2yft0a ()};
975975 std::array<float , 2 > q2ft0c = {collision.q2xft0c (), collision.q2yft0c ()};
976- std::array<float , 2 > q2fv0a = {collision.q2xfv0a (), collision.q2yfv0a ()};
977976 std::array<float , 2 > q2btot = {collision.q2xbtot (), collision.q2ybtot ()};
978977 std::array<float , 2 > q2bpos = {collision.q2xbpos (), collision.q2ybpos ()};
979978 std::array<float , 2 > q2bneg = {collision.q2xbneg (), collision.q2ybneg ()};
979+ std::array<float , 2 > q2fv0a = {collision.q2xfv0a (), collision.q2yfv0a ()};
980980 std::array<float , 2 > q3ft0m = {collision.q3xft0m (), collision.q3yft0m ()};
981981 std::array<float , 2 > q3ft0a = {collision.q3xft0a (), collision.q3yft0a ()};
982982 std::array<float , 2 > q3ft0c = {collision.q3xft0c (), collision.q3yft0c ()};
983- std::array<float , 2 > q3fv0a = {collision.q3xfv0a (), collision.q3yfv0a ()};
984983 std::array<float , 2 > q3btot = {collision.q3xbtot (), collision.q3ybtot ()};
985984 std::array<float , 2 > q3bpos = {collision.q3xbpos (), collision.q3ybpos ()};
986985 std::array<float , 2 > q3bneg = {collision.q3xbneg (), collision.q3ybneg ()};
986+ std::array<float , 2 > q3fv0a = {collision.q3xfv0a (), collision.q3yfv0a ()};
987987
988988 std::vector<std::vector<std::array<float , 2 >>> qvectors = {
989989 {{999 .f , 999 .f }, {999 .f , 999 .f }, {999 .f , 999 .f }, {999 .f , 999 .f }, {999 .f , 999 .f }, {999 .f , 999 .f }, {999 .f , 999 .f }}, // 0th harmonics
990990 {{999 .f , 999 .f }, {999 .f , 999 .f }, {999 .f , 999 .f }, {999 .f , 999 .f }, {999 .f , 999 .f }, {999 .f , 999 .f }, {999 .f , 999 .f }}, // 1st harmonics
991- {q2ft0m, q2ft0a, q2ft0c, q2fv0a, q2btot, q2bpos, q2bneg}, // 2nd harmonics
992- {q3ft0m, q3ft0a, q3ft0c, q3fv0a, q3btot, q3bpos, q3bneg}, // 3rd harmonics
991+ {q2ft0m, q2ft0a, q2ft0c, q2btot, q2bpos, q2bneg, q2fv0a }, // 2nd harmonics
992+ {q3ft0m, q3ft0a, q3ft0c, q3btot, q3bpos, q3bneg, q3fv0a }, // 3rd harmonics
993993 };
994994
995995 if constexpr (ev_id == 0 ) {
@@ -1169,25 +1169,25 @@ struct Dilepton {
11691169 std::array<float , 2 > q2ft0m = {collision.q2xft0m (), collision.q2yft0m ()};
11701170 std::array<float , 2 > q2ft0a = {collision.q2xft0a (), collision.q2yft0a ()};
11711171 std::array<float , 2 > q2ft0c = {collision.q2xft0c (), collision.q2yft0c ()};
1172- std::array<float , 2 > q2fv0a = {collision.q2xfv0a (), collision.q2yfv0a ()};
11731172 std::array<float , 2 > q2btot = {collision.q2xbtot (), collision.q2ybtot ()};
11741173 std::array<float , 2 > q2bpos = {collision.q2xbpos (), collision.q2ybpos ()};
11751174 std::array<float , 2 > q2bneg = {collision.q2xbneg (), collision.q2ybneg ()};
1175+ std::array<float , 2 > q2fv0a = {collision.q2xfv0a (), collision.q2yfv0a ()};
11761176 std::array<float , 2 > q3ft0m = {collision.q3xft0m (), collision.q3yft0m ()};
11771177 std::array<float , 2 > q3ft0a = {collision.q3xft0a (), collision.q3yft0a ()};
11781178 std::array<float , 2 > q3ft0c = {collision.q3xft0c (), collision.q3yft0c ()};
1179- std::array<float , 2 > q3fv0a = {collision.q3xfv0a (), collision.q3yfv0a ()};
11801179 std::array<float , 2 > q3btot = {collision.q3xbtot (), collision.q3ybtot ()};
11811180 std::array<float , 2 > q3bpos = {collision.q3xbpos (), collision.q3ybpos ()};
11821181 std::array<float , 2 > q3bneg = {collision.q3xbneg (), collision.q3ybneg ()};
1183- const float eventplanes_2_for_mix[6 ] = {collision.ep2ft0m (), collision.ep2ft0a (), collision.ep2ft0c (), collision.ep2btot (), collision.ep2bpos (), collision.ep2bneg ()};
1182+ std::array<float , 2 > q3fv0a = {collision.q3xfv0a (), collision.q3yfv0a ()};
1183+ const float eventplanes_2_for_mix[7 ] = {collision.ep2ft0m (), collision.ep2ft0a (), collision.ep2ft0c (), collision.ep2btot (), collision.ep2bpos (), collision.ep2bneg (), collision.ep2fv0a ()};
11841184 float ep2 = eventplanes_2_for_mix[cfgEP2Estimator_for_Mix];
11851185
11861186 std::vector<std::vector<std::array<float , 2 >>> qvectors = {
11871187 {{999 .f , 999 .f }, {999 .f , 999 .f }, {999 .f , 999 .f }, {999 .f , 999 .f }, {999 .f , 999 .f }, {999 .f , 999 .f }, {999 .f , 999 .f }}, // 0th harmonics
11881188 {{999 .f , 999 .f }, {999 .f , 999 .f }, {999 .f , 999 .f }, {999 .f , 999 .f }, {999 .f , 999 .f }, {999 .f , 999 .f }, {999 .f , 999 .f }}, // 1st harmonics
1189- {q2ft0m, q2ft0a, q2ft0c, q2fv0a, q2btot, q2bpos, q2bneg}, // 2nd harmonics
1190- {q3ft0m, q3ft0a, q3ft0c, q3fv0a, q3btot, q3bpos, q3bneg}, // 3rd harmonics
1189+ {q2ft0m, q2ft0a, q2ft0c, q2btot, q2bpos, q2bneg, q2fv0a }, // 2nd harmonics
1190+ {q3ft0m, q3ft0a, q3ft0c, q3btot, q3bpos, q3bneg, q3fv0a }, // 3rd harmonics
11911191 };
11921192
11931193 if (nmod == 2 ) {
@@ -1427,23 +1427,23 @@ struct Dilepton {
14271427 std::array<float , 2 > q2ft0m = {collision.q2xft0m (), collision.q2yft0m ()};
14281428 std::array<float , 2 > q2ft0a = {collision.q2xft0a (), collision.q2yft0a ()};
14291429 std::array<float , 2 > q2ft0c = {collision.q2xft0c (), collision.q2yft0c ()};
1430- std::array<float , 2 > q2fv0a = {collision.q2xfv0a (), collision.q2yfv0a ()};
14311430 std::array<float , 2 > q2btot = {collision.q2xbtot (), collision.q2ybtot ()};
14321431 std::array<float , 2 > q2bpos = {collision.q2xbpos (), collision.q2ybpos ()};
14331432 std::array<float , 2 > q2bneg = {collision.q2xbneg (), collision.q2ybneg ()};
1433+ std::array<float , 2 > q2fv0a = {collision.q2xfv0a (), collision.q2yfv0a ()};
14341434 std::array<float , 2 > q3ft0m = {collision.q3xft0m (), collision.q3yft0m ()};
14351435 std::array<float , 2 > q3ft0a = {collision.q3xft0a (), collision.q3yft0a ()};
14361436 std::array<float , 2 > q3ft0c = {collision.q3xft0c (), collision.q3yft0c ()};
1437- std::array<float , 2 > q3fv0a = {collision.q3xfv0a (), collision.q3yfv0a ()};
14381437 std::array<float , 2 > q3btot = {collision.q3xbtot (), collision.q3ybtot ()};
14391438 std::array<float , 2 > q3bpos = {collision.q3xbpos (), collision.q3ybpos ()};
14401439 std::array<float , 2 > q3bneg = {collision.q3xbneg (), collision.q3ybneg ()};
1440+ std::array<float , 2 > q3fv0a = {collision.q3xfv0a (), collision.q3yfv0a ()};
14411441
14421442 std::vector<std::vector<std::array<float , 2 >>> qvectors = {
14431443 {{999 .f , 999 .f }, {999 .f , 999 .f }, {999 .f , 999 .f }, {999 .f , 999 .f }, {999 .f , 999 .f }, {999 .f , 999 .f }, {999 .f , 999 .f }}, // 0th harmonics
14441444 {{999 .f , 999 .f }, {999 .f , 999 .f }, {999 .f , 999 .f }, {999 .f , 999 .f }, {999 .f , 999 .f }, {999 .f , 999 .f }, {999 .f , 999 .f }}, // 1st harmonics
1445- {q2ft0m, q2ft0a, q2ft0c, q2fv0a, q2btot, q2bpos, q2bneg}, // 2nd harmonics
1446- {q3ft0m, q3ft0a, q3ft0c, q3fv0a, q3btot, q3bpos, q3bneg}, // 3rd harmonics
1445+ {q2ft0m, q2ft0a, q2ft0c, q2btot, q2bpos, q2bneg, q2fv0a }, // 2nd harmonics
1446+ {q3ft0m, q3ft0a, q3ft0c, q3btot, q3bpos, q3bneg, q3fv0a }, // 3rd harmonics
14471447 };
14481448
14491449 if (!fEMEventCut .IsSelected (collision)) {
0 commit comments