Skip to content

Commit 5d1aa81

Browse files
lucamichelettilucamicheletti
committed
Updating the code to create tag and probe histograms
1 parent 0af789a commit 5d1aa81

File tree

4 files changed

+38
-26
lines changed

4 files changed

+38
-26
lines changed

‎PWGDQ/Core/HistogramsLibrary.cxx‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1158,6 +1158,10 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h
11581158
hm->AddHistogram(histClass, "Mass_Pt", "", false, 750, 0.0, 15.0, VarManager::kMass, 120, 0.0, 30.0, VarManager::kPt);
11591159
hm->AddHistogram(histClass, "Mass_Rapidity", "", false, 750, 0.0, 15.0, VarManager::kMass, 150, 2.5, 4.0, VarManager::kRap);
11601160
hm->AddHistogram(histClass, "Mass_Phi", "", false, 750, 0.0, 15.0, VarManager::kMass, 180, constants::math::PI, 2 * constants::math::PI, VarManager::kPhi);
1161+
if (subGroupStr.Contains("dimuon-tag-and-probe")) {
1162+
hm->AddHistogram(histClass, "Mass_PtProbe", "mass vs probe pT", false, 750, 0.0, 15.0, VarManager::kMass, 120, 0.0, 30.0, VarManager::kPt2); // Warning: in the tag-and-probe task t2 is always the probe
1163+
hm->AddHistogram(histClass, "Mass_EtaProbe", "mass vs probe eta", false, 750, 0.0, 15.0, VarManager::kMass, 120, 0.0, 30.0, VarManager::kEta2); // Warning: in the tag-and-probe task t2 is always the probe
1164+
}
11611165
if (subGroupStr.Contains("dimuon-multi-diff")) {
11621166
int varsKine[3] = {VarManager::kMass, VarManager::kPt, VarManager::kRap};
11631167
int binsKine[3] = {250, 120, 60};

‎PWGDQ/Core/VarManager.h‎

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2810,21 +2810,12 @@ void VarManager::FillPair(T1 const& t1, T2 const& t2, float* values)
28102810
double Ptot2 = TMath::Sqrt(v2.Px() * v2.Px() + v2.Py() * v2.Py() + v2.Pz() * v2.Pz());
28112811
values[kDeltaPtotTracks] = Ptot1 - Ptot2;
28122812

2813-
if (t1.sign() > 0) {
2814-
values[kPt1] = t1.pt();
2815-
values[kEta1] = t1.eta();
2816-
values[kPhi1] = t1.phi();
2817-
values[kPt2] = t2.pt();
2818-
values[kEta2] = t2.eta();
2819-
values[kPhi2] = t2.phi();
2820-
} else {
2821-
values[kPt1] = t2.pt();
2822-
values[kEta1] = t2.eta();
2823-
values[kPhi1] = t2.phi();
2824-
values[kPt2] = t1.pt();
2825-
values[kEta2] = t1.eta();
2826-
values[kPhi2] = t1.phi();
2827-
}
2813+
values[kPt1] = t1.pt();
2814+
values[kEta1] = t1.eta();
2815+
values[kPhi1] = t1.phi();
2816+
values[kPt2] = t2.pt();
2817+
values[kEta2] = t2.eta();
2818+
values[kPhi2] = t2.phi();
28282819

28292820
if (fgUsedVars[kDeltaPhiPair2]) {
28302821
double phipair2 = v1.Phi() - v2.Phi();

‎PWGDQ/Tasks/dqEfficiency_withAssoc.cxx‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1927,6 +1927,24 @@ struct AnalysisSameEventPairing {
19271927

19281928
float dileptonMass = VarManager::fgValues[VarManager::kMass];
19291929
if (dileptonMass > useMiniTree.fConfigMiniTreeMinMass && dileptonMass < useMiniTree.fConfigMiniTreeMaxMass) {
1930+
// In the miniTree the positive daughter is positioned as first
1931+
if (t1.sign() > 0) {
1932+
dileptonMiniTreeRec(mcDecision,
1933+
VarManager::fgValues[VarManager::kMass],
1934+
VarManager::fgValues[VarManager::kPt], VarManager::fgValues[VarManager::kEta], VarManager::fgValues[VarManager::kPhi], VarManager::fgValues[VarManager::kCentFT0C],
1935+
t1.reducedMCTrack().pt(), t1.reducedMCTrack().eta(), t1.reducedMCTrack().phi(),
1936+
t2.reducedMCTrack().pt(), t2.reducedMCTrack().eta(), t2.reducedMCTrack().phi(),
1937+
t1.pt(), t1.eta(), t1.phi(),
1938+
t2.pt(), t2.eta(), t2.phi());
1939+
} else {
1940+
dileptonMiniTreeRec(mcDecision,
1941+
VarManager::fgValues[VarManager::kMass],
1942+
VarManager::fgValues[VarManager::kPt], VarManager::fgValues[VarManager::kEta], VarManager::fgValues[VarManager::kPhi], VarManager::fgValues[VarManager::kCentFT0C],
1943+
t2.reducedMCTrack().pt(), t2.reducedMCTrack().eta(), t2.reducedMCTrack().phi(),
1944+
t1.reducedMCTrack().pt(), t1.reducedMCTrack().eta(), t1.reducedMCTrack().phi(),
1945+
t2.pt(), t2.eta(), t2.phi(),
1946+
t2.pt(), t2.eta(), t2.phi());
1947+
}
19301948
dileptonMiniTreeRec(mcDecision,
19311949
VarManager::fgValues[VarManager::kMass],
19321950
VarManager::fgValues[VarManager::kPt], VarManager::fgValues[VarManager::kEta], VarManager::fgValues[VarManager::kPhi], VarManager::fgValues[VarManager::kCentFT0C],

‎PWGDQ/Tasks/tableReader.cxx‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1476,17 +1476,16 @@ struct AnalysisSameEventPairing {
14761476
// By default (kPt1, kEta1, kPhi1) are for the positive charge
14771477
float dileptonMass = VarManager::fgValues[VarManager::kMass];
14781478
if (dileptonMass > useMiniTree.fConfigMiniTreeMinMass && dileptonMass < useMiniTree.fConfigMiniTreeMaxMass) {
1479-
dileptonMiniTree(VarManager::fgValues[VarManager::kMass],
1480-
VarManager::fgValues[VarManager::kPt],
1481-
VarManager::fgValues[VarManager::kRap],
1482-
VarManager::fgValues[VarManager::kCentFT0C],
1483-
VarManager::fgValues[VarManager::kCos2DeltaPhi],
1484-
VarManager::fgValues[VarManager::kPt1],
1485-
VarManager::fgValues[VarManager::kEta1],
1486-
VarManager::fgValues[VarManager::kPhi1],
1487-
VarManager::fgValues[VarManager::kPt2],
1488-
VarManager::fgValues[VarManager::kEta2],
1489-
VarManager::fgValues[VarManager::kPhi2]);
1479+
// In the miniTree the positive daughter is positioned as first
1480+
if (t1.sign() > 0) {
1481+
dileptonMiniTree(VarManager::fgValues[VarManager::kMass], VarManager::fgValues[VarManager::kPt], VarManager::fgValues[VarManager::kRap],
1482+
VarManager::fgValues[VarManager::kCentFT0C], VarManager::fgValues[VarManager::kCos2DeltaPhi],
1483+
t1.pt(), t1.eta(), t1.phi(), t2.pt(), t2.eta(), t2.phi());
1484+
} else {
1485+
dileptonMiniTree(VarManager::fgValues[VarManager::kMass], VarManager::fgValues[VarManager::kPt], VarManager::fgValues[VarManager::kRap],
1486+
VarManager::fgValues[VarManager::kCentFT0C], VarManager::fgValues[VarManager::kCos2DeltaPhi],
1487+
t2.pt(), t2.eta(), t2.phi(), t1.pt(), t1.eta(), t1.phi());
1488+
}
14901489
}
14911490
}
14921491
} else {

0 commit comments

Comments
 (0)