Skip to content

Commit 571352b

Browse files
JimunLeeJimunLee
authored
Merge branch 'AliceO2Group:master' into master
2 parents 3661135 + 715fed3 commit 571352b

3 files changed

Lines changed: 78 additions & 21 deletions

File tree

‎PWGCF/JCorran/Tasks/jEPFlowAnalysis.cxx‎

Lines changed: 45 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,8 @@ 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"};
157159

158160
Configurable<std::string> cfgDetName{"cfgDetName", "FT0C", "The name of detector to be analyzed"};
159161
Configurable<std::string> cfgRefAName{"cfgRefAName", "TPCPos", "The name of detector for reference A"};
@@ -193,8 +195,14 @@ struct JEPFlowAnalysis {
193195

194196
float activity = -1.;
195197
float qOvecM = -1.;
196-
float highestPt = -1.;
197-
float hPtPhi = -999.;
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.;
198206

199207
std::vector<TProfile3D*> shiftprofile{};
200208
std::string fullCCDBShiftCorrPath;
@@ -424,11 +432,33 @@ struct JEPFlowAnalysis {
424432
}
425433

426434
if (cfgSelEvtTwoHP && i == 0) {
435+
leadingPt = 0.0;
436+
leadingPhi = 0.0;
437+
leadingEta = 0.0;
438+
439+
subleadingPt = 0.0;
440+
subleadingPhi = 0.0;
441+
subleadingEta = 0.0;
442+
427443
nHighPt = 0;
428444
for (const auto& track : tracks) {
429445
if (cfgTrkSelFlag && trackSel(track))
430446
continue;
431447

448+
if (leadingPt < track.pt()) {
449+
subleadingPt = leadingPt;
450+
subleadingPhi = leadingPhi;
451+
subleadingEta = leadingEta;
452+
453+
leadingPt = track.pt();
454+
leadingPhi = track.phi();
455+
leadingEta = track.eta();
456+
} else if (track.pt() > subleadingPt) {
457+
subleadingPt = track.pt();
458+
subleadingPhi = track.phi();
459+
subleadingEta = track.eta();
460+
}
461+
432462
if (track.pt() > cfgHighPtSel)
433463
nHighPt++;
434464
}
@@ -437,6 +467,12 @@ struct JEPFlowAnalysis {
437467
if (cfgSelEvtTwoHP && nHighPt < minnHighPt)
438468
continue;
439469

470+
if (std::abs(RecoDecay::constrainAngle(leadingPhi - subleadingPhi, 0) - constants::math::PI) > cfgTwoLPAngle)
471+
continue;
472+
473+
if (std::abs(leadingEta + subleadingEta) > cfgEtaBalancing)
474+
continue;
475+
440476
epFlowHistograms.fill(HIST("EpDet"), i + 2, cent, eps[0]);
441477
epFlowHistograms.fill(HIST("EpRefA"), i + 2, cent, eps[1]);
442478
epFlowHistograms.fill(HIST("EpRefB"), i + 2, cent, eps[2]);
@@ -486,17 +522,13 @@ struct JEPFlowAnalysis {
486522
continue;
487523
}
488524

489-
highestPt = 0.0;
490-
hPtPhi = 0.0;
525+
leadingPt = 0.0;
526+
leadingPhi = 0.0;
527+
leadingEta = 0.0;
491528
for (const auto& track : tracks) {
492529
if (cfgTrkSelFlag && trackSel(track))
493530
continue;
494531

495-
if (highestPt < track.pt()) {
496-
highestPt = track.pt();
497-
hPtPhi = track.phi();
498-
}
499-
500532
if (cfgEffCor) {
501533
weight = getEfficiencyCorrection(effMap, track.eta(), track.pt(), cent, coll.posZ());
502534
}
@@ -525,14 +557,14 @@ struct JEPFlowAnalysis {
525557
}
526558
}
527559
if (i == 0) { // second harmonic only
528-
epFlowHistograms.fill(HIST("hQoverM"), cent, highestPt, qOvecM);
529-
epFlowHistograms.fill(HIST("hActivity"), cent, highestPt, activity);
560+
epFlowHistograms.fill(HIST("hQoverM"), cent, leadingPt, qOvecM);
561+
epFlowHistograms.fill(HIST("hActivity"), cent, leadingPt, activity);
530562

531563
epFlowHistograms.fill(HIST("hQoverM2M"), cent, coll.qvecAmp()[detId], qOvecM);
532564
epFlowHistograms.fill(HIST("hQoverM2Q2"), cent, q2Mag, qOvecM);
533565

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);
566+
epFlowHistograms.fill(HIST("hQoverMdphi"), cent, RecoDecay::constrainAngle(leadingPhi - eps[0], -constants::math::PI), qOvecM);
567+
epFlowHistograms.fill(HIST("hActivitydphi"), cent, RecoDecay::constrainAngle(leadingPhi - eps[0], -constants::math::PI), leadingPt, activity);
536568
}
537569
}
538570
}

‎PWGJE/Tasks/jetChargedV2.cxx‎

Lines changed: 30 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -389,13 +389,20 @@ struct JetChargedV2 {
389389
//< RC test plots >//
390390
registry.add("h3_centrality_deltapT_RandomCornPhi_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}, {100, 0., o2::constants::math::TwoPI}}});
391391
registry.add("h3_centrality_deltapT_RandomCornPhi_localrhovsphi_abs", "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}, {100, 0., o2::constants::math::TwoPI}}});
392+
registry.add("h3_centrality_deltapT_RandomCornPhi_localrhovsphi_abs_in", "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}, {100, 0., o2::constants::math::TwoPI}}});
393+
registry.add("h3_centrality_deltapT_RandomCornPhi_localrhovsphi_abs_out", "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}, {100, 0., o2::constants::math::TwoPI}}});
392394

393395
registry.add("h3_centrality_deltapT_RandomCornPhi_rhorandomconewithoutleadingjet", "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}, {100, 0., o2::constants::math::TwoPI}}});
394396
registry.add("h3_centrality_deltapT_RandomCornPhi_localrhovsphiwithoutleadingjet", "centrality; #it{p}_{T,random cone} - #it{area, random cone} * #it{rho}(#varphi); #Delta#varphi_{jet}", {HistType::kTH3F, {{100, 0.0, 100.0}, {400, -200.0, 200.0}, {100, 0., o2::constants::math::TwoPI}}});
395397
registry.add("h3_centrality_deltapT_RandomCornPhi_rhorandomconewithoutleadingjet_abs", "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}, {100, 0., o2::constants::math::TwoPI}}});
396398
registry.add("h3_centrality_deltapT_RandomCornPhi_localrhovsphiwithoutleadingjet_abs", "centrality; #it{p}_{T,random cone} - #it{area, random cone} * #it{rho}(#varphi); #Delta#varphi_{jet}", {HistType::kTH3F, {{100, 0.0, 100.0}, {400, -200.0, 200.0}, {100, 0., o2::constants::math::TwoPI}}});
397399

398-
registry.add("h1_distribution_RC", "RC #phi-#Psi_{2}", {HistType::kTH1F, {{72, 0.0, o2::constants::math::TwoPI}}});
400+
registry.add("h3_centrality_deltapT_RandomCornPhi_rhorandomconewithoutleadingjet_abs_in", "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}, {100, 0., o2::constants::math::TwoPI}}});
401+
registry.add("h3_centrality_deltapT_RandomCornPhi_rhorandomconewithoutleadingjet_abs_out", "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}, {100, 0., o2::constants::math::TwoPI}}});
402+
registry.add("h3_centrality_deltapT_RandomCornPhi_localrhovsphiwithoutleadingjet_abs_in", "centrality; #it{p}_{T,random cone} - #it{area, random cone} * #it{rho}(#varphi); #Delta#varphi_{jet}", {HistType::kTH3F, {{100, 0.0, 100.0}, {400, -200.0, 200.0}, {100, 0., o2::constants::math::TwoPI}}});
403+
registry.add("h3_centrality_deltapT_RandomCornPhi_localrhovsphiwithoutleadingjet_abs_out", "centrality; #it{p}_{T,random cone} - #it{area, random cone} * #it{rho}(#varphi); #Delta#varphi_{jet}", {HistType::kTH3F, {{100, 0.0, 100.0}, {400, -200.0, 200.0}, {100, 0., o2::constants::math::TwoPI}}});
404+
405+
// registry.add("h1_distribution_RC", "RC #phi-#Psi_{2}", {HistType::kTH1F, {{72, 0.0, o2::constants::math::TwoPI}}});
399406

400407
//< bkg sub plot | end >//
401408
//< median rho >//
@@ -1440,9 +1447,9 @@ struct JetChargedV2 {
14401447
double ep3 = 0.;
14411448
int cfgNmodA = 2;
14421449
int cfgNmodB = 3;
1443-
int evtPlnAngleA = 7;
1444-
int evtPlnAngleB = 3;
1445-
int evtPlnAngleC = 5;
1450+
int evtPlnAngleA = 3;
1451+
// int evtPlnAngleB = 3;
1452+
// int evtPlnAngleC = 5;
14461453
for (uint i = 0; i < cfgnMods->size(); i++) {
14471454
int nmode = cfgnMods->at(i);
14481455
int detInd = detId * 4 + cfgnTotalSystem * 4 * (nmode - 2);
@@ -1651,7 +1658,8 @@ struct JetChargedV2 {
16511658
histosQA.fill(HIST("h2_ep2_FT0C_FT0M_bumpRegion"), helperEP.GetEventPlane(collision.qvecRe()[detInd + 3], collision.qvecIm()[detInd + 3], nmode), helperEP.GetEventPlane(collision.qvecRe()[detIndFT0M + 3], collision.qvecIm()[detIndFT0M + 3], nmode), collision.cent());
16521659
}
16531660

1654-
if ((absDelta < o2::constants::math::PIQuarter) || (absDelta >= evtPlnAngleA * o2::constants::math::PIQuarter) || (absDelta >= evtPlnAngleB * o2::constants::math::PIQuarter && absDelta < evtPlnAngleC * o2::constants::math::PIQuarter)) {
1661+
// if ((absDelta < o2::constants::math::PIQuarter) || (absDelta >= evtPlnAngleA * o2::constants::math::PIQuarter) || (absDelta >= evtPlnAngleB * o2::constants::math::PIQuarter && absDelta < evtPlnAngleC * o2::constants::math::PIQuarter)) {
1662+
if (absDelta < o2::constants::math::PIQuarter || absDelta >= evtPlnAngleA * o2::constants::math::PIQuarter) {
16551663
registry.fill(HIST("h_jet_pt_in_plane_v2"), jet.pt() - (collision.rho() * jet.area()), 1.0);
16561664
registry.fill(HIST("h2_centrality_jet_pt_in_plane_v2"), centrality, jet.pt() - (collision.rho() * jet.area()), 1.0);
16571665

@@ -1688,7 +1696,8 @@ struct JetChargedV2 {
16881696
phiMinusPsi3 = RecoDecay::constrainAngle(jet.phi() - ep3, -o2::constants::math::PI);
16891697
float absDelta3 = std::abs(phiMinusPsi3);
16901698

1691-
if ((absDelta3 < o2::constants::math::PIQuarter) || (absDelta3 >= evtPlnAngleA * o2::constants::math::PIQuarter) || (absDelta3 >= evtPlnAngleB * o2::constants::math::PIQuarter && absDelta3 < evtPlnAngleC * o2::constants::math::PIQuarter)) {
1699+
// if ((absDelta3 < o2::constants::math::PIQuarter) || (absDelta3 >= evtPlnAngleA * o2::constants::math::PIQuarter) || (absDelta3 >= evtPlnAngleB * o2::constants::math::PIQuarter && absDelta3 < evtPlnAngleC * o2::constants::math::PIQuarter)) {
1700+
if (absDelta3 < o2::constants::math::PIQuarter || absDelta3 >= evtPlnAngleA * o2::constants::math::PIQuarter) {
16921701
registry.fill(HIST("h_jet_pt_in_plane_v3"), jet.pt() - (collision.rho() * jet.area()), 1.0);
16931702
registry.fill(HIST("h_jet_pt_in_plane_v3_rho"), jet.pt() - (rholocal * jet.area()), 1.0);
16941703
} else {
@@ -1727,10 +1736,14 @@ struct JetChargedV2 {
17271736
}
17281737
}
17291738
}
1730-
registry.fill(HIST("h1_distribution_RC"), rcPhiPsi2);
1739+
// registry.fill(HIST("h1_distribution_RC"), rcPhiPsi2);
17311740
registry.fill(HIST("h3_centrality_deltapT_RandomCornPhi_localrhovsphi"), centrality, randomConePt - o2::constants::math::PI * randomConeR * randomConeR * rholocalRC, rcPhiPsi2, 1.0);
17321741
registry.fill(HIST("h3_centrality_deltapT_RandomCornPhi_localrhovsphi_abs"), centrality, randomConePt - o2::constants::math::PI * randomConeR * randomConeR * rholocalRC, absRcPhiPsi2, 1.0);
1733-
1742+
if (absRcPhiPsi2 < o2::constants::math::PIQuarter || absRcPhiPsi2 >= evtPlnAngleA * o2::constants::math::PIQuarter) {
1743+
registry.fill(HIST("h3_centrality_deltapT_RandomCornPhi_localrhovsphi_abs_in"), centrality, randomConePt - o2::constants::math::PI * randomConeR * randomConeR * rholocalRC, absRcPhiPsi2, 1.0);
1744+
} else {
1745+
registry.fill(HIST("h3_centrality_deltapT_RandomCornPhi_localrhovsphi_abs_out"), centrality, randomConePt - o2::constants::math::PI * randomConeR * randomConeR * rholocalRC, absRcPhiPsi2, 1.0);
1746+
}
17341747
// removing the leading jet from the random cone
17351748
if (jets.size() > 0) { // if there are no jets in the acceptance (from the jetfinder cuts) then there can be no leading jet
17361749
float dPhiLeadingJet = RecoDecay::constrainAngle(leadingJetPhi - randomConePhi, -o2::constants::math::PI);
@@ -1766,6 +1779,15 @@ struct JetChargedV2 {
17661779
registry.fill(HIST("h3_centrality_deltapT_RandomCornPhi_rhorandomconewithoutleadingjet"), centrality, randomConePt - o2::constants::math::PI * randomConeR * randomConeR * collision.rho(), rcPhiPsi2, 1.0);
17671780
registry.fill(HIST("h3_centrality_deltapT_RandomCornPhi_localrhovsphiwithoutleadingjet_abs"), centrality, randomConePt - o2::constants::math::PI * randomConeR * randomConeR * rholocalRC, absRcPhiPsi2, 1.0);
17681781
registry.fill(HIST("h3_centrality_deltapT_RandomCornPhi_rhorandomconewithoutleadingjet_abs"), centrality, randomConePt - o2::constants::math::PI * randomConeR * randomConeR * collision.rho(), absRcPhiPsi2, 1.0);
1782+
1783+
if (absRcPhiPsi2 < o2::constants::math::PIQuarter || absRcPhiPsi2 >= evtPlnAngleA * o2::constants::math::PIQuarter) {
1784+
registry.fill(HIST("h3_centrality_deltapT_RandomCornPhi_localrhovsphiwithoutleadingjet_abs_in"), centrality, randomConePt - o2::constants::math::PI * randomConeR * randomConeR * rholocalRC, absRcPhiPsi2, 1.0);
1785+
registry.fill(HIST("h3_centrality_deltapT_RandomCornPhi_rhorandomconewithoutleadingjet_abs_in"), centrality, randomConePt - o2::constants::math::PI * randomConeR * randomConeR * collision.rho(), absRcPhiPsi2, 1.0);
1786+
} else {
1787+
registry.fill(HIST("h3_centrality_deltapT_RandomCornPhi_localrhovsphiwithoutleadingjet_abs_out"), centrality, randomConePt - o2::constants::math::PI * randomConeR * randomConeR * rholocalRC, absRcPhiPsi2, 1.0);
1788+
registry.fill(HIST("h3_centrality_deltapT_RandomCornPhi_rhorandomconewithoutleadingjet_abs_out"), centrality, randomConePt - o2::constants::math::PI * randomConeR * randomConeR * collision.rho(), absRcPhiPsi2, 1.0);
1789+
}
1790+
17691791
} else if (nmode == cfgNmodB) {
17701792
continue;
17711793
}

‎PWGLF/Tasks/Strangeness/lambdalambda.cxx‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -527,6 +527,9 @@ struct lambdalambda {
527527
RanPhi += RecoV02.Phi();
528528
RecoV02Rot = ROOT::Math::PxPyPzMVector(RecoV02.Pt() * std::cos(RanPhi), RecoV02.Pt() * std::sin(RanPhi), RecoV02.Pz(), RecoV02.M());
529529
RecoV0V0Rot = RecoV01 + RecoV02Rot;
530+
if (std::abs(RecoV0V0Rot.Rapidity()) > cfgV0V0RapMax)
531+
continue;
532+
530533
histos.fill(HIST("h_InvMass_rot"), RecoV0V0Rot.M(), RecoV0V0Rot.Pt(), centrality, V01Tag + V02Tag);
531534
}
532535
}

0 commit comments

Comments
 (0)