Skip to content

Commit e46c475

Browse files
YazhenLinYazhenLin
authored
Add files via upload
1 parent 8f392a8 commit e46c475

File tree

2 files changed

+68
-92
lines changed

2 files changed

+68
-92
lines changed

‎PWGDQ/Core/HistogramsLibrary.cxx‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -982,15 +982,13 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h
982982
hm->AddHistogram(histClass, "DeltaPhi", "", false, 50, -8.0, 8.0, VarManager::kMCdeltaphi);
983983
hm->AddHistogram(histClass, "DeltaEta_DeltaPhi", "", false, 20, -2.0, 2.0, VarManager::kMCdeltaeta, 50, -8.0, 8.0, VarManager::kMCdeltaphi);
984984
// for bkg
985-
hm->AddHistogram(histClass, "DeltaPhi_randomPhi_1", "", false, 50, -8.0, 8.0, VarManager::kMCdeltaphi_randomPhi_1);
986-
hm->AddHistogram(histClass, "DeltaPhi_randomPhi_2", "", false, 50, -8.0, 8.0, VarManager::kMCdeltaphi_randomPhi_2);
987-
hm->AddHistogram(histClass, "DeltaPhi_randomPhi_3", "", false, 50, -8.0, 8.0, VarManager::kMCdeltaphi_randomPhi_3);
988-
hm->AddHistogram(histClass, "DeltaPhi_randomPhi_4", "", false, 50, -8.0, 8.0, VarManager::kMCdeltaphi_randomPhi_4);
989-
990-
hm->AddHistogram(histClass, "Coschi_randomPhi_1", "", false, 40, -1.0, 1.0, VarManager::kMCCosChi_randomPhi_1, 0, 0, 0, -1, 0, 0, 0, -1, "", "", "", -1, VarManager::kMCWeight_randomPhi_1);
991-
hm->AddHistogram(histClass, "Coschi_randomPhi_2", "", false, 40, -1.0, 1.0, VarManager::kMCCosChi_randomPhi_2, 0, 0, 0, -1, 0, 0, 0, -1, "", "", "", -1, VarManager::kMCWeight_randomPhi_2);
992-
hm->AddHistogram(histClass, "Coschi_randomPhi_3", "", false, 40, -1.0, 1.0, VarManager::kMCCosChi_randomPhi_3, 0, 0, 0, -1, 0, 0, 0, -1, "", "", "", -1, VarManager::kMCWeight_randomPhi_3);
993-
hm->AddHistogram(histClass, "Coschi_randomPhi_4", "", false, 40, -1.0, 1.0, VarManager::kMCCosChi_randomPhi_4, 0, 0, 0, -1, 0, 0, 0, -1, "", "", "", -1, VarManager::kMCWeight_randomPhi_4);
985+
hm->AddHistogram(histClass, "DeltaPhi_randomPhi_trans", "", false, 50, -8.0, 8.0, VarManager::kMCdeltaphi_randomPhi_trans);
986+
hm->AddHistogram(histClass, "DeltaPhi_randomPhi_toward", "", false, 50, -8.0, 8.0, VarManager::kMCdeltaphi_randomPhi_toward);
987+
hm->AddHistogram(histClass, "DeltaPhi_randomPhi_away", "", false, 50, -8.0, 8.0, VarManager::kMCdeltaphi_randomPhi_away);
988+
989+
hm->AddHistogram(histClass, "Coschi_randomPhi_trans", "", false, 40, -1.0, 1.0, VarManager::kMCCosChi_randomPhi_trans, 0, 0, 0, -1, 0, 0, 0, -1, "", "", "", -1, VarManager::kMCWeight_randomPhi_trans);
990+
hm->AddHistogram(histClass, "Coschi_randomPhi_toward", "", false, 40, -1.0, 1.0, VarManager::kMCCosChi_randomPhi_toward, 0, 0, 0, -1, 0, 0, 0, -1, "", "", "", -1, VarManager::kMCWeight_randomPhi_toward);
991+
hm->AddHistogram(histClass, "Coschi_randomPhi_away", "", false, 40, -1.0, 1.0, VarManager::kMCCosChi_randomPhi_away, 0, 0, 0, -1, 0, 0, 0, -1, "", "", "", -1, VarManager::kMCWeight_randomPhi_away);
994992
}
995993
if (!groupStr.CompareTo("pair")) {
996994
if (subGroupStr.Contains("cepf")) {

‎PWGDQ/Core/VarManager.h‎

Lines changed: 61 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -629,18 +629,15 @@ class VarManager : public TObject
629629
kMCHadronEta,
630630
kMCHadronPhi,
631631
kMCWeight,
632-
kMCCosChi_randomPhi_1,
633-
kMCWeight_randomPhi_1,
634-
kMCCosChi_randomPhi_2,
635-
kMCWeight_randomPhi_2,
636-
kMCCosChi_randomPhi_3,
637-
kMCWeight_randomPhi_3,
638-
kMCCosChi_randomPhi_4,
639-
kMCWeight_randomPhi_4,
640-
kMCdeltaphi_randomPhi_1,
641-
kMCdeltaphi_randomPhi_2,
642-
kMCdeltaphi_randomPhi_3,
643-
kMCdeltaphi_randomPhi_4,
632+
kMCCosChi_randomPhi_toward,
633+
kMCWeight_randomPhi_toward,
634+
kMCCosChi_randomPhi_away,
635+
kMCWeight_randomPhi_away,
636+
kMCCosChi_randomPhi_trans,
637+
kMCWeight_randomPhi_trans,
638+
kMCdeltaphi_randomPhi_toward,
639+
kMCdeltaphi_randomPhi_away,
640+
kMCdeltaphi_randomPhi_trans,
644641
kMCWeight_before,
645642

646643
// MC mother particle variables
@@ -2831,53 +2828,38 @@ void VarManager::FillEnergyCorrelatorsMC(T const& track, T1 const& t1, float* va
28312828
values[kMCHadronPdgCode] = t1.pdgCode();
28322829
values[kMCWeight] = E_boost / o2::constants::physics::MassJPsi;
28332830

2834-
values[kMCCosChi_randomPhi_1] = -999.9f;
2835-
values[kMCCosChi_randomPhi_2] = -999.9f;
2836-
values[kMCCosChi_randomPhi_3] = -999.9f;
2837-
values[kMCCosChi_randomPhi_4] = -999.9f;
2831+
values[kMCCosChi_randomPhi_trans] = -999.9f;
2832+
values[kMCCosChi_randomPhi_toward] = -999.9f;
2833+
values[kMCCosChi_randomPhi_away] = -999.9f;
28382834

2839-
values[kMCdeltaphi_randomPhi_1] = -999.9f;
2840-
values[kMCdeltaphi_randomPhi_2] = -999.9f;
2841-
values[kMCdeltaphi_randomPhi_3] = -999.9f;
2842-
values[kMCdeltaphi_randomPhi_4] = -999.9f;
2835+
values[kMCdeltaphi_randomPhi_trans] = -999.9f;
2836+
values[kMCdeltaphi_randomPhi_toward] = -999.9f;
2837+
values[kMCdeltaphi_randomPhi_away] = -999.9f;
28432838

2844-
float randomPhi_1 = -o2::constants::math::PIHalf;
2845-
float randomPhi_2 = -o2::constants::math::PIHalf;
2846-
float randomPhi_3 = -o2::constants::math::PIHalf;
2847-
float randomPhi_4 = -o2::constants::math::PIHalf;
2839+
float randomPhi_trans = -o2::constants::math::PIHalf;
2840+
float randomPhi_toward = -o2::constants::math::PIHalf;
2841+
float randomPhi_away = -o2::constants::math::PIHalf;
28482842

2849-
if ((deltaphi > -0.5 * TMath::Pi() && deltaphi < -0.25 * TMath::Pi()) || (deltaphi > 1.25 * TMath::Pi() && deltaphi < 1.5 * TMath::Pi())) {
2850-
randomPhi_1 = gRandom->Uniform(-o2::constants::math::PIHalf, 3. * o2::constants::math::PIHalf);
2851-
randomPhi_2 = gRandom->Uniform(-o2::constants::math::PIHalf, 3. * o2::constants::math::PIHalf);
2843+
if ((deltaphi > -0.5 * TMath::Pi() && deltaphi < -1. / 3 * TMath::Pi()) || (deltaphi > 4. / 3 * TMath::Pi() && deltaphi < 1.5 * TMath::Pi()) || (deltaphi > 1. / 3 * TMath::Pi() && deltaphi < 2. / 3 * TMath::Pi())) {
2844+
randomPhi_trans = gRandom->Uniform(-o2::constants::math::PIHalf, 3. * o2::constants::math::PIHalf);
2845+
randomPhi_toward = gRandom->Uniform(-o2::constants::math::PIHalf, 3. * o2::constants::math::PIHalf);
2846+
randomPhi_away = gRandom->Uniform(-o2::constants::math::PIHalf, 3. * o2::constants::math::PIHalf);
28522847

2853-
ROOT::Math::PtEtaPhiMVector v2_randomPhi_1(v2.pt(), v2.eta(), randomPhi_1, o2::constants::physics::MassPionCharged);
2854-
values[kMCCosChi_randomPhi_1] = LorentzTransformJpsihadroncosChi("coschi", v1, v2_randomPhi_1);
2855-
values[kMCWeight_randomPhi_1] = LorentzTransformJpsihadroncosChi("weight_boost", v1, v2_randomPhi_1) / v1.M();
2856-
;
2857-
2858-
ROOT::Math::PtEtaPhiMVector v2_randomPhi_2(v2.pt(), v2.eta(), randomPhi_2, o2::constants::physics::MassPionCharged);
2859-
values[kMCCosChi_randomPhi_2] = LorentzTransformJpsihadroncosChi("coschi", v1, v2_randomPhi_2);
2860-
values[kMCWeight_randomPhi_2] = LorentzTransformJpsihadroncosChi("weight_boost", v1, v2_randomPhi_2) / v1.M();
2861-
2862-
values[kMCdeltaphi_randomPhi_1] = RecoDecay::constrainAngle(v1.phi() - randomPhi_1, -o2::constants::math::PIHalf);
2863-
values[kMCdeltaphi_randomPhi_2] = RecoDecay::constrainAngle(v1.phi() - randomPhi_2, -o2::constants::math::PIHalf);
2864-
}
2848+
ROOT::Math::PtEtaPhiMVector v2_randomPhi_trans(v2.pt(), v2.eta(), randomPhi_trans, o2::constants::physics::MassPionCharged);
2849+
values[kMCCosChi_randomPhi_trans] = LorentzTransformJpsihadroncosChi("coschi", v1, v2_randomPhi_trans);
2850+
values[kMCWeight_randomPhi_trans] = LorentzTransformJpsihadroncosChi("weight_boost", v1, v2_randomPhi_trans) / v1.M();
28652851

2866-
if (deltaphi > 0.25 * TMath::Pi() && deltaphi < 0.75 * TMath::Pi()) {
2867-
randomPhi_3 = gRandom->Uniform(-o2::constants::math::PIHalf, 3. * o2::constants::math::PIHalf);
2868-
randomPhi_4 = gRandom->Uniform(-o2::constants::math::PIHalf, 3. * o2::constants::math::PIHalf);
2852+
ROOT::Math::PtEtaPhiMVector v2_randomPhi_toward(v2.pt(), v2.eta(), randomPhi_toward, o2::constants::physics::MassPionCharged);
2853+
values[kMCCosChi_randomPhi_toward] = LorentzTransformJpsihadroncosChi("coschi", v1, v2_randomPhi_toward);
2854+
values[kMCWeight_randomPhi_toward] = LorentzTransformJpsihadroncosChi("weight_boost", v1, v2_randomPhi_toward) / v1.M();
28692855

2870-
ROOT::Math::PtEtaPhiMVector v2_randomPhi_3(v2.pt(), v2.eta(), randomPhi_3, o2::constants::physics::MassPionCharged);
2871-
values[kMCCosChi_randomPhi_3] = LorentzTransformJpsihadroncosChi("coschi", v1, v2_randomPhi_3);
2872-
values[kMCWeight_randomPhi_3] = LorentzTransformJpsihadroncosChi("weight_boost", v1, v2_randomPhi_3) / v1.M();
2873-
;
2874-
2875-
ROOT::Math::PtEtaPhiMVector v2_randomPhi_4(v2.pt(), v2.eta(), randomPhi_4, o2::constants::physics::MassPionCharged);
2876-
values[kMCCosChi_randomPhi_4] = LorentzTransformJpsihadroncosChi("coschi", v1, v2_randomPhi_4);
2877-
values[kMCWeight_randomPhi_4] = LorentzTransformJpsihadroncosChi("weight_boost", v1, v2_randomPhi_4) / v1.M();
2856+
ROOT::Math::PtEtaPhiMVector v2_randomPhi_away(v2.pt(), v2.eta(), randomPhi_away, o2::constants::physics::MassPionCharged);
2857+
values[kMCCosChi_randomPhi_away] = LorentzTransformJpsihadroncosChi("coschi", v1, v2_randomPhi_away);
2858+
values[kMCWeight_randomPhi_away] = LorentzTransformJpsihadroncosChi("weight_boost", v1, v2_randomPhi_away) / v1.M();
28782859

2879-
values[kMCdeltaphi_randomPhi_3] = RecoDecay::constrainAngle(v1.phi() - randomPhi_3, -o2::constants::math::PIHalf);
2880-
values[kMCdeltaphi_randomPhi_4] = RecoDecay::constrainAngle(v1.phi() - randomPhi_4, -o2::constants::math::PIHalf);
2860+
values[kMCdeltaphi_randomPhi_trans] = RecoDecay::constrainAngle(v1.phi() - randomPhi_trans, -o2::constants::math::PIHalf);
2861+
values[kMCdeltaphi_randomPhi_toward] = RecoDecay::constrainAngle(v1.phi() - randomPhi_toward, -o2::constants::math::PIHalf);
2862+
values[kMCdeltaphi_randomPhi_away] = RecoDecay::constrainAngle(v1.phi() - randomPhi_away, -o2::constants::math::PIHalf);
28812863
}
28822864
}
28832865

@@ -5209,7 +5191,7 @@ void VarManager::FillDileptonHadron(T1 const& dilepton, T2 const& hadron, float*
52095191
double Q1 = (dilepton.mass() * dilepton.mass() - hadronMass * hadronMass) / Pinv;
52105192
values[kDileptonHadronKstar] = sqrt(Q1 * Q1 - v12_Qvect.M2()) / 2.0;
52115193
}
5212-
if (fgUsedVars[kCosChi] || fgUsedVars[kECWeight] || fgUsedVars[kCosTheta] || fgUsedVars[kEWeight_before] || fgUsedVars[kPtDau] || fgUsedVars[kEtaDau] || fgUsedVars[kPhiDau]) {
5194+
if (fgUsedVars[kCosChi] || fgUsedVars[kECWeight] || fgUsedVars[kCosTheta] || fgUsedVars[kEWeight_before] || fgUsedVars[kPtDau] || fgUsedVars[kEtaDau] || fgUsedVars[kPhiDau] || fgUsedVars[kCosChi_randomPhi_trans] || fgUsedVars[kCosChi_randomPhi_toward] || fgUsedVars[kCosChi_randomPhi_away]) {
52135195
ROOT::Math::PtEtaPhiMVector v1(dilepton.pt(), dilepton.eta(), dilepton.phi(), dilepton.mass());
52145196
ROOT::Math::PtEtaPhiMVector v2(hadron.pt(), hadron.eta(), hadron.phi(), o2::constants::physics::MassPionCharged);
52155197
values[kCosChi] = LorentzTransformJpsihadroncosChi("coschi", v1, v2);
@@ -5221,43 +5203,39 @@ void VarManager::FillDileptonHadron(T1 const& dilepton, T2 const& hadron, float*
52215203
values[kEtaDau] = v2.eta();
52225204
values[kPhiDau] = RecoDecay::constrainAngle(v2.phi(), -o2::constants::math::PIHalf);
52235205

5224-
if (fgUsedVars[kCosChi_randomPhi_trans] || fgUsedVars[kCosChi_randomPhi_toward] || fgUsedVars[kCosChi_randomPhi_away]) {
5206+
float deltaphi = RecoDecay::constrainAngle(v1.phi() - v2.phi(), -o2::constants::math::PIHalf);
5207+
values[kCosChi_randomPhi_trans] = -999.9f;
5208+
values[kCosChi_randomPhi_toward] = -999.9f;
5209+
values[kCosChi_randomPhi_away] = -999.9f;
52255210

5226-
float deltaphi = RecoDecay::constrainAngle(v1.phi() - v2.phi(), -o2::constants::math::PIHalf);
5227-
values[kCosChi_randomPhi_trans] = -999.9f;
5228-
values[kCosChi_randomPhi_toward] = -999.9f;
5229-
values[kCosChi_randomPhi_away] = -999.9f;
5211+
values[kdeltaphi_randomPhi_trans] = -999.9f;
5212+
values[kdeltaphi_randomPhi_toward] = -999.9f;
5213+
values[kdeltaphi_randomPhi_away] = -999.9f;
52305214

5231-
values[kdeltaphi_randomPhi_trans] = -999.9f;
5232-
values[kdeltaphi_randomPhi_toward] = -999.9f;
5233-
values[kdeltaphi_randomPhi_away] = -999.9f;
5215+
float randomPhi_trans = -o2::constants::math::PIHalf;
5216+
float randomPhi_toward = -o2::constants::math::PIHalf;
5217+
float randomPhi_away = -o2::constants::math::PIHalf;
52345218

5235-
float randomPhi_trans = -o2::constants::math::PIHalf;
5236-
float randomPhi_toward = -o2::constants::math::PIHalf;
5237-
float randomPhi_away = -o2::constants::math::PIHalf;
5219+
if ((deltaphi > -0.5 * TMath::Pi() && deltaphi < -1. / 3 * TMath::Pi()) || (deltaphi > 4. / 3 * TMath::Pi() && deltaphi < 1.5 * TMath::Pi()) || (deltaphi > 1. / 3 * TMath::Pi() && deltaphi < 2. / 3 * TMath::Pi())) {
5220+
randomPhi_trans = gRandom->Uniform(-o2::constants::math::PIHalf, 3. * o2::constants::math::PIHalf);
5221+
randomPhi_toward = gRandom->Uniform(-o2::constants::math::PIHalf, 3. * o2::constants::math::PIHalf);
5222+
randomPhi_away = gRandom->Uniform(-o2::constants::math::PIHalf, 3. * o2::constants::math::PIHalf);
52385223

5239-
if ((deltaphi > -0.5 * TMath::Pi() && deltaphi < -1. / 3 * TMath::Pi()) || (deltaphi > 4. / 3 * TMath::Pi() && deltaphi < 1.5 * TMath::Pi()) || (deltaphi > 1. / 3 * TMath::Pi() && deltaphi < 2. / 3 * TMath::Pi())) {
5240-
randomPhi_trans = gRandom->Uniform(-o2::constants::math::PIHalf, 3. * o2::constants::math::PIHalf);
5241-
randomPhi_toward = gRandom->Uniform(-o2::constants::math::PIHalf, 3. * o2::constants::math::PIHalf);
5242-
randomPhi_away = gRandom->Uniform(-o2::constants::math::PIHalf, 3. * o2::constants::math::PIHalf);
5224+
ROOT::Math::PtEtaPhiMVector v2_randomPhi_trans(v2.pt(), v2.eta(), randomPhi_trans, o2::constants::physics::MassPionCharged);
5225+
values[kCosChi_randomPhi_trans] = LorentzTransformJpsihadroncosChi("coschi", v1, v2_randomPhi_trans);
5226+
values[kWeight_randomPhi_trans] = LorentzTransformJpsihadroncosChi("weight_boost", v1, v2_randomPhi_trans) / v1.M();
52435227

5244-
ROOT::Math::PtEtaPhiMVector v2_randomPhi_trans(v2.pt(), v2.eta(), randomPhi_trans, o2::constants::physics::MassPionCharged);
5245-
values[kCosChi_randomPhi_trans] = LorentzTransformJpsihadroncosChi("coschi", v1, v2_randomPhi_trans);
5246-
values[kWeight_randomPhi_trans] = LorentzTransformJpsihadroncosChi("weight_boost", v1, v2_randomPhi_trans) / v1.M();
5247-
;
5228+
ROOT::Math::PtEtaPhiMVector v2_randomPhi_toward(v2.pt(), v2.eta(), randomPhi_toward, o2::constants::physics::MassPionCharged);
5229+
values[kCosChi_randomPhi_toward] = LorentzTransformJpsihadroncosChi("coschi", v1, v2_randomPhi_toward);
5230+
values[kWeight_randomPhi_toward] = LorentzTransformJpsihadroncosChi("weight_boost", v1, v2_randomPhi_toward) / v1.M();
52485231

5249-
ROOT::Math::PtEtaPhiMVector v2_randomPhi_toward(v2.pt(), v2.eta(), randomPhi_toward, o2::constants::physics::MassPionCharged);
5250-
values[kCosChi_randomPhi_toward] = LorentzTransformJpsihadroncosChi("coschi", v1, v2_randomPhi_toward);
5251-
values[kWeight_randomPhi_toward] = LorentzTransformJpsihadroncosChi("weight_boost", v1, v2_randomPhi_toward) / v1.M();
5232+
ROOT::Math::PtEtaPhiMVector v2_randomPhi_away(v2.pt(), v2.eta(), randomPhi_away, o2::constants::physics::MassPionCharged);
5233+
values[kCosChi_randomPhi_away] = LorentzTransformJpsihadroncosChi("coschi", v1, v2_randomPhi_away);
5234+
values[kWeight_randomPhi_away] = LorentzTransformJpsihadroncosChi("weight_boost", v1, v2_randomPhi_away) / v1.M();
52525235

5253-
ROOT::Math::PtEtaPhiMVector v2_randomPhi_away(v2.pt(), v2.eta(), randomPhi_away, o2::constants::physics::MassPionCharged);
5254-
values[kCosChi_randomPhi_away] = LorentzTransformJpsihadroncosChi("coschi", v1, v2_randomPhi_away);
5255-
values[kWeight_randomPhi_away] = LorentzTransformJpsihadroncosChi("weight_boost", v1, v2_randomPhi_away) / v1.M();
5256-
5257-
values[kdeltaphi_randomPhi_trans] = RecoDecay::constrainAngle(v1.phi() - randomPhi_trans, -o2::constants::math::PIHalf);
5258-
values[kdeltaphi_randomPhi_toward] = RecoDecay::constrainAngle(v1.phi() - randomPhi_toward, -o2::constants::math::PIHalf);
5259-
values[kdeltaphi_randomPhi_away] = RecoDecay::constrainAngle(v1.phi() - randomPhi_away, -o2::constants::math::PIHalf);
5260-
}
5236+
values[kdeltaphi_randomPhi_trans] = RecoDecay::constrainAngle(v1.phi() - randomPhi_trans, -o2::constants::math::PIHalf);
5237+
values[kdeltaphi_randomPhi_toward] = RecoDecay::constrainAngle(v1.phi() - randomPhi_toward, -o2::constants::math::PIHalf);
5238+
values[kdeltaphi_randomPhi_away] = RecoDecay::constrainAngle(v1.phi() - randomPhi_away, -o2::constants::math::PIHalf);
52615239
}
52625240
}
52635241

0 commit comments

Comments
 (0)