Skip to content

Commit 58d738a

Browse files
spucillospucillo
authored
Merge pull request #1 from alibuild/alibot-cleanup-11414
Please consider the following formatting changes to #11414
2 parents e453104 + 5fba795 commit 58d738a

File tree

1 file changed

+45
-49
lines changed

1 file changed

+45
-49
lines changed

‎PWGLF/Tasks/Strangeness/strangenessInJets.cxx‎

Lines changed: 45 additions & 49 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});
@@ -1061,13 +1061,12 @@ struct StrangenessInJets {
10611061
get2DWeightHisto(histoNameWeightsXiUe, twodWeightsXiUe);
10621062
get2DWeightHisto(histoNameWeightsAntiXiInJet, twodWeightsAntiXiInJet);
10631063
get2DWeightHisto(histoNameWeightsAntiXiUe, twodWeightsAntiXiUe);
1064-
1064+
10651065
// Omega
10661066
get2DWeightHisto(histoNameWeightsOmegaInJet, twodWeightsOmegaInJet);
10671067
get2DWeightHisto(histoNameWeightsOmegaUe, twodWeightsOmegaUe);
10681068
get2DWeightHisto(histoNameWeightsAntiOmegaInJet, twodWeightsAntiOmegaInJet);
10691069
get2DWeightHisto(histoNameWeightsAntiOmegaUe, twodWeightsAntiOmegaUe);
1070-
10711070
}
10721071

10731072
void processData(SelCollisions::iterator const& collision,
@@ -1536,7 +1535,7 @@ struct StrangenessInJets {
15361535
TVector3 momentumV0 = momentumPos + momentumNeg;
15371536

15381537
// Feed-down for lambda
1539-
//if (passedLambdaSelection(v0, pos, neg) && pdgParent == kLambda0) {
1538+
// if (passedLambdaSelection(v0, pos, neg) && pdgParent == kLambda0) {
15401539
// if (!isPhysPrim) {
15411540
// double wSecLambdaInJet(1.0);
15421541
// double wSecLambdaUe(1.0);
@@ -1567,7 +1566,7 @@ struct StrangenessInJets {
15671566
//}
15681567

15691568
// Feed-down for antilambda
1570-
//if (passedAntiLambdaSelection(v0, pos, neg) && pdgParent == kLambda0Bar) {
1569+
// if (passedAntiLambdaSelection(v0, pos, neg) && pdgParent == kLambda0Bar) {
15711570
// if (!isPhysPrim) {
15721571
// double wSecAntiLambdaInJet(1.0);
15731572
// double wSecAntiLambdaUe(1.0);
@@ -1710,28 +1709,28 @@ struct StrangenessInJets {
17101709
if (passedOmegaSelection(casc, pos, neg, bach, collision) && pdgParent == kOmegaMinus) {
17111710
registryMC.fill(HIST("OmegaNeg_reconstructed_incl"), multiplicity, casc.pt());
17121711
}
1713-
1712+
17141713
if (!isPhysPrim)
17151714
continue;
1716-
1715+
17171716
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);
17181717
if (applyReweighting) {
1719-
int ix = twodWeightsXiInJet->GetXaxis()->FindBin(momentumV0.Pt());
1720-
int iy = twodWeightsXiInJet->GetYaxis()->FindBin(momentumV0.Eta());
1721-
wXiPosJet = twodWeightsAntiXiInJet->GetBinContent(ix, iy);
1722-
wXiPosUe = twodWeightsAntiXiUe->GetBinContent(ix, iy);
1723-
wXiNegJet = twodWeightsXiInJet->GetBinContent(ix, iy);
1724-
wXiNegUe = twodWeightsXiUe->GetBinContent(ix, iy);
1725-
wOmegaPosJet = twodWeightsAntiOmegaInJet->GetBinContent(ix, iy);
1726-
wOmegaPosUe = twodWeightsAntiOmegaUe->GetBinContent(ix, iy);
1727-
wOmegaNegJet = twodWeightsOmegaInJet->GetBinContent(ix, iy);
1728-
wOmegaNegUe = twodWeightsOmegaUe->GetBinContent(ix, iy);
1729-
1730-
// protections
1731-
if (ix == 0 || ix > twodWeightsXiInJet->GetNbinsX()) {
1718+
int ix = twodWeightsXiInJet->GetXaxis()->FindBin(momentumV0.Pt());
1719+
int iy = twodWeightsXiInJet->GetYaxis()->FindBin(momentumV0.Eta());
1720+
wXiPosJet = twodWeightsAntiXiInJet->GetBinContent(ix, iy);
1721+
wXiPosUe = twodWeightsAntiXiUe->GetBinContent(ix, iy);
1722+
wXiNegJet = twodWeightsXiInJet->GetBinContent(ix, iy);
1723+
wXiNegUe = twodWeightsXiUe->GetBinContent(ix, iy);
1724+
wOmegaPosJet = twodWeightsAntiOmegaInJet->GetBinContent(ix, iy);
1725+
wOmegaPosUe = twodWeightsAntiOmegaUe->GetBinContent(ix, iy);
1726+
wOmegaNegJet = twodWeightsOmegaInJet->GetBinContent(ix, iy);
1727+
wOmegaNegUe = twodWeightsOmegaUe->GetBinContent(ix, iy);
1728+
1729+
// protections
1730+
if (ix == 0 || ix > twodWeightsXiInJet->GetNbinsX()) {
17321731
wXiPosJet = 1.0;
17331732
wXiPosUe = 1.0;
1734-
wXiNegJet = 1.0;
1733+
wXiNegJet = 1.0;
17351734
wXiNegUe = 1.0;
17361735
wOmegaPosJet = 1.0;
17371736
wOmegaPosUe = 1.0;
@@ -1741,15 +1740,15 @@ struct StrangenessInJets {
17411740
if (iy == 0 || iy > twodWeightsXiInJet->GetNbinsY()) {
17421741
wXiPosJet = 1.0;
17431742
wXiPosUe = 1.0;
1744-
wXiNegJet = 1.0;
1743+
wXiNegJet = 1.0;
17451744
wXiNegUe = 1.0;
17461745
wOmegaPosJet = 1.0;
17471746
wOmegaPosUe = 1.0;
17481747
wOmegaNegJet = 1.0;
17491748
wOmegaNegUe = 1.0;
17501749
}
17511750
}
1752-
1751+
17531752
// Xi+
17541753
if (passedXiSelection(casc, pos, neg, bach, collision) && pdgParent == kXiPlusBar) {
17551754
registryMC.fill(HIST("XiPos_reconstructed_jet"), multiplicity, casc.pt(), wXiPosJet);
@@ -1770,9 +1769,7 @@ struct StrangenessInJets {
17701769
registryMC.fill(HIST("OmegaNeg_reconstructed_jet"), multiplicity, casc.pt(), wOmegaNegJet);
17711770
registryMC.fill(HIST("OmegaNeg_reconstructed_ue"), multiplicity, casc.pt(), wOmegaNegUe);
17721771
}
1773-
1774-
1775-
}
1772+
}
17761773

17771774
/*
17781775
// Reconstructed Tracks
@@ -1947,25 +1944,25 @@ struct StrangenessInJets {
19471944
wAntilambdaUe = 1.0;
19481945
}
19491946
}
1950-
1947+
19511948
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);
19521949
if (applyReweighting) {
1953-
int ix = twodWeightsXiInJet->GetXaxis()->FindBin(mcParticle.pt());
1954-
int iy = twodWeightsXiInJet->GetYaxis()->FindBin(mcParticle.eta());
1955-
wXiPosJet = twodWeightsAntiXiInJet->GetBinContent(ix, iy);
1956-
wXiPosUe = twodWeightsAntiXiUe->GetBinContent(ix, iy);
1957-
wXiNegJet = twodWeightsXiInJet->GetBinContent(ix, iy);
1958-
wXiNegUe = twodWeightsXiUe->GetBinContent(ix, iy);
1959-
wOmegaPosJet = twodWeightsAntiOmegaInJet->GetBinContent(ix, iy);
1960-
wOmegaPosUe = twodWeightsAntiOmegaUe->GetBinContent(ix, iy);
1961-
wOmegaNegJet = twodWeightsOmegaInJet->GetBinContent(ix, iy);
1962-
wOmegaNegUe = twodWeightsOmegaUe->GetBinContent(ix, iy);
1963-
1964-
// protections
1965-
if (ix == 0 || ix > twodWeightsXiInJet->GetNbinsX()) {
1950+
int ix = twodWeightsXiInJet->GetXaxis()->FindBin(mcParticle.pt());
1951+
int iy = twodWeightsXiInJet->GetYaxis()->FindBin(mcParticle.eta());
1952+
wXiPosJet = twodWeightsAntiXiInJet->GetBinContent(ix, iy);
1953+
wXiPosUe = twodWeightsAntiXiUe->GetBinContent(ix, iy);
1954+
wXiNegJet = twodWeightsXiInJet->GetBinContent(ix, iy);
1955+
wXiNegUe = twodWeightsXiUe->GetBinContent(ix, iy);
1956+
wOmegaPosJet = twodWeightsAntiOmegaInJet->GetBinContent(ix, iy);
1957+
wOmegaPosUe = twodWeightsAntiOmegaUe->GetBinContent(ix, iy);
1958+
wOmegaNegJet = twodWeightsOmegaInJet->GetBinContent(ix, iy);
1959+
wOmegaNegUe = twodWeightsOmegaUe->GetBinContent(ix, iy);
1960+
1961+
// protections
1962+
if (ix == 0 || ix > twodWeightsXiInJet->GetNbinsX()) {
19661963
wXiPosJet = 1.0;
19671964
wXiPosUe = 1.0;
1968-
wXiNegJet = 1.0;
1965+
wXiNegJet = 1.0;
19691966
wXiNegUe = 1.0;
19701967
wOmegaPosJet = 1.0;
19711968
wOmegaPosUe = 1.0;
@@ -1975,15 +1972,14 @@ struct StrangenessInJets {
19751972
if (iy == 0 || iy > twodWeightsXiInJet->GetNbinsY()) {
19761973
wXiPosJet = 1.0;
19771974
wXiPosUe = 1.0;
1978-
wXiNegJet = 1.0;
1975+
wXiNegJet = 1.0;
19791976
wXiNegUe = 1.0;
19801977
wOmegaPosJet = 1.0;
19811978
wOmegaPosUe = 1.0;
19821979
wOmegaNegJet = 1.0;
19831980
wOmegaNegUe = 1.0;
19841981
}
19851982
}
1986-
19871983

19881984
switch (mcParticle.pdgCode()) {
19891985
/*

0 commit comments

Comments
 (0)