Skip to content

Commit 69e5cf6

Browse files
spucillospucillo
authored
Merge pull request #2 from alibuild/alibot-cleanup-11414
Please consider the following formatting changes to #11414
2 parents 57baef9 + 6a37e71 commit 69e5cf6

File tree

1 file changed

+47
-51
lines changed

1 file changed

+47
-51
lines changed

‎PWGLF/Tasks/Strangeness/strangenessInJets.cxx‎

Lines changed: 47 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -253,8 +253,8 @@ struct StrangenessInJets {
253253
registryQC.add("sumPtUE", "sumPtUE", HistType::kTH1F, {{500, 0, 50, "#it{p}_{T} (GeV/#it{c})"}});
254254
registryQC.add("nJets_found", "nJets_found", HistType::kTH1F, {{10, 0, 10, "#it{n}_{Jet}"}});
255255
registryQC.add("nJets_selected", "nJets_selected", HistType::kTH1F, {{10, 0, 10, "#it{n}_{Jet}"}});
256-
//registryQC.add("dcaxy_vs_pt", "dcaxy_vs_pt", HistType::kTH2F, {{100, 0.0, 5.0, "#it{p}_{T} (GeV/#it{c})"}, {2000, -0.05, 0.05, "DCA_{xy} (cm)"}});
257-
//registryQC.add("dcaz_vs_pt", "dcaz_vs_pt", HistType::kTH2F, {{100, 0.0, 5.0, "#it{p}_{T} (GeV/#it{c})"}, {2000, -0.05, 0.05, "DCA_{z} (cm)"}});
256+
// registryQC.add("dcaxy_vs_pt", "dcaxy_vs_pt", HistType::kTH2F, {{100, 0.0, 5.0, "#it{p}_{T} (GeV/#it{c})"}, {2000, -0.05, 0.05, "DCA_{xy} (cm)"}});
257+
// registryQC.add("dcaz_vs_pt", "dcaz_vs_pt", HistType::kTH2F, {{100, 0.0, 5.0, "#it{p}_{T} (GeV/#it{c})"}, {2000, -0.05, 0.05, "DCA_{z} (cm)"}});
258258
registryQC.add("jet_jet_overlaps", "jet_jet_overlaps", HistType::kTH2F, {{20, 0.0, 20.0, "#it{n}_{jet}"}, {200, 0.0, 200.0, "#it{n}_{overlaps}"}});
259259
registryQC.add("jet_ue_overlaps", "jet_ue_overlaps", HistType::kTH2F, {{20, 0.0, 20.0, "#it{n}_{jet}"}, {200, 0.0, 200.0, "#it{n}_{overlaps}"}});
260260
registryQC.add("ue_ue_overlaps", "ue_ue_overlaps", HistType::kTH2F, {{20, 0.0, 20.0, "#it{n}_{jet}"}, {200, 0.0, 200.0, "#it{n}_{overlaps}"}});
@@ -390,12 +390,12 @@ struct StrangenessInJets {
390390
registryMC.add("XiNeg_reconstructed_incl", "XiNeg_reconstructed_incl", HistType::kTH2F, {multBinning, ptAxis});
391391
registryMC.add("OmegaPos_reconstructed_incl", "OmegaPos_reconstructed_incl", HistType::kTH2F, {multBinning, ptAxis});
392392
registryMC.add("OmegaNeg_reconstructed_incl", "OmegaNeg_reconstructed_incl", HistType::kTH2F, {multBinning, ptAxis});
393-
393+
394394
// Histograms for secondary lambda in jet and UE
395-
//registryMC.add("Secondary_Lambda_InJet", "Secondary_Lambda_InJet", HistType::kTH1F, {ptAxis});
396-
//registryMC.add("Secondary_Lambda_Ue", "Secondary_Lambda_Ue", HistType::kTH1F, {ptAxis});
397-
//registryMC.add("Secondary_AntiLambda_InJet", "Secondary_AntiLambda_InJet", HistType::kTH1F, {ptAxis});
398-
//registryMC.add("Secondary_AntiLambda_Ue", "Secondary_AntiLambda_Ue", HistType::kTH1F, {ptAxis});
395+
// registryMC.add("Secondary_Lambda_InJet", "Secondary_Lambda_InJet", HistType::kTH1F, {ptAxis});
396+
// registryMC.add("Secondary_Lambda_Ue", "Secondary_Lambda_Ue", HistType::kTH1F, {ptAxis});
397+
// registryMC.add("Secondary_AntiLambda_InJet", "Secondary_AntiLambda_InJet", HistType::kTH1F, {ptAxis});
398+
// registryMC.add("Secondary_AntiLambda_Ue", "Secondary_AntiLambda_Ue", HistType::kTH1F, {ptAxis});
399399

400400
// Histograms for 2d reweighting (pion)
401401
registryMC.add("mc_pi_plus_eta_pt/jet", "", HistType::kTH2F, {ptAxisPi, etaAxis});
@@ -1047,13 +1047,12 @@ struct StrangenessInJets {
10471047
get2DWeightHisto(histoNameWeightsXiUe, twodWeightsXiUe);
10481048
get2DWeightHisto(histoNameWeightsAntiXiInJet, twodWeightsAntiXiInJet);
10491049
get2DWeightHisto(histoNameWeightsAntiXiUe, twodWeightsAntiXiUe);
1050-
1050+
10511051
// Omega
10521052
get2DWeightHisto(histoNameWeightsOmegaInJet, twodWeightsOmegaInJet);
10531053
get2DWeightHisto(histoNameWeightsOmegaUe, twodWeightsOmegaUe);
10541054
get2DWeightHisto(histoNameWeightsAntiOmegaInJet, twodWeightsAntiOmegaInJet);
10551055
get2DWeightHisto(histoNameWeightsAntiOmegaUe, twodWeightsAntiOmegaUe);
1056-
10571056
}
10581057

10591058
void processData(SelCollisions::iterator const& collision,
@@ -1522,7 +1521,7 @@ struct StrangenessInJets {
15221521
TVector3 momentumV0 = momentumPos + momentumNeg;
15231522

15241523
// Feed-down for lambda
1525-
//if (passedLambdaSelection(v0, pos, neg) && pdgParent == kLambda0) {
1524+
// if (passedLambdaSelection(v0, pos, neg) && pdgParent == kLambda0) {
15261525
// if (!isPhysPrim) {
15271526
// double wSecLambdaInJet(1.0);
15281527
// double wSecLambdaUe(1.0);
@@ -1553,7 +1552,7 @@ struct StrangenessInJets {
15531552
//}
15541553

15551554
// Feed-down for antilambda
1556-
//if (passedAntiLambdaSelection(v0, pos, neg) && pdgParent == kLambda0Bar) {
1555+
// if (passedAntiLambdaSelection(v0, pos, neg) && pdgParent == kLambda0Bar) {
15571556
// if (!isPhysPrim) {
15581557
// double wSecAntiLambdaInJet(1.0);
15591558
// double wSecAntiLambdaUe(1.0);
@@ -1685,8 +1684,8 @@ struct StrangenessInJets {
16851684
TVector3 momentumPos(posParticle.px(), posParticle.py(), posParticle.pz());
16861685
TVector3 momentumNeg(negParticle.px(), negParticle.py(), negParticle.pz());
16871686
TVector3 momentumBach(bachParticle.px(), bachParticle.py(), bachParticle.pz());
1688-
TVector3 momentumV0 = momentumPos + momentumNeg;
1689-
TVector3 momentumCasc = momentumV0 + momentumBach;
1687+
TVector3 momentumV0 = momentumPos + momentumNeg;
1688+
TVector3 momentumCasc = momentumV0 + momentumBach;
16901689

16911690
// Xi+
16921691
if (passedXiSelection(casc, pos, neg, bach, collision) && pdgParent == kXiPlusBar) {
@@ -1704,28 +1703,28 @@ struct StrangenessInJets {
17041703
if (passedOmegaSelection(casc, pos, neg, bach, collision) && pdgParent == kOmegaMinus) {
17051704
registryMC.fill(HIST("OmegaNeg_reconstructed_incl"), multiplicity, casc.pt());
17061705
}
1707-
1706+
17081707
if (!isPhysPrim)
17091708
continue;
1710-
1709+
17111710
double wXiPosJet(1.0), wXiPosUe(1.0), wXiNegJet(1.0), wXiNegUe(1.0), wOmegaPosJet(1.0), wOmegaPosUe(1.0), wOmegaNegJet(1.0), wOmegaNegUe(1.0);
17121711
if (applyReweighting) {
1713-
int ix = twodWeightsXiInJet->GetXaxis()->FindBin(momentumCasc.Pt());
1714-
int iy = twodWeightsXiInJet->GetYaxis()->FindBin(momentumCasc.Eta());
1715-
wXiPosJet = twodWeightsAntiXiInJet->GetBinContent(ix, iy);
1716-
wXiPosUe = twodWeightsAntiXiUe->GetBinContent(ix, iy);
1717-
wXiNegJet = twodWeightsXiInJet->GetBinContent(ix, iy);
1718-
wXiNegUe = twodWeightsXiUe->GetBinContent(ix, iy);
1719-
wOmegaPosJet = twodWeightsAntiOmegaInJet->GetBinContent(ix, iy);
1720-
wOmegaPosUe = twodWeightsAntiOmegaUe->GetBinContent(ix, iy);
1721-
wOmegaNegJet = twodWeightsOmegaInJet->GetBinContent(ix, iy);
1722-
wOmegaNegUe = twodWeightsOmegaUe->GetBinContent(ix, iy);
1723-
1724-
// protections
1725-
if (ix == 0 || ix > twodWeightsXiInJet->GetNbinsX()) {
1712+
int ix = twodWeightsXiInJet->GetXaxis()->FindBin(momentumCasc.Pt());
1713+
int iy = twodWeightsXiInJet->GetYaxis()->FindBin(momentumCasc.Eta());
1714+
wXiPosJet = twodWeightsAntiXiInJet->GetBinContent(ix, iy);
1715+
wXiPosUe = twodWeightsAntiXiUe->GetBinContent(ix, iy);
1716+
wXiNegJet = twodWeightsXiInJet->GetBinContent(ix, iy);
1717+
wXiNegUe = twodWeightsXiUe->GetBinContent(ix, iy);
1718+
wOmegaPosJet = twodWeightsAntiOmegaInJet->GetBinContent(ix, iy);
1719+
wOmegaPosUe = twodWeightsAntiOmegaUe->GetBinContent(ix, iy);
1720+
wOmegaNegJet = twodWeightsOmegaInJet->GetBinContent(ix, iy);
1721+
wOmegaNegUe = twodWeightsOmegaUe->GetBinContent(ix, iy);
1722+
1723+
// protections
1724+
if (ix == 0 || ix > twodWeightsXiInJet->GetNbinsX()) {
17261725
wXiPosJet = 1.0;
17271726
wXiPosUe = 1.0;
1728-
wXiNegJet = 1.0;
1727+
wXiNegJet = 1.0;
17291728
wXiNegUe = 1.0;
17301729
wOmegaPosJet = 1.0;
17311730
wOmegaPosUe = 1.0;
@@ -1735,15 +1734,15 @@ struct StrangenessInJets {
17351734
if (iy == 0 || iy > twodWeightsXiInJet->GetNbinsY()) {
17361735
wXiPosJet = 1.0;
17371736
wXiPosUe = 1.0;
1738-
wXiNegJet = 1.0;
1737+
wXiNegJet = 1.0;
17391738
wXiNegUe = 1.0;
17401739
wOmegaPosJet = 1.0;
17411740
wOmegaPosUe = 1.0;
17421741
wOmegaNegJet = 1.0;
17431742
wOmegaNegUe = 1.0;
17441743
}
17451744
}
1746-
1745+
17471746
// Xi+
17481747
if (passedXiSelection(casc, pos, neg, bach, collision) && pdgParent == kXiPlusBar) {
17491748
registryMC.fill(HIST("XiPos_reconstructed_jet"), multiplicity, casc.pt(), wXiPosJet);
@@ -1764,9 +1763,7 @@ struct StrangenessInJets {
17641763
registryMC.fill(HIST("OmegaNeg_reconstructed_jet"), multiplicity, casc.pt(), wOmegaNegJet);
17651764
registryMC.fill(HIST("OmegaNeg_reconstructed_ue"), multiplicity, casc.pt(), wOmegaNegUe);
17661765
}
1767-
1768-
1769-
}
1766+
}
17701767

17711768
/*
17721769
// Reconstructed Tracks
@@ -1941,25 +1938,25 @@ struct StrangenessInJets {
19411938
wAntilambdaUe = 1.0;
19421939
}
19431940
}
1944-
1941+
19451942
double wXiPosJet(1.0), wXiPosUe(1.0), wXiNegJet(1.0), wXiNegUe(1.0), wOmegaPosJet(1.0), wOmegaPosUe(1.0), wOmegaNegJet(1.0), wOmegaNegUe(1.0);
19461943
if (applyReweighting) {
1947-
int ix = twodWeightsXiInJet->GetXaxis()->FindBin(mcParticle.pt());
1948-
int iy = twodWeightsXiInJet->GetYaxis()->FindBin(mcParticle.eta());
1949-
wXiPosJet = twodWeightsAntiXiInJet->GetBinContent(ix, iy);
1950-
wXiPosUe = twodWeightsAntiXiUe->GetBinContent(ix, iy);
1951-
wXiNegJet = twodWeightsXiInJet->GetBinContent(ix, iy);
1952-
wXiNegUe = twodWeightsXiUe->GetBinContent(ix, iy);
1953-
wOmegaPosJet = twodWeightsAntiOmegaInJet->GetBinContent(ix, iy);
1954-
wOmegaPosUe = twodWeightsAntiOmegaUe->GetBinContent(ix, iy);
1955-
wOmegaNegJet = twodWeightsOmegaInJet->GetBinContent(ix, iy);
1956-
wOmegaNegUe = twodWeightsOmegaUe->GetBinContent(ix, iy);
1957-
1958-
// protections
1959-
if (ix == 0 || ix > twodWeightsXiInJet->GetNbinsX()) {
1944+
int ix = twodWeightsXiInJet->GetXaxis()->FindBin(mcParticle.pt());
1945+
int iy = twodWeightsXiInJet->GetYaxis()->FindBin(mcParticle.eta());
1946+
wXiPosJet = twodWeightsAntiXiInJet->GetBinContent(ix, iy);
1947+
wXiPosUe = twodWeightsAntiXiUe->GetBinContent(ix, iy);
1948+
wXiNegJet = twodWeightsXiInJet->GetBinContent(ix, iy);
1949+
wXiNegUe = twodWeightsXiUe->GetBinContent(ix, iy);
1950+
wOmegaPosJet = twodWeightsAntiOmegaInJet->GetBinContent(ix, iy);
1951+
wOmegaPosUe = twodWeightsAntiOmegaUe->GetBinContent(ix, iy);
1952+
wOmegaNegJet = twodWeightsOmegaInJet->GetBinContent(ix, iy);
1953+
wOmegaNegUe = twodWeightsOmegaUe->GetBinContent(ix, iy);
1954+
1955+
// protections
1956+
if (ix == 0 || ix > twodWeightsXiInJet->GetNbinsX()) {
19601957
wXiPosJet = 1.0;
19611958
wXiPosUe = 1.0;
1962-
wXiNegJet = 1.0;
1959+
wXiNegJet = 1.0;
19631960
wXiNegUe = 1.0;
19641961
wOmegaPosJet = 1.0;
19651962
wOmegaPosUe = 1.0;
@@ -1969,15 +1966,14 @@ struct StrangenessInJets {
19691966
if (iy == 0 || iy > twodWeightsXiInJet->GetNbinsY()) {
19701967
wXiPosJet = 1.0;
19711968
wXiPosUe = 1.0;
1972-
wXiNegJet = 1.0;
1969+
wXiNegJet = 1.0;
19731970
wXiNegUe = 1.0;
19741971
wOmegaPosJet = 1.0;
19751972
wOmegaPosUe = 1.0;
19761973
wOmegaNegJet = 1.0;
19771974
wOmegaNegUe = 1.0;
19781975
}
19791976
}
1980-
19811977

19821978
switch (mcParticle.pdgCode()) {
19831979
/*

0 commit comments

Comments
 (0)