@@ -460,16 +460,13 @@ struct JetSpectraEseTask {
460460 registry.addClone (" eventQA/hPsi2FT0C" , " eventQA/hPsi3FT0C" );
461461 registry.addClone (" eventQA/hPsi2FT0C" , " eventQA/hPsi3FT0A" );
462462
463- registry.addClone (" eventQA/hPsi2FT0C" , " eventQA/hPsi4FT0C" );
464- registry.addClone (" eventQA/hPsi2FT0C" , " eventQA/hPsi4FT0A" );
465-
466463 registry.add (" eventQA/hCosPsi2AmC" , " ;Centrality;cos(2(#Psi_{2}^{A}-#Psi_{2}^{B}));#it{q}_{2}" , {HistType::kTH3F , {{centAxis}, {cosAxis}, {eseAxis}}});
467464 registry.addClone (" eventQA/hCosPsi2AmC" , " eventQA/hCosPsi2AmB" );
468465 registry.addClone (" eventQA/hCosPsi2AmC" , " eventQA/hCosPsi2BmC" );
469466
470- registry.addClone (" eventQA/hCosPsi2AmC" , " eventQA/hCosPsi4AmC " );
471- registry.addClone (" eventQA/hCosPsi4AmC " , " eventQA/hCosPsi4AmB " );
472- registry.addClone (" eventQA/hCosPsi4AmC " , " eventQA/hCosPsi4BmC " );
467+ registry.addClone (" eventQA/hCosPsi2AmC" , " eventQA/hCos4PsiAmC " );
468+ registry.addClone (" eventQA/hCosPsi2AmC " , " eventQA/hCos4PsiAmB " );
469+ registry.addClone (" eventQA/hCosPsi2AmC " , " eventQA/hCos4PsiBmC " );
473470
474471 registry.add (" eventQA/hQvecUncorV2" , " ;Centrality;Q_x;Q_y" , {HistType::kTH3F , {{centAxis}, {qvecAxis}, {qvecAxis}}});
475472 registry.addClone (" eventQA/hQvecUncorV2" , " eventQA/hQvecRectrV2" );
@@ -486,6 +483,9 @@ struct JetSpectraEseTask {
486483 registry.add (" hCentRhoRandomConewoLeadingJet" , " ; centrality; #it{p}_{T,random cone} - #it{area, random cone} * #it{rho} (GeV/c);" , {HistType::kTHnSparseF , {{centAxis}, {800 , -400.0 , 400.0 }, {dPhiAxis}, {eseAxis}}});
487484 registry.add (" hCentRhoRandomConeRndTrackDirwoOneLeadingJet" , " ; centrality; #it{p}_{T,random cone} - #it{area, random cone} * #it{rho} (GeV/c);" , {HistType::kTHnSparseF , {{centAxis}, {800 , -400.0 , 400.0 }, {dPhiAxis}, {eseAxis}}});
488485 registry.add (" hCentRhoRandomConeRndTrackDirwoTwoLeadingJet" , " ; centrality; #it{p}_{T,random cone} - #it{area, random cone} * #it{rho} (GeV/c);" , {HistType::kTHnSparseF , {{centAxis}, {800 , -400.0 , 400.0 }, {dPhiAxis}, {eseAxis}}});
486+
487+ registry.add (" h3CentdeltapTRndmConePhi_localrhovsphi" , " centrality; #it{p}_{T,random cone} - #it{area, random cone} * #it{rho}; #Delta#varphi_{jet}" , {HistType::kTH3F , {{100 , 0.0 , 100.0 }, {400 , -200.0 , 200.0 }, {dPhiAxis}}});
488+ registry.add (" h3CentdeltapTRndmConePhi_rhovsphi" , " centrality; #it{p}_{T,random cone} - #it{area, random cone} * #it{rho}; #Delta#varphi_{jet}" , {HistType::kTH3F , {{100 , 0.0 , 100.0 }, {400 , -200.0 , 200.0 }, {dPhiAxis}}});
489489 }
490490 if (doprocessMCParticleLevel) {
491491 LOGF (info, " JetSpectraEseTask::init() - MC Particle level" );
@@ -1221,29 +1221,23 @@ struct JetSpectraEseTask {
12211221 std::map<std::string, float > ep3Map{
12221222 {" FT0A" , computeEP (qVecNoESE<DetID::FT0A , false >(vec, 3 ), LowFT0Cut, 3 .0f )},
12231223 {" FT0C" , computeEP (qVecNoESE<DetID::FT0C , false >(vec, 3 ), LowFT0Cut, 3 .0f )}};
1224- std::map<std::string, float > ep4Map{
1225- {" FT0A" , computeEP (qVecNoESE<DetID::FT0A , false >(vec, 4 ), LowFT0Cut, 4 .0f )},
1226- {" FT0C" , computeEP (qVecNoESE<DetID::FT0C , false >(vec, 4 ), LowFT0Cut, 4 .0f )},
1227- {" FV0A" , computeEP (qVecNoESE<DetID::FV0A , false >(vec, 4 ), LowFT0Cut, 4 .0f )},
1228- {" TPCpos" , computeEP (qVecNoESE<DetID::TPCpos, false >(vec, 4 ), 0 .0f , 4 .0f )},
1229- {" TPCneg" , computeEP (qVecNoESE<DetID::TPCneg, false >(vec, 4 ), 0 .0f , 4 .0f )}};
12301224
12311225 if constexpr (P.psi ) {
12321226 if constexpr (P.hist ) {
1233- fillEP (vec, epMap, ep3Map, ep4Map );
1227+ fillEP (vec, epMap, ep3Map);
12341228 }
12351229
1236- auto cosPsi = [](float psiX, float psiY) {
1237- return psiX == InvalidValue || psiY == InvalidValue ? InvalidValue : std::cos (2 . 0f * (psiX - psiY));
1230+ auto cosPsi = [](float psiX, float psiY, const float harmonic = 2 . 0f ) {
1231+ return psiX == InvalidValue || psiY == InvalidValue ? InvalidValue : std::cos (harmonic * (psiX - psiY));
12381232 };
12391233 const std::array<float , 3 > epCorrContainer{
12401234 cosPsi (epMap.at (cfgEPRefA), epMap.at (cfgEPRefC)),
12411235 cosPsi (epMap.at (cfgEPRefA), epMap.at (cfgEPRefB)),
12421236 cosPsi (epMap.at (cfgEPRefB), epMap.at (cfgEPRefC))};
12431237 const std::array<float , 3 > epCorrContainer4{
1244- cosPsi (ep4Map .at (cfgEPRefA), ep4Map .at (cfgEPRefC)),
1245- cosPsi (ep4Map .at (cfgEPRefA), ep4Map .at (cfgEPRefB)),
1246- cosPsi (ep4Map .at (cfgEPRefB), ep4Map .at (cfgEPRefC))};
1238+ cosPsi (epMap .at (cfgEPRefA), epMap .at (cfgEPRefC), 4 . 0f ),
1239+ cosPsi (epMap .at (cfgEPRefA), epMap .at (cfgEPRefB), 4 . 0f ),
1240+ cosPsi (epMap .at (cfgEPRefB), epMap .at (cfgEPRefC), 4 . 0f )};
12471241
12481242 if constexpr (P.hist ) {
12491243 fillEPCos (vec, epCorrContainer, epCorrContainer4);
@@ -1258,13 +1252,13 @@ struct JetSpectraEseTask {
12581252 registry.fill (HIST (" eventQA/hCosPsi2AmB" ), col.centFT0M (), Corr[1 ], col.qPERCFT0C ()[0 ]);
12591253 registry.fill (HIST (" eventQA/hCosPsi2BmC" ), col.centFT0M (), Corr[2 ], col.qPERCFT0C ()[0 ]);
12601254
1261- registry.fill (HIST (" eventQA/hCosPsi4AmC " ), col.centFT0M (), Corr4[0 ], col.qPERCFT0C ()[0 ]);
1262- registry.fill (HIST (" eventQA/hCosPsi4AmB " ), col.centFT0M (), Corr4[1 ], col.qPERCFT0C ()[0 ]);
1263- registry.fill (HIST (" eventQA/hCosPsi4BmC " ), col.centFT0M (), Corr4[2 ], col.qPERCFT0C ()[0 ]);
1255+ registry.fill (HIST (" eventQA/hCos4PsiAmC " ), col.centFT0M (), Corr4[0 ], col.qPERCFT0C ()[0 ]);
1256+ registry.fill (HIST (" eventQA/hCos4PsiAmB " ), col.centFT0M (), Corr4[1 ], col.qPERCFT0C ()[0 ]);
1257+ registry.fill (HIST (" eventQA/hCos4PsiBmC " ), col.centFT0M (), Corr4[2 ], col.qPERCFT0C ()[0 ]);
12641258 }
12651259
12661260 template <typename collision>
1267- void fillEP (const collision& col, const std::map<std::string, float >& epMap, const std::map<std::string, float >& ep3Map, const std::map<std::string, float >& ep4Map )
1261+ void fillEP (const collision& col, const std::map<std::string, float >& epMap, const std::map<std::string, float >& ep3Map)
12681262 {
12691263 registry.fill (HIST (" eventQA/hPsi2FT0A" ), col.centFT0M (), epMap.at (" FT0A" ));
12701264 registry.fill (HIST (" eventQA/hPsi2FV0A" ), col.centFT0M (), epMap.at (" FV0A" ));
@@ -1274,9 +1268,6 @@ struct JetSpectraEseTask {
12741268
12751269 registry.fill (HIST (" eventQA/hPsi3FT0A" ), col.centFT0M (), ep3Map.at (" FT0A" ));
12761270 registry.fill (HIST (" eventQA/hPsi3FT0C" ), col.centFT0M (), ep3Map.at (" FT0C" ));
1277-
1278- registry.fill (HIST (" eventQA/hPsi4FT0A" ), col.centFT0M (), ep4Map.at (" FT0A" ));
1279- registry.fill (HIST (" eventQA/hPsi4FT0C" ), col.centFT0M (), ep4Map.at (" FT0C" ));
12801271 }
12811272 constexpr int detIDN (const DetID id)
12821273 {
@@ -1600,6 +1591,8 @@ struct JetSpectraEseTask {
16001591 }
16011592 }
16021593 }
1594+ registry.fill (HIST (" h3CentdeltapTRndmConePhi_rhovsphi" ), collision.centFT0M (), randomConePt - o2::constants::math::PI * randomConeR * randomConeR * collision.rho (), dPhiRC);
1595+ registry.fill (HIST (" h3CentdeltapTRndmConePhi_localrhovsphi" ), collision.centFT0M (), randomConePt - o2::constants::math::PI * randomConeR * randomConeR * rho, dPhiRC);
16031596 registry.fill (HIST (" hCentRhoRandomConeRndTrackDirwoOneLeadingJet" ), collision.centFT0M (), randomConePtWithoutOneLeadJet - o2::constants::math::PI * randomConeR * randomConeR * rho, dPhiRC, qPerc[0 ]);
16041597 registry.fill (HIST (" hCentRhoRandomConeRndTrackDirwoTwoLeadingJet" ), collision.centFT0M (), randomConePtWithoutTwoLeadJet - o2::constants::math::PI * randomConeR * randomConeR * rho, dPhiRC, qPerc[0 ]);
16051598 }
0 commit comments