Skip to content

Commit 93997fd

Browse files
skundu692skundu692
committed
Merge remote-tracking branch 'upstream/master'
2 parents fce48b5 + e5d1eb6 commit 93997fd

27 files changed

+1829
-1147
lines changed

‎ALICE3/Tasks/alice3-lutmaker.cxx‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ using namespace framework::expressions;
2525
void customize(std::vector<o2::framework::ConfigParamSpec>& workflowOptions)
2626
{
2727
std::vector<ConfigParamSpec> options{
28-
{"lut-el", VariantType::Int, 1, {"LUT input for the Electron PDG code"}},
29-
{"lut-mu", VariantType::Int, 1, {"LUT input for the Muon PDG code"}},
28+
{"lut-el", VariantType::Int, 0, {"LUT input for the Electron PDG code"}},
29+
{"lut-mu", VariantType::Int, 0, {"LUT input for the Muon PDG code"}},
3030
{"lut-pi", VariantType::Int, 1, {"LUT input for the Pion PDG code"}},
31-
{"lut-ka", VariantType::Int, 1, {"LUT input for the Kaon PDG code"}},
32-
{"lut-pr", VariantType::Int, 1, {"LUT input for the Proton PDG code"}},
31+
{"lut-ka", VariantType::Int, 0, {"LUT input for the Kaon PDG code"}},
32+
{"lut-pr", VariantType::Int, 0, {"LUT input for the Proton PDG code"}},
3333
{"lut-tr", VariantType::Int, 0, {"LUT input for the Triton PDG code"}},
3434
{"lut-de", VariantType::Int, 0, {"LUT input for the Deuteron PDG code"}},
3535
{"lut-he", VariantType::Int, 0, {"LUT input for the Helium3 PDG code"}}};
@@ -153,6 +153,7 @@ struct Alice3LutMaker {
153153
histos.add("QA/CovMat_sigmaSnp", "sigmaSnp" + commonTitle, kTH3F, {axisPt, axisEta, axissigmaSnp});
154154
histos.add("QA/CovMat_sigmaTgl", "sigmaTgl" + commonTitle, kTH3F, {axisPt, axisEta, axissigmaTgl});
155155
histos.add("QA/CovMat_sigma1Pt", "sigma1Pt" + commonTitle, kTH3F, {axisPt, axisEta, axissigma1Pt});
156+
histos.add("QA/sigma1Pt", "sigma1Pt" + commonTitle, kTH3F, {axisPt, axisEta, axissigma1Pt});
156157
histos.add("QA/CovMat_rhoZY", "rhoZY" + commonTitle, kTH3F, {axisPt, axisEta, axisrhoZY});
157158
histos.add("QA/CovMat_rhoSnpY", "rhoSnpY" + commonTitle, kTH3F, {axisPt, axisEta, axisrhoSnpY});
158159
histos.add("QA/CovMat_rhoSnpZ", "rhoSnpZ" + commonTitle, kTH3F, {axisPt, axisEta, axisrhoSnpZ});
@@ -262,6 +263,7 @@ struct Alice3LutMaker {
262263
histos.fill(HIST("QA/CovMat_sigmaSnp"), mcParticle.pt(), mcParticle.eta(), track.sigmaSnp());
263264
histos.fill(HIST("QA/CovMat_sigmaTgl"), mcParticle.pt(), mcParticle.eta(), track.sigmaTgl());
264265
histos.fill(HIST("QA/CovMat_sigma1Pt"), mcParticle.pt(), mcParticle.eta(), track.sigma1Pt());
266+
histos.fill(HIST("QA/sigma1Pt"), mcParticle.pt(), mcParticle.eta(), std::abs(track.signed1Pt()) - 1. / mcParticle.pt());
265267
histos.fill(HIST("QA/CovMat_rhoZY"), mcParticle.pt(), mcParticle.eta(), track.rhoZY());
266268
histos.fill(HIST("QA/CovMat_rhoSnpY"), mcParticle.pt(), mcParticle.eta(), track.rhoSnpY());
267269
histos.fill(HIST("QA/CovMat_rhoSnpZ"), mcParticle.pt(), mcParticle.eta(), track.rhoSnpZ());

‎CODEOWNERS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
/PWGEM @alibuild @feisenhu @dsekihat @ivorobye
3939
/PWGEM/Dilepton @alibuild @mikesas @rbailhac @dsekihat @ivorobye @feisenhu @hscheid
4040
/PWGEM/PhotonMeson @alibuild @mikesas @rbailhac @m-c-danisch @novitzky @mhemmer-cern @dsekihat
41-
/PWGHF @alibuild @vkucera @fcolamar @fgrosa @fcatalan92 @mfaggin @mmazzilli @deepathoms @NicoleBastid @hahassan7 @jpxrk @apalasciano @zhangbiao-phy @gluparel
41+
/PWGHF @alibuild @vkucera @fcolamar @fgrosa @fcatalan92 @mfaggin @mmazzilli @deepathoms @NicoleBastid @hahassan7 @jpxrk @apalasciano @zhangbiao-phy @gluparel @stefanopolitano
4242
# PWG-LF
4343
/PWGLF @alibuild @sustripathy @skundu692
4444
/PWGLF/DataModel @alibuild @sustripathy @skundu692 @gbencedi @abmodak @fmazzasc @maciacco @dmallick2 @smaff92 @ercolessi @romainschotter

‎Common/Core/fwdtrackUtilities.h‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ enum class propagationPoint : int {
4242
kToRabs = 2,
4343
};
4444
using SMatrix55 = ROOT::Math::SMatrix<double, 5, 5, ROOT::Math::MatRepSym<double, 5>>;
45+
using SMatrix55Std = ROOT::Math::SMatrix<double, 5>;
4546
using SMatrix5 = ROOT::Math::SVector<double, 5>;
4647

4748
/// propagate fwdtrack to a certain point.
@@ -98,6 +99,48 @@ o2::dataformats::GlobalFwdTrack propagateMuon(TFwdTrack const& muon, TCollision
9899

99100
return propmuon;
100101
}
102+
103+
template <typename TFwdTrack, typename TMFTTrack>
104+
o2::dataformats::GlobalFwdTrack refitGlobalMuonCov(TFwdTrack const& muon, TMFTTrack const& mft)
105+
{
106+
auto muonCov = muon.getCovariances();
107+
auto mftCov = mft.getCovariances();
108+
109+
SMatrix55Std jacob = ROOT::Math::SMatrixIdentity();
110+
auto tl = muon.getTgl();
111+
auto invQPt = muon.getInvQPt();
112+
jacob(4, 3) = tl / (invQPt * std::sqrt(1 + tl * tl));
113+
jacob(4, 4) = -std::sqrt(1 + tl * tl) / (invQPt * invQPt);
114+
115+
auto covQP = ROOT::Math::Similarity(jacob, muonCov);
116+
mftCov(4, 0) = 0;
117+
mftCov(4, 1) = 0;
118+
mftCov(4, 2) = 0;
119+
mftCov(4, 3) = 0;
120+
121+
mftCov(0, 4) = 0;
122+
mftCov(1, 4) = 0;
123+
mftCov(2, 4) = 0;
124+
mftCov(3, 4) = 0;
125+
mftCov(4, 4) = covQP(4, 4);
126+
127+
SMatrix55Std jacobInv = ROOT::Math::SMatrixIdentity();
128+
auto qp = std::sqrt(1 + tl * tl) / invQPt;
129+
auto tlMFT = mft.getTgl();
130+
jacobInv(4, 3) = tlMFT / (qp * std::sqrt(1 + tlMFT * tlMFT));
131+
jacobInv(4, 4) = -std::sqrt(1 + tlMFT * tlMFT) / (qp * qp);
132+
auto globalCov = ROOT::Math::Similarity(jacobInv, mftCov);
133+
134+
auto invQPtGlob = std::sqrt(1 + tlMFT * tlMFT) / qp;
135+
136+
o2::dataformats::GlobalFwdTrack globalTrack;
137+
globalTrack.setParameters(mft.getParameters());
138+
globalTrack.setInvQPt(invQPtGlob);
139+
globalTrack.setCovariances(globalCov);
140+
141+
return globalTrack;
142+
}
143+
101144
} // namespace fwdtrackutils
102145
} // namespace o2::aod
103146

‎Common/Tasks/centralityStudy.cxx‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@ struct centralityStudy {
132132
ConfigurableAxis axisMultPVContributors{"axisMultPVContributors", {200, 0, 6000}, "Number of PV Contributors"};
133133
ConfigurableAxis axisMultGlobalTracks{"axisMultGlobalTracks", {500, 0, 5000}, "Number of global tracks"};
134134
ConfigurableAxis axisMultMFTTracks{"axisMultMFTTracks", {500, 0, 5000}, "Number of MFT tracks"};
135+
ConfigurableAxis axisMultMCCounts{"axisMultMCCounts", {1000, 0, 5000}, "N_{ch}"};
135136

136137
ConfigurableAxis axisTrackOccupancy{"axisTrackOccupancy", {50, 0, 5000}, "Track occupancy"};
137138
ConfigurableAxis axisFT0COccupancy{"axisFT0COccupancy", {50, 0, 80000}, "FT0C occupancy"};
@@ -242,12 +243,19 @@ struct centralityStudy {
242243
}
243244

244245
if (doprocessCollisionsWithResolutionStudy) {
246+
// histograms with detector signals
245247
histos.add("hImpactParameterVsFT0A", "hImpactParameterVsFT0A", kTH2F, {axisMultFT0A, axisImpactParameter});
246248
histos.add("hImpactParameterVsFT0C", "hImpactParameterVsFT0C", kTH2F, {axisMultFT0C, axisImpactParameter});
247249
histos.add("hImpactParameterVsFT0M", "hImpactParameterVsFT0M", kTH2F, {axisMultFT0M, axisImpactParameter});
248250
histos.add("hImpactParameterVsFV0A", "hImpactParameterVsFV0A", kTH2F, {axisMultFV0A, axisImpactParameter});
249251
histos.add("hImpactParameterVsNMFTTracks", "hImpactParameterVsNMFTTracks", kTH2F, {axisMultMFTTracks, axisImpactParameter});
250252
histos.add("hImpactParameterVsNTPV", "hImpactParameterVsNTPV", kTH2F, {axisMultPVContributors, axisImpactParameter});
253+
254+
// histograms with actual MC counts in each region
255+
histos.add("hImpactParameterVsMCFT0A", "hImpactParameterVsMCFT0A", kTH2F, {axisMultMCCounts, axisImpactParameter});
256+
histos.add("hImpactParameterVsMCFT0C", "hImpactParameterVsMCFT0C", kTH2F, {axisMultMCCounts, axisImpactParameter});
257+
histos.add("hImpactParameterVsMCFT0M", "hImpactParameterVsMCFT0M", kTH2F, {axisMultMCCounts, axisImpactParameter});
258+
histos.add("hImpactParameterVsMCFV0A", "hImpactParameterVsMCFV0A", kTH2F, {axisMultMCCounts, axisImpactParameter});
251259
}
252260

253261
if (doOccupancyStudyVsRawValues2d) {
@@ -696,6 +704,11 @@ struct centralityStudy {
696704
histos.fill(HIST("hImpactParameterVsFV0A"), multFV0A, mcCollision.impactParameter());
697705
histos.fill(HIST("hImpactParameterVsNMFTTracks"), mftNtracks, mcCollision.impactParameter());
698706
histos.fill(HIST("hImpactParameterVsNTPV"), multNTracksPV, mcCollision.impactParameter());
707+
708+
histos.fill(HIST("hImpactParameterVsMCFT0A"), mcCollision.multMCFT0A(), mcCollision.impactParameter());
709+
histos.fill(HIST("hImpactParameterVsMCFT0C"), mcCollision.multMCFT0C(), mcCollision.impactParameter());
710+
histos.fill(HIST("hImpactParameterVsMCFT0M"), (mcCollision.multMCFT0A() + mcCollision.multMCFT0C()), mcCollision.impactParameter());
711+
histos.fill(HIST("hImpactParameterVsMCFV0A"), mcCollision.multMCFV0A(), mcCollision.impactParameter());
699712
}
700713
}
701714

‎PWGCF/Flow/Tasks/flowEseTask.cxx‎

Lines changed: 53 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ struct FlowEseTask {
125125
Configurable<bool> cfgUSESP{"cfgUSESP", false, "cfg for sp"};
126126
Configurable<float> cfgPhiDepSig{"cfgPhiDepSig", 0.2, "cfg for significance on phi dependent study"};
127127

128-
Configurable<bool> cfgShiftCorr{"cfgShiftCorr", false, "additional shift correction"};
128+
Configurable<bool> cfgShiftCorr{"cfgShiftCorr", true, "additional shift correction"};
129129
Configurable<bool> cfgShiftCorrDef{"cfgShiftCorrDef", false, "additional shift correction definition"};
130130
Configurable<std::string> cfgShiftPath{"cfgShiftPath", "Users/j/junlee/Qvector/QvecCalib/Shift", "Path for Shift"};
131131

@@ -150,15 +150,19 @@ struct FlowEseTask {
150150
ConfigurableAxis lowerQAxis{"lowerQAxis", {800, 0, 800}, "result of q2"};
151151
ConfigurableAxis multNumAxis{"multNumAxis", {300, 0, 2700}, "mult num"};
152152
ConfigurableAxis qvecAxis{"qvecAxis", {300, -1, 1}, "range of Qvector"};
153+
ConfigurableAxis qvec2Axis{"qvec2Axis", {600, 0, 600}, "range of Qvector Module"};
153154

154155
static constexpr float kMinAmplitudeThreshold = 1e-5f;
155156
static constexpr int kShiftLevel = 10;
156157
static constexpr int kLambdaId = 3122;
157158
static constexpr std::array<int, 4> kCorrLevel = {2, 3, 4, 1};
158159
static constexpr std::array<float, 10> kCentBoundaries = {0.0f, 3.49f, 4.93f, 6.98f, 8.55f, 9.87f, 11.0f, 12.1f, 13.1f, 14.0f};
159160
static constexpr std::array<float, 9> kCentValues = {2.5f, 7.5f, 15.0f, 25.0f, 35.0f, 45.0f, 55.0f, 65.0f, 75.0f};
161+
static constexpr std::array<float, 9> kCentrality = {0, 10, 20, 30, 40, 50, 60, 70, 80};
162+
static constexpr std::array<std::array<double, 2>, 8> kLowQvec = {{{121, 196}, {110, 172}, {93, 143}, {74, 117}, {58, 92}, {43, 70}, {31, 50}, {21, 34}}};
160163
static constexpr float kEtaAcceptance = 0.8f;
161164
static constexpr float kCentUpperLimit = 80.0f;
165+
static constexpr int kCentNum = 8;
162166

163167
TF1* fMultPVCutLow = nullptr;
164168
TF1* fMultPVCutHigh = nullptr;
@@ -228,6 +232,12 @@ struct FlowEseTask {
228232
histos.add(Form("psi%d/h_alambda_cos", i), "", {HistType::kTHnSparseF, {massAxis, ptAxis, cosAxis, centAxis, epAxis}});
229233
histos.add(Form("psi%d/h_lambda_cos2", i), "", {HistType::kTHnSparseF, {massAxis, ptAxis, cosAxis, centAxis, epAxis}});
230234
histos.add(Form("psi%d/h_alambda_cos2", i), "", {HistType::kTHnSparseF, {massAxis, ptAxis, cosAxis, centAxis, epAxis}});
235+
histos.add(Form("psi%d/h_lambda_cos2_q2", i), "", {HistType::kTH3F, {centAxis, qvec2Axis, cosAxis}});
236+
histos.add(Form("psi%d/h_alambda_cos2_q2", i), "", {HistType::kTH3F, {centAxis, qvec2Axis, cosAxis}});
237+
238+
histos.add(Form("psi%d/h_lambda_cos2_left", i), "", {HistType::kTH2F, {centAxis, cosAxis}});
239+
histos.add(Form("psi%d/h_lambda_cos2_mid", i), "", {HistType::kTH2F, {centAxis, cosAxis}});
240+
histos.add(Form("psi%d/h_lambda_cos2_right", i), "", {HistType::kTH2F, {centAxis, cosAxis}});
231241

232242
if (cfgRapidityDep) {
233243
histos.add(Form("psi%d/h_lambda_cos2_rap", i), "", {HistType::kTHnSparseF, {massAxis, ptAxis, cosAxis, centAxis, rapAxis}});
@@ -236,6 +246,14 @@ struct FlowEseTask {
236246

237247
histos.add(Form("psi%d/h_lambda_cossin", i), "", {HistType::kTHnSparseF, {massAxis, ptAxis, cosAxis, centAxis}});
238248
histos.add(Form("psi%d/h_alambda_cossin", i), "", {HistType::kTHnSparseF, {massAxis, ptAxis, cosAxis, centAxis}});
249+
histos.add(Form("psi%d/h_lambda_cossin_left", i), "", {HistType::kTH2F, {centAxis, cosAxis}});
250+
histos.add(Form("psi%d/h_lambda_cossin_mid", i), "", {HistType::kTH2F, {centAxis, cosAxis}});
251+
histos.add(Form("psi%d/h_lambda_cossin_right", i), "", {HistType::kTH2F, {centAxis, cosAxis}});
252+
253+
histos.add(Form("psi%d/h_lambda_cossin_q2", i), "", {HistType::kTH3F, {centAxis, qvec2Axis, cosAxis}});
254+
histos.add(Form("psi%d/h_alambda_cossin_q2", i), "", {HistType::kTH3F, {centAxis, qvec2Axis, cosAxis}});
255+
histos.add(Form("psi%d/h_lambda_cossin_cov", i), "", {HistType::kTHnSparseF, {ptAxis, cosAxis, centAxis}});
256+
histos.add(Form("psi%d/h_alambda_cossin_cov", i), "", {HistType::kTHnSparseF, {ptAxis, cosAxis, centAxis}});
239257

240258
if (cfgAccAzimuth) {
241259
histos.add(Form("psi%d/h_lambda_coscos", i), "", {HistType::kTHnSparseF, {massAxis, ptAxis, cosAxis, centAxis}});
@@ -351,6 +369,9 @@ struct FlowEseTask {
351369
histos.add(Form("psi%d/QA/EPRes_FT0C_FT0A_shifted", i), "", {HistType::kTH2F, {centQaAxis, cosAxis}});
352370
histos.add(Form("psi%d/QA/EPRes_FT0C_FV0A_shifted", i), "", {HistType::kTH2F, {centQaAxis, cosAxis}});
353371
histos.add(Form("psi%d/QA/EPRes_FT0A_FV0A_shifted", i), "", {HistType::kTH2F, {centQaAxis, cosAxis}});
372+
373+
histos.add(Form("psi%d/QA/EPRes_RefARefB_cov", i), "", {HistType::kTH2F, {centQaAxis, cosAxis}});
374+
histos.add(Form("psi%d/QA/EPRes_RefARefBRefC_cov", i), "", {HistType::kTH2F, {centQaAxis, cosAxis}});
354375
}
355376
}
356377

@@ -617,6 +638,9 @@ struct FlowEseTask {
617638
histos.fill(HIST("psi2/QA/EPRes_FT0C_FT0A_shifted"), centrality, std::cos(static_cast<float>(nmode) * (psidefFT0C + deltapsiFT0C - psidefFT0A - deltapsiFT0A)));
618639
histos.fill(HIST("psi2/QA/EPRes_FT0C_FV0A_shifted"), centrality, std::cos(static_cast<float>(nmode) * (psidefFT0C + deltapsiFT0C - psidefFV0A - deltapsiFV0A)));
619640
histos.fill(HIST("psi2/QA/EPRes_FT0A_FV0A_shifted"), centrality, std::cos(static_cast<float>(nmode) * (psidefFT0A + deltapsiFT0A - psidefFV0A - deltapsiFV0A)));
641+
642+
histos.fill(HIST("psi2/QA/EPRes_RefARefB_cov"), centrality, std::cos(static_cast<float>(nmode) * (psidefFT0C + deltapsiFT0C - psidefFT0A - deltapsiFT0A)) * std::cos(static_cast<float>(nmode) * (psidefFT0C + deltapsiFT0C - psidefFV0A - deltapsiFV0A)));
643+
histos.fill(HIST("psi2/QA/EPRes_RefARefBRefC_cov"), centrality, std::cos(static_cast<float>(nmode) * (psidefFT0C + deltapsiFT0C - psidefFT0A - deltapsiFT0A)) * std::cos(static_cast<float>(nmode) * (psidefFT0C + deltapsiFT0C - psidefFV0A - deltapsiFV0A)) * std::cos(static_cast<float>(nmode) * (psidefFT0A + deltapsiFT0A - psidefFV0A - deltapsiFV0A)));
620644
} else if (nmode == kCorrLevel[1]) {
621645
histos.fill(HIST("psi3/QA/EP_FT0C_shifted"), centrality, psidefFT0C + deltapsiFT0C);
622646
histos.fill(HIST("psi3/QA/EP_FT0A_shifted"), centrality, psidefFT0A + deltapsiFT0A);
@@ -644,10 +668,6 @@ struct FlowEseTask {
644668
qvecRefAInd = refAId * 4 + 3 + (nmode - 2) * cfgNQvec * 4;
645669
qvecRefBInd = refBId * 4 + 3 + (nmode - 2) * cfgNQvec * 4;
646670

647-
histos.fill(HIST("histQvecCent"), std::sqrt(collision.qvecFT0CReVec()[0] * collision.qvecFT0CReVec()[0] + collision.qvecFT0CImVec()[0] * collision.qvecFT0CImVec()[0]) * std::sqrt(collision.sumAmplFT0C()), collision.centFT0C());
648-
histos.fill(HIST("histQvecV2"), collision.qvecFT0CReVec()[0], collision.qvecFT0CImVec()[0], collision.centFT0C());
649-
histos.fill(HIST("histMult_Cent"), collision.sumAmplFT0C(), collision.centFT0C());
650-
651671
for (const auto& v0 : V0s) {
652672
auto postrack = v0.template posTrack_as<TrackCandidates>();
653673
auto negtrack = v0.template negTrack_as<TrackCandidates>();
@@ -752,12 +772,36 @@ struct FlowEseTask {
752772

753773
if (nmode == kCorrLevel[0]) { ////////////
754774
if (lambdaTag) {
775+
double q2 = std::sqrt(collision.qvecFT0CReVec()[0] * collision.qvecFT0CReVec()[0] + collision.qvecFT0CImVec()[0] * collision.qvecFT0CImVec()[0]) * std::sqrt(collision.sumAmplFT0C());
755776
histos.fill(HIST("psi2/h_lambda_cos"), v0.mLambda(), v0.pt(), angle * weight, centrality, relphi);
756777
histos.fill(HIST("psi2/h_lambda_cos2"), v0.mLambda(), v0.pt(), angle * angle, centrality, relphi);
757778
histos.fill(HIST("psi2/h_lambda_cossin"), v0.mLambda(), v0.pt(), angle * std::sin(relphi) * weight, centrality);
758779
histos.fill(HIST("psi2/h_lambda_vncos"), v0.mLambda(), v0.pt(), qvecMag * std::cos(relphi) * weight, centrality);
759780
histos.fill(HIST("psi2/h_lambda_vnsin"), v0.mLambda(), v0.pt(), std::sin(relphi), centrality);
760781

782+
histos.fill(HIST("psi2/h_lambda_cos2_q2"), centrality, std::sqrt(collision.qvecFT0CReVec()[0] * collision.qvecFT0CReVec()[0] + collision.qvecFT0CImVec()[0] * collision.qvecFT0CImVec()[0]) * std::sqrt(collision.sumAmplFT0C()), angle * angle);
783+
histos.fill(HIST("psi2/h_lambda_cossin_q2"), centrality, std::sqrt(collision.qvecFT0CReVec()[0] * collision.qvecFT0CReVec()[0] + collision.qvecFT0CImVec()[0] * collision.qvecFT0CImVec()[0]) * std::sqrt(collision.sumAmplFT0C()), angle * std::sin(relphi) * weight);
784+
785+
histos.fill(HIST("psi2/h_lambda_cossin_cov"), v0.pt(), angle * angle * angle * std::sin(relphi) * weight, centrality);
786+
787+
histos.fill(HIST("histQvecCent"), std::sqrt(collision.qvecFT0CReVec()[0] * collision.qvecFT0CReVec()[0] + collision.qvecFT0CImVec()[0] * collision.qvecFT0CImVec()[0]) * std::sqrt(collision.sumAmplFT0C()), centrality);
788+
histos.fill(HIST("histQvecV2"), collision.qvecFT0CReVec()[0], collision.qvecFT0CImVec()[0], collision.centFT0C());
789+
histos.fill(HIST("histMult_Cent"), collision.sumAmplFT0C(), collision.centFT0C());
790+
791+
for (int i = 0; i < kCentNum; i++) {
792+
if (centrality >= kCentrality[i] && centrality < kCentrality[i + 1]) {
793+
if (q2 < kLowQvec[i][0]) {
794+
histos.fill(HIST("psi2/h_lambda_cos2_left"), centrality, angle * angle);
795+
histos.fill(HIST("psi2/h_lambda_cossin_left"), centrality, angle * std::sin(relphi) * weight);
796+
} else if (q2 >= kLowQvec[i][1]) {
797+
histos.fill(HIST("psi2/h_lambda_cos2_right"), centrality, angle * angle);
798+
histos.fill(HIST("psi2/h_lambda_cossin_right"), centrality, angle * std::sin(relphi) * weight);
799+
} else {
800+
histos.fill(HIST("psi2/h_lambda_cos2_mid"), centrality, angle * angle);
801+
histos.fill(HIST("psi2/h_lambda_cossin_mid"), centrality, angle * std::sin(relphi) * weight);
802+
}
803+
}
804+
}
761805
if (cfgRapidityDep) {
762806
histos.fill(HIST("psi2/h_lambda_cos2_rap"), v0.mLambda(), v0.pt(), angle * angle, centrality, v0.yLambda(), weight);
763807
}
@@ -807,6 +851,10 @@ struct FlowEseTask {
807851
histos.fill(HIST("psi2/h_alambda_vncos"), v0.mAntiLambda(), v0.pt(), qvecMag * std::cos(relphi) * weight, centrality);
808852
histos.fill(HIST("psi2/h_alambda_vnsin"), v0.mAntiLambda(), v0.pt(), std::sin(relphi), centrality);
809853

854+
histos.fill(HIST("psi2/h_alambda_cos2_q2"), centrality, std::sqrt(collision.qvecFT0CReVec()[0] * collision.qvecFT0CReVec()[0] + collision.qvecFT0CImVec()[0] * collision.qvecFT0CImVec()[0]) * std::sqrt(collision.sumAmplFT0C()), angle * angle);
855+
histos.fill(HIST("psi2/h_alambda_cossin_q2"), centrality, std::sqrt(collision.qvecFT0CReVec()[0] * collision.qvecFT0CReVec()[0] + collision.qvecFT0CImVec()[0] * collision.qvecFT0CImVec()[0]) * std::sqrt(collision.sumAmplFT0C()), angle * std::sin(relphi) * weight);
856+
857+
histos.fill(HIST("psi2/h_alambda_cossin_cov"), v0.pt(), angle * angle * angle * std::sin(relphi) * weight, centrality);
810858
if (cfgRapidityDep) {
811859
histos.fill(HIST("psi2/h_alambda_cos2_rap"), v0.mAntiLambda(), v0.pt(), angle * angle, centrality, v0.yLambda(), weight);
812860
}

0 commit comments

Comments
 (0)