Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
531b9cd
Add proton selection cuts for femto study
Jan 24, 2025
9b90230
Update proton selection cuts for femto study
Jan 24, 2025
2b96aa4
add proton selection cuts for femto study
Jan 25, 2025
cb14437
Merge branch 'AliceO2Group:master' into pjpsi_femto
JiYuanjing Jan 25, 2025
39a53e1
Merge branch 'AliceO2Group:master' into pjpsi_femto
JiYuanjing Jan 26, 2025
ad20ca0
Merge branch 'AliceO2Group:master' into pjpsi_femto
JiYuanjing Jan 30, 2025
4f9df24
Merge branch 'AliceO2Group:master' into pjpsi_femto
JiYuanjing Jan 31, 2025
c44b58a
Merge branch 'AliceO2Group:master' into pjpsi_femto
JiYuanjing Jan 31, 2025
a861091
Merge branch 'AliceO2Group:master' into pjpsi_femto
JiYuanjing Feb 1, 2025
ccb881a
Merge branch 'AliceO2Group:master' into pjpsi_femto
JiYuanjing Feb 1, 2025
173a8a7
Merge branch 'AliceO2Group:master' into pjpsi_femto
JiYuanjing Feb 2, 2025
5b6a828
Merge branch 'master' into pjpsi_femto
JiYuanjing Feb 4, 2025
f861753
Merge branch 'AliceO2Group:master' into pjpsi_femto
JiYuanjing Feb 4, 2025
4549777
formating
Feb 4, 2025
e405f8d
Merge branch 'AliceO2Group:master' into pjpsi_femto
JiYuanjing Feb 4, 2025
2cfa1a2
Merge branch 'AliceO2Group:master' into pjpsi_femto
JiYuanjing Feb 4, 2025
61c8f39
Merge branch 'AliceO2Group:master' into pjpsi_femto
JiYuanjing Feb 4, 2025
ecf3e10
Merge branch 'AliceO2Group:master' into pjpsi_femto
JiYuanjing Mar 3, 2025
7569b6d
Merge branch 'AliceO2Group:master' into pjpsi_femto
JiYuanjing Apr 16, 2025
35e6045
Merge branch 'AliceO2Group:master' into pjpsi_femto
JiYuanjing Apr 23, 2025
d523482
Merge branch 'AliceO2Group:master' into pjpsi_femto
JiYuanjing Apr 25, 2025
18583b5
Merge branch 'AliceO2Group:master' into pjpsi_femto
JiYuanjing May 7, 2025
61598cc
Add variable Jpsi-hadron kstar and histograms for femtoscopy
May 12, 2025
7bf15e8
Merge branch 'AliceO2Group:master' into pjpsi_femto
JiYuanjing May 12, 2025
1fcf306
Apply clang-format
May 12, 2025
3032cf8
Merge branch 'AliceO2Group:master' into pjpsi_femto
JiYuanjing May 12, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions PWGDQ/Core/HistogramsLibrary.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@
if (!groupStr.CompareTo("track")) {
hm->AddHistogram(histClass, "Pt", "p_{T} distribution", false, 2000, 0.0, 20.0, VarManager::kPt);
hm->AddHistogram(histClass, "Eta", "#eta distribution", false, 500, -5.0, 5.0, VarManager::kEta);
hm->AddHistogram(histClass, "Phi", "#varphi distribution", false, 500, -2. * o2::constants::math::PI, 2. * o2::constants::math::PI, VarManager::kPhi);

Check failure on line 403 in PWGDQ/Core/HistogramsLibrary.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[pi-multiple-fraction]

Use multiples/fractions of PI defined in o2::constants::math.
hm->AddHistogram(histClass, "Phi_Pt", "#varphi distribution", false, 50, 0.0, 10.0, VarManager::kPt, 720, 0.0, o2::constants::math::TwoPI, VarManager::kPhi);
hm->AddHistogram(histClass, "IsPVcontrib_pt", "is PV contributor vs pt", false, 50, 0.0, 50.0, VarManager::kPt, 2, -0.5, 1.5, VarManager::kPVContributor);
hm->AddHistogram(histClass, "IsPVcontrib_pt_prof", "is PV contributor vs pt", true, 50, 0.0, 50.0, VarManager::kPt, 2, -0.5, 1.5, VarManager::kPVContributor);
Expand All @@ -413,10 +413,10 @@
if (subGroupStr.Contains("cent")) {
hm->AddHistogram(histClass, "Pt_CentFT0C", "p_{T} distribution", false, 2000, 0.0, 20.0, VarManager::kPt, 20, 0.0, 100.0, VarManager::kCentFT0C);
hm->AddHistogram(histClass, "Eta_CentFT0C", "#eta distribution", false, 500, -5.0, 5.0, VarManager::kEta, 20, 0.0, 100.0, VarManager::kCentFT0C);
hm->AddHistogram(histClass, "Phi_CentFT0C", "#varphi distribution", false, 500, -2. * o2::constants::math::PI, 2. * o2::constants::math::PI, VarManager::kPhi, 20, 0.0, 100.0, VarManager::kCentFT0C);

Check failure on line 416 in PWGDQ/Core/HistogramsLibrary.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[pi-multiple-fraction]

Use multiples/fractions of PI defined in o2::constants::math.
}
if (subGroupStr.Contains("kine")) {
hm->AddHistogram(histClass, "Phi_Eta", "#phi vs #eta distribution", false, 200, -5.0, 5.0, VarManager::kEta, 200, -2. * o2::constants::math::PI, 2. * o2::constants::math::PI, VarManager::kPhi);

Check failure on line 419 in PWGDQ/Core/HistogramsLibrary.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[pi-multiple-fraction]

Use multiples/fractions of PI defined in o2::constants::math.
hm->AddHistogram(histClass, "Eta_Pt", "", false, 20, -1.0, 1.0, VarManager::kEta, 100, 0.0, 20.0, VarManager::kPt);
hm->AddHistogram(histClass, "Eta_VtxZ", "", false, 100, -1.0, 1.0, VarManager::kEta, 300, -15.0, 15.0, VarManager::kVtxZ);
hm->AddHistogram(histClass, "Px", "p_{x} distribution", false, 200, 0.0, 20.0, VarManager::kPx);
Expand Down Expand Up @@ -800,14 +800,14 @@
hm->AddHistogram(histClass, "MCHBitMap_vs_pt", "MCH vs pt", false, 1025, 0.0, 1025.0, VarManager::kMCHBitMap, 400, 0, 100, VarManager::kPt);
hm->AddHistogram(histClass, "MuonTime", "", false, 100, -1.0, 1.0, VarManager::kMuonTime);
hm->AddHistogram(histClass, "MuonTimeRes", "", false, 100, -1.0, 1.0, VarManager::kMuonTimeRes);
hm->AddHistogram(histClass, "MuonDcaX_vs_phi", "", false, 2000, -20.0, 20.0, VarManager::kMuonDCAx, 200, -2. * o2::constants::math::PI, 2. * o2::constants::math::PI, VarManager::kPhi);

Check failure on line 803 in PWGDQ/Core/HistogramsLibrary.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[pi-multiple-fraction]

Use multiples/fractions of PI defined in o2::constants::math.
hm->AddHistogram(histClass, "MuonDcaY_vs_phi", "", false, 2000, -20.0, 20.0, VarManager::kMuonDCAy, 200, -2. * o2::constants::math::PI, 2. * o2::constants::math::PI, VarManager::kPhi);

Check failure on line 804 in PWGDQ/Core/HistogramsLibrary.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[pi-multiple-fraction]

Use multiples/fractions of PI defined in o2::constants::math.
hm->AddHistogram(histClass, "MuonDcaX_vs_eta", "", false, 2000, -20.0, 20.0, VarManager::kMuonDCAx, 500, -5.0, 5.0, VarManager::kEta);
hm->AddHistogram(histClass, "MuonDcaY_vs_eta", "", false, 2000, -20.0, 20.0, VarManager::kMuonDCAy, 500, -5.0, 5.0, VarManager::kEta);
} else {
hm->AddHistogram(histClass, "Pt", "p_{T} distribution", false, 2000, 0.0, 20.0, VarManager::kPt);
hm->AddHistogram(histClass, "Eta", "#eta distribution", false, 500, -5.0, 5.0, VarManager::kEta);
hm->AddHistogram(histClass, "Phi", "#varphi distribution", false, 500, -2. * o2::constants::math::PI, 2. * o2::constants::math::PI, VarManager::kPhi);

Check failure on line 810 in PWGDQ/Core/HistogramsLibrary.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[pi-multiple-fraction]

Use multiples/fractions of PI defined in o2::constants::math.
hm->AddHistogram(histClass, "AmbiguityInBunch", "", false, 10, 0.0, 10., VarManager::kMuonNAssocsInBunch);
hm->AddHistogram(histClass, "AmbiguityOutOfBunch", "", false, 10, 0.0, 10., VarManager::kMuonNAssocsOutOfBunch);
hm->AddHistogram(histClass, "AmbiguityInBunch_pt", "in bunch collision ambiguity vs p_{T}", false, 50, 0.0, 10.0, VarManager::kPt, 10, 0., 10., VarManager::kMuonNAssocsInBunch);
Expand All @@ -830,7 +830,7 @@
if (subGroupStr.Contains("mc")) {
hm->AddHistogram(histClass, "Pt_vs_PtMC", "pT vs MC pT", false, 200, 0.0, 20.0, VarManager::kPt, 200, 0.0, 20.0, VarManager::kMCPt);
hm->AddHistogram(histClass, "Eta_vs_EtaMC", "#eta vs MC #eta", false, 50, -1.0, 1.0, VarManager::kEta, 50, -1.0, 1.0, VarManager::kMCEta);
hm->AddHistogram(histClass, "Phi_vs_PhiMC", "#varphi vs MC #varphi", false, 50, 0.0, 2. * o2::constants::math::PI, VarManager::kPhi, 50, 0.0, 2. * o2::constants::math::PI, VarManager::kMCPhi);

Check failure on line 833 in PWGDQ/Core/HistogramsLibrary.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[pi-multiple-fraction]

Use multiples/fractions of PI defined in o2::constants::math.
hm->AddHistogram(histClass, "TrackPDGcode", "PDG code of track", false, 10001, -5000, 5000, VarManager::kMCPdgCode);
}
if (subGroupStr.Contains("mcmother")) {
Expand Down Expand Up @@ -871,7 +871,7 @@
hm->AddHistogram(histClass, "Eta_Pt_lepton1", "", false, 100, -2.0, 2.0, VarManager::kEta1, 200, 0.0, 20.0, VarManager::kPt1);
hm->AddHistogram(histClass, "Eta_Pt_lepton2", "", false, 100, -2.0, 2.0, VarManager::kEta2, 200, 0.0, 20.0, VarManager::kPt2);
hm->AddHistogram(histClass, "Eta_Pt_Photon", "", false, 100, -2.0, 2.0, VarManager::kEta, 200, 0.0, 20.0, VarManager::kPt);
hm->AddHistogram(histClass, "Phi_Eta", "#phi vs #eta distribution", false, 200, -5.0, 5.0, VarManager::kPairEta, 200, -2. * o2::constants::math::PI, 2. * o2::constants::math::PI, VarManager::kPairPhi);

Check failure on line 874 in PWGDQ/Core/HistogramsLibrary.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[pi-multiple-fraction]

Use multiples/fractions of PI defined in o2::constants::math.
hm->AddHistogram(histClass, "Mass_Dilepton", "", false, 4500, 0.0, 4.5, VarManager::kPairMassDau);
hm->AddHistogram(histClass, "Mass_Photon", "", false, 500, 0.0, 0.1, VarManager::kMassDau);
hm->AddHistogram(histClass, "Mass_Dilepton_Mass_Photon", "", false, 500, 0.0, 5.0, VarManager::kPairMassDau, 500, 0.0, 5.0, VarManager::kMassDau);
Expand All @@ -893,7 +893,7 @@
hm->AddHistogram(histClass, "Eta_Pt_lepton2", "", false, 100, -2.0, 2.0, VarManager::kEta2, 200, 0.0, 20.0, VarManager::kPt2);
hm->AddHistogram(histClass, "Mass", "", false, 500, 0.0, 5.0, VarManager::kMass);
hm->AddHistogram(histClass, "Eta_Pt", "", false, 40, -2.0, 2.0, VarManager::kEta, 200, 0.0, 20.0, VarManager::kPt);
hm->AddHistogram(histClass, "Phi_Eta", "#phi vs #eta distribution", false, 200, -5.0, 5.0, VarManager::kEta, 200, -2. * o2::constants::math::PI, 2. * o2::constants::math::PI, VarManager::kPhi);

Check failure on line 896 in PWGDQ/Core/HistogramsLibrary.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[pi-multiple-fraction]

Use multiples/fractions of PI defined in o2::constants::math.
int varspTHE[3] = {VarManager::kMCPt, VarManager::kMCCosThetaHE, VarManager::kMCPhiHE};
int varspTCS[3] = {VarManager::kMCPt, VarManager::kMCCosThetaCS, VarManager::kMCPhiCS};
int varspTPP[3] = {VarManager::kMCPt, VarManager::kMCCosThetaPP, VarManager::kMCPhiPP};
Expand All @@ -914,7 +914,7 @@
hm->AddHistogram(histClass, "hDeltaR", "", false, 100, 0.0, 10.0, VarManager::kDeltaR);
hm->AddHistogram(histClass, "hDiTrackMass", "", false, 300, 0.0, 3.0, VarManager::kDitrackMass);
hm->AddHistogram(histClass, "hMCPt_MCRap", "", false, 200, 0.0, 20.0, VarManager::kMCPt, 100, -2.0, 2.0, VarManager::kMCY);
hm->AddHistogram(histClass, "hMCPhi", "", false, 100, -TMath::Pi(), TMath::Pi(), VarManager::kMCPhi);

Check failure on line 917 in PWGDQ/Core/HistogramsLibrary.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[external-pi]

Use the PI constant (and its multiples and fractions) defined in o2::constants::math.
}
if (!groupStr.CompareTo("mctruth_track")) {
hm->AddHistogram(histClass, "PtMC", "MC pT", false, 200, 0.0, 20.0, VarManager::kMCPt);
Expand Down Expand Up @@ -1778,6 +1778,9 @@
hm->AddHistogram(histClass, "InvMass_DelEta_DelPhi", "", 4, varsJPsiHadCorr, nJPsiHadCorr); // Without efficiency
// hm->AddHistogram(histClass, "InvMass_DelEta_DelPhi", "", 4, varsJPsiHadCorr, nJPsiHadCorr, nullptr, VarManager::kJpsiHadronEff);
}
if (subGroupStr.Contains("dilepton-hadron-femto")) {
hm->AddHistogram(histClass, "DileptonHadronKstar_DileptonMass", "", false, 150, 0.0, 3.0, VarManager::kDileptonHadronKstar, 100, 1.5, 4.5, VarManager::kPairMassDau);
}
if (subGroupStr.Contains("opencharm")) {
hm->AddHistogram(histClass, "Delta_Mass_DstarD0region", "", false, 50, 0.14, 0.16, VarManager::kDeltaMass);
}
Expand Down
3 changes: 3 additions & 0 deletions PWGDQ/Core/VarManager.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -926,6 +926,8 @@ void VarManager::SetDefaultVarNames()
fgVariableUnits[kPairPhi] = "rad.";
fgVariableNames[kPairPhiv] = "#varphi_{V}";
fgVariableUnits[kPairPhiv] = "rad.";
fgVariableNames[kDileptonHadronKstar] = "Dilepton-hadron k^{*}";
fgVariableUnits[kDileptonHadronKstar] = "GeV/c^{2}";
fgVariableNames[kDeltaEta] = "#Delta#eta";
fgVariableUnits[kDeltaEta] = "";
fgVariableNames[kDeltaPhi] = "#Delta#phi";
Expand Down Expand Up @@ -1627,6 +1629,7 @@ void VarManager::SetDefaultVarNames()
fgVarNamesMap["kPairEta"] = kPairEta;
fgVarNamesMap["kPairPhi"] = kPairPhi;
fgVarNamesMap["kPairPhiv"] = kPairPhiv;
fgVarNamesMap["kDileptonHadronKstar"] = kDileptonHadronKstar;
fgVarNamesMap["kDeltaEta"] = kDeltaEta;
fgVarNamesMap["kDeltaPhi"] = kDeltaPhi;
fgVarNamesMap["kDeltaPhiSym"] = kDeltaPhiSym;
Expand Down
9 changes: 8 additions & 1 deletion PWGDQ/Core/VarManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ class VarManager : public TObject
kElectronMuon, // e.g. Electron - muon correlations
kBcToThreeMuons, // e.g. Bc -> mu+ mu- mu+
kBtoJpsiEEK, // e.g. B+ -> e+ e- K+
kJpsiEEProton, // e.g. Jpsi-proton correlation, Jpsi to e+e-
kXtoJpsiPiPi, // e.g. X(3872) -> J/psi pi+ pi-
kChictoJpsiEE, // e.g. Chi_c1 -> J/psi e+ e-
kDstarToD0KPiPi, // e.g. D*+ -> D0 pi+ -> K- pi+ pi+
Expand Down Expand Up @@ -806,6 +807,7 @@ class VarManager : public TObject
kDeltaPhi,
kDeltaPhiSym,
kNCorrelationVariables,
kDileptonHadronKstar,

// Dilepton-track-track variables
kQuadMass,
Expand Down Expand Up @@ -4710,7 +4712,7 @@ void VarManager::FillDileptonHadron(T1 const& dilepton, T2 const& hadron, float*
values = fgValues;
}

if (fgUsedVars[kPairMass] || fgUsedVars[kPairPt] || fgUsedVars[kPairEta] || fgUsedVars[kPairPhi] || fgUsedVars[kPairMassDau] || fgUsedVars[kPairPtDau]) {
if (fgUsedVars[kPairMass] || fgUsedVars[kPairPt] || fgUsedVars[kPairEta] || fgUsedVars[kPairPhi] || fgUsedVars[kPairMassDau] || fgUsedVars[kPairPtDau] || fgUsedVars[kDileptonHadronKstar]) {
ROOT::Math::PtEtaPhiMVector v1(dilepton.pt(), dilepton.eta(), dilepton.phi(), dilepton.mass());
ROOT::Math::PtEtaPhiMVector v2(hadron.pt(), hadron.eta(), hadron.phi(), hadronMass);
ROOT::Math::PtEtaPhiMVector v12 = v1 + v2;
Expand All @@ -4722,6 +4724,11 @@ void VarManager::FillDileptonHadron(T1 const& dilepton, T2 const& hadron, float*
values[kPairPtDau] = dilepton.pt();
values[kMassDau] = hadronMass;
values[kDeltaMass] = v12.M() - dilepton.mass();
// Calculate kstar of Dilepton and hadron pair
ROOT::Math::PtEtaPhiMVector v12_Qvect = v1 - v2;
double Pinv = v12.M();
double Q1 = (dilepton.mass() * dilepton.mass() - hadronMass * hadronMass) / Pinv;
values[kDileptonHadronKstar] = sqrt(Q1 * Q1 - v12_Qvect.M2()) / 2.0;
}
if (fgUsedVars[kDeltaPhi]) {
double delta = dilepton.phi() - hadron.phi();
Expand Down
Loading