Skip to content

Commit 6b15fd8

Browse files
author
Ida Torkjellsdatter Storehaug
committed
Rapidity caldulation added to dileptonTrack and to the B meson tabled
1 parent 12f7941 commit 6b15fd8

File tree

5 files changed

+12
-4
lines changed

5 files changed

+12
-4
lines changed

‎PWGDQ/Core/HistogramsLibrary.cxx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1808,6 +1808,7 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h
18081808
hm->AddHistogram(histClass, "Pt_Track", "", false, 120, 0.0, 30.0, VarManager::kPt);
18091809
hm->AddHistogram(histClass, "Mass", "", false, 750, 0.0, 30.0, VarManager::kPairMass);
18101810
hm->AddHistogram(histClass, "Pt", "", false, 750, 0.0, 30.0, VarManager::kPairPt);
1811+
hm->AddHistogram(histClass, "Rap", "", false, 100, -10.0, 10.0, VarManager::kPairRap);
18111812
hm->AddHistogram(histClass, "Mass_Pt", "", false, 100, 0.0, 20.0, VarManager::kPairMass, 40, 0.0, 20.0, VarManager::kPairPt);
18121813
hm->AddHistogram(histClass, "Pt_Dilepton__Pt", "", false, 40, 0.0, 20.0, VarManager::kPairPtDau, 40, 0.0, 20.0, VarManager::kPairPt);
18131814
hm->AddHistogram(histClass, "Pt_Track__Pt", "", false, 40, 0.0, 20.0, VarManager::kPt, 40, 0.0, 20.0, VarManager::kPairPt);

‎PWGDQ/Core/VarManager.cxx‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1142,6 +1142,8 @@ void VarManager::SetDefaultVarNames()
11421142
fgVariableUnits[kPairPt] = "GeV/c";
11431143
fgVariableNames[kPairEta] = "#eta";
11441144
fgVariableUnits[kPairEta] = "";
1145+
fgVariableNames[kPairRap] = "#rap";
1146+
fgVariableUnits[kPairRap] = "";
11451147
fgVariableNames[kPairPhi] = "#varphi";
11461148
fgVariableUnits[kPairPhi] = "rad.";
11471149
fgVariableNames[kPairPhiv] = "#varphi_{V}";
@@ -1881,6 +1883,7 @@ void VarManager::SetDefaultVarNames()
18811883
fgVarNamesMap["kPairPt"] = kPairPt;
18821884
fgVarNamesMap["kPairPtDau"] = kPairPtDau;
18831885
fgVarNamesMap["kPairEta"] = kPairEta;
1886+
fgVarNamesMap["kPairRap"] = kPairRap;
18841887
fgVarNamesMap["kPairPhi"] = kPairPhi;
18851888
fgVarNamesMap["kPairPhiv"] = kPairPhiv;
18861889
fgVarNamesMap["kDileptonHadronKstar"] = kDileptonHadronKstar;

‎PWGDQ/Core/VarManager.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -814,6 +814,7 @@ class VarManager : public TObject
814814
kPairPt,
815815
kPairPtDau,
816816
kPairEta,
817+
kPairRap,
817818
kPairPhi,
818819
kPairPhiv,
819820
kDeltaEta,
@@ -4336,6 +4337,7 @@ void VarManager::FillDileptonTrackVertexing(C const& collision, T1 const& lepton
43364337
values[VarManager::kMassDau] = mtrack;
43374338
values[VarManager::kDeltaMass] = v123.M() - v12.M();
43384339
values[VarManager::kPairPt] = v123.Pt();
4340+
values[VarManager::kPairRap] = -v123.Rapidity();
43394341
values[VarManager::kPairEta] = v123.Eta();
43404342
if (fgUsedVars[kPairMassDau] || fgUsedVars[kPairPtDau]) {
43414343
values[VarManager::kPairMassDau] = v12.M();

‎PWGDQ/Tasks/dqEfficiency_withAssoc.cxx‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ DECLARE_SOA_COLUMN(deltaMassBcandidate, deltaMBcandidate, float);
8686
DECLARE_SOA_COLUMN(pTBcandidate, PtBcandidate, float);
8787
DECLARE_SOA_COLUMN(EtaBcandidate, etaBcandidate, float);
8888
DECLARE_SOA_COLUMN(PhiBcandidate, phiBcandidate, float);
89+
DECLARE_SOA_COLUMN(RapBcandidate, rapBcandidate, float);
8990
DECLARE_SOA_COLUMN(LxyBcandidate, lxyBcandidate, float);
9091
DECLARE_SOA_COLUMN(LxyzBcandidate, lxyzBcandidate, float);
9192
DECLARE_SOA_COLUMN(LzBcandidate, lzBcandidate, float);
@@ -169,7 +170,7 @@ DECLARE_SOA_TABLE(MuonAmbiguities, "AOD", "DQMUONAMB", dqanalysisflags::MuonAmbi
169170
DECLARE_SOA_TABLE(Prefilter, "AOD", "DQPREFILTER", dqanalysisflags::IsBarrelSelectedPrefilter); //! joinable to ReducedTracksAssoc
170171
DECLARE_SOA_TABLE(BmesonCandidates, "AOD", "DQBMESONS",
171172
dqanalysisflags::RunNumber, dqanalysisflags::EventIdx, dqanalysisflags::EventTimestamp,
172-
dqanalysisflags::massBcandidate, dqanalysisflags::MassDileptonCandidate, dqanalysisflags::deltaMassBcandidate, dqanalysisflags::pTBcandidate, dqanalysisflags::EtaBcandidate, dqanalysisflags::PhiBcandidate,
173+
dqanalysisflags::massBcandidate, dqanalysisflags::MassDileptonCandidate, dqanalysisflags::deltaMassBcandidate, dqanalysisflags::pTBcandidate, dqanalysisflags::EtaBcandidate, dqanalysisflags::PhiBcandidate, dqanalysisflags::RapBcandidate,
173174
dqanalysisflags::LxyBcandidate, dqanalysisflags::LxyzBcandidate, dqanalysisflags::LzBcandidate,
174175
dqanalysisflags::TauxyBcandidate, dqanalysisflags::TauzBcandidate, dqanalysisflags::CosPBcandidate, dqanalysisflags::Chi2Bcandidate,
175176
dqanalysisflags::GlobalIndexassoc, dqanalysisflags::GlobalIndexleg1, dqanalysisflags::GlobalIndexleg2,
@@ -3923,7 +3924,7 @@ struct AnalysisDileptonTrack {
39233924
}
39243925
// table to be written out for ML analysis
39253926
BmesonsTable(event.runNumber(), event.globalIndex(), event.timestamp(),
3926-
fValuesHadron[VarManager::kPairMass], dilepton.mass(), fValuesHadron[VarManager::kDeltaMass], fValuesHadron[VarManager::kPairPt], fValuesHadron[VarManager::kPairEta], fValuesHadron[VarManager::kPairPhi],
3927+
fValuesHadron[VarManager::kPairMass], dilepton.mass(), fValuesHadron[VarManager::kDeltaMass], fValuesHadron[VarManager::kPairPt], fValuesHadron[VarManager::kPairEta], fValuesHadron[VarManager::kPairPhi], fValuesHadron[VarManager::kPairRap],
39273928
fValuesHadron[VarManager::kVertexingLxy], fValuesHadron[VarManager::kVertexingLxyz], fValuesHadron[VarManager::kVertexingLz],
39283929
fValuesHadron[VarManager::kVertexingTauxy], fValuesHadron[VarManager::kVertexingTauz], fValuesHadron[VarManager::kCosPointingAngle],
39293930
fValuesHadron[VarManager::kVertexingChi2PCA],

‎PWGDQ/Tasks/tableReader_withAssoc.cxx‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ DECLARE_SOA_COLUMN(deltamassBcandidate, deltaMBcandidate, float);
9595
DECLARE_SOA_COLUMN(pTBcandidate, PtBcandidate, float);
9696
DECLARE_SOA_COLUMN(EtaBcandidate, etaBcandidate, float);
9797
DECLARE_SOA_COLUMN(PhiBcandidate, phiBcandidate, float);
98+
DECLARE_SOA_COLUMN(RapBcandidate, rapBcandidate, float);
9899
DECLARE_SOA_COLUMN(LxyBcandidate, lxyBcandidate, float);
99100
DECLARE_SOA_COLUMN(LxyzBcandidate, lxyzBcandidate, float);
100101
DECLARE_SOA_COLUMN(LzBcandidate, lzBcandidate, float);
@@ -168,7 +169,7 @@ DECLARE_SOA_TABLE(MuonAmbiguities, "AOD", "DQMUONAMBA", dqanalysisflags::MuonAmb
168169
DECLARE_SOA_TABLE(Prefilter, "AOD", "DQPREFILTERA", dqanalysisflags::IsBarrelSelectedPrefilter); //! joinable to ReducedTracksAssoc
169170
DECLARE_SOA_TABLE(BmesonCandidates, "AOD", "DQBMESONSA",
170171
dqanalysisflags::RunNumber, dqanalysisflags::EventIdx, dqanalysisflags::EventTimestamp,
171-
dqanalysisflags::massBcandidate, dqanalysisflags::MassDileptonCandidate, dqanalysisflags::deltamassBcandidate, dqanalysisflags::pTBcandidate, dqanalysisflags::EtaBcandidate, dqanalysisflags::PhiBcandidate,
172+
dqanalysisflags::massBcandidate, dqanalysisflags::MassDileptonCandidate, dqanalysisflags::deltamassBcandidate, dqanalysisflags::pTBcandidate, dqanalysisflags::EtaBcandidate, dqanalysisflags::PhiBcandidate, dqanalysisflags::RapBcandidate,
172173
dqanalysisflags::LxyBcandidate, dqanalysisflags::LxyzBcandidate, dqanalysisflags::LzBcandidate,
173174
dqanalysisflags::TauxyBcandidate, dqanalysisflags::TauzBcandidate, dqanalysisflags::CosPBcandidate, dqanalysisflags::Chi2Bcandidate,
174175
dqanalysisflags::GlobalIndexassoc, dqanalysisflags::GlobalIndexleg1, dqanalysisflags::GlobalIndexleg2,
@@ -3448,7 +3449,7 @@ struct AnalysisDileptonTrack {
34483449
VarManager::FillDileptonHadron(dilepton, track, fValuesHadron);
34493450
VarManager::FillDileptonTrackVertexing<TCandidateType, TEventFillMap, TTrackFillMap>(event, lepton1, lepton2, track, fValuesHadron);
34503451
// table to be written out for ML analysis
3451-
BmesonsTable(event.runNumber(), event.globalIndex(), event.timestamp(), fValuesHadron[VarManager::kPairMass], dilepton.mass(), fValuesHadron[VarManager::kDeltaMass], fValuesHadron[VarManager::kPairPt], fValuesHadron[VarManager::kPairEta], fValuesHadron[VarManager::kPairPhi],
3452+
BmesonsTable(event.runNumber(), event.globalIndex(), event.timestamp(), fValuesHadron[VarManager::kPairMass], dilepton.mass(), fValuesHadron[VarManager::kDeltaMass], fValuesHadron[VarManager::kPairPt], fValuesHadron[VarManager::kPairEta], fValuesHadron[VarManager::kPairPhi], fValuesHadron[VarManager::kPairRap],
34523453
fValuesHadron[VarManager::kVertexingLxy], fValuesHadron[VarManager::kVertexingLxyz], fValuesHadron[VarManager::kVertexingLz],
34533454
fValuesHadron[VarManager::kVertexingTauxy], fValuesHadron[VarManager::kVertexingTauz], fValuesHadron[VarManager::kCosPointingAngle],
34543455
fValuesHadron[VarManager::kVertexingChi2PCA],

0 commit comments

Comments
 (0)