Skip to content

Commit f80a367

Browse files
lstanislasStanislas LAMBERTStanislas LAMBERT
authored
[PWGDQ] Add new columns to dimuonAll to flag track-collision associations (#14960)
Co-authored-by: Stanislas LAMBERT <lambert@nanpc519.local> Co-authored-by: Stanislas LAMBERT <lambert@nanpc519.home>
1 parent ba707ed commit f80a367

File tree

5 files changed

+9
-1
lines changed

5 files changed

+9
-1
lines changed

‎PWGDQ/DataModel/ReducedInfoTables.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -665,6 +665,8 @@ DECLARE_SOA_COLUMN(Vt2, vt2, float); //! Production vertex time
665665

666666
DECLARE_SOA_COLUMN(IsAmbig1, isAmbig1, int); //!
667667
DECLARE_SOA_COLUMN(IsAmbig2, isAmbig2, int); //!
668+
DECLARE_SOA_COLUMN(IsCorrectAssoc1, isCorrectAssoc1, bool); //!
669+
DECLARE_SOA_COLUMN(IsCorrectAssoc2, isCorrectAssoc2, bool); //!
668670

669671
DECLARE_SOA_COLUMN(FwdDcaX1, fwdDcaX1, float); //! X component of forward DCA
670672
DECLARE_SOA_COLUMN(FwdDcaY1, fwdDcaY1, float); //! Y component of forward DCA
@@ -912,6 +914,7 @@ DECLARE_SOA_TABLE(DimuonsAll, "AOD", "RTDIMUONALL", //!
912914
dilepton_track_index::Vx1, dilepton_track_index::Vy1, dilepton_track_index::Vz1, dilepton_track_index::Vt1,
913915
dilepton_track_index::Vx2, dilepton_track_index::Vy2, dilepton_track_index::Vz2, dilepton_track_index::Vt2,
914916
dilepton_track_index::IsAmbig1, dilepton_track_index::IsAmbig2,
917+
dilepton_track_index::IsCorrectAssoc1, dilepton_track_index::IsCorrectAssoc2,
915918
reducedpair::U2Q2,
916919
reducedpair::U3Q3,
917920
reducedpair::R2EP_AB,

‎PWGDQ/Tasks/dqEfficiency.cxx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -864,7 +864,8 @@ struct AnalysisSameEventPairing {
864864
t2.reducedMCTrack().pt(), t2.reducedMCTrack().eta(), t2.reducedMCTrack().phi(), t2.reducedMCTrack().e(),
865865
t1.reducedMCTrack().vx(), t1.reducedMCTrack().vy(), t1.reducedMCTrack().vz(), t1.reducedMCTrack().vt(),
866866
t2.reducedMCTrack().vx(), t2.reducedMCTrack().vy(), t2.reducedMCTrack().vz(), t2.reducedMCTrack().vt(),
867-
t1.isAmbiguous(), t2.isAmbiguous(), -999., -999., -999., -999., -999., -999., -999., -999., -999.,
867+
t1.isAmbiguous(), t2.isAmbiguous(), true, true,
868+
-999., -999., -999., -999., -999., -999., -999., -999., -999.,
868869
-999., -999., -999., VarManager::fgValues[VarManager::kVertexingPz],
869870
VarManager::fgValues[VarManager::kVertexingSV]);
870871
}

‎PWGDQ/Tasks/dqEfficiency_withAssoc.cxx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2023,6 +2023,7 @@ struct AnalysisSameEventPairing {
20232023
t1.reducedMCTrack().vx(), t1.reducedMCTrack().vy(), t1.reducedMCTrack().vz(), t1.reducedMCTrack().vt(),
20242024
t2.reducedMCTrack().vx(), t2.reducedMCTrack().vy(), t2.reducedMCTrack().vz(), t2.reducedMCTrack().vt(),
20252025
(twoTrackFilter & (static_cast<uint32_t>(1) << 28)) || (twoTrackFilter & (static_cast<uint32_t>(1) << 29)), (twoTrackFilter & (static_cast<uint32_t>(1) << 30)) || (twoTrackFilter & (static_cast<uint32_t>(1) << 31)),
2026+
isCorrectAssoc_leg1, isCorrectAssoc_leg2,
20262027
-999.0, -999.0, -999.0, -999.0, -999.0,
20272028
-999.0, -999.0, -999.0, -999.0, -999.0,
20282029
-999.0, VarManager::fgValues[VarManager::kMultDimuons],

‎PWGDQ/Tasks/tableReader.cxx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1540,6 +1540,7 @@ struct AnalysisSameEventPairing {
15401540
-999., -999., -999., -999.,
15411541
-999., -999., -999., -999.,
15421542
t1.isAmbiguous(), t2.isAmbiguous(),
1543+
true, true,
15431544
VarManager::fgValues[VarManager::kU2Q2], VarManager::fgValues[VarManager::kU3Q3],
15441545
VarManager::fgValues[VarManager::kR2EP_AB], VarManager::fgValues[VarManager::kR2SP_AB], VarManager::fgValues[VarManager::kCentFT0C],
15451546
VarManager::fgValues[VarManager::kCos2DeltaPhi], VarManager::fgValues[VarManager::kCos3DeltaPhi],

‎PWGDQ/Tasks/tableReader_withAssoc.cxx‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1941,6 +1941,7 @@ struct AnalysisSameEventPairing {
19411941
-999., -999., -999., -999.,
19421942
-999., -999., -999., -999.,
19431943
(twoTrackFilter & (static_cast<uint32_t>(1) << 28)) || (twoTrackFilter & (static_cast<uint32_t>(1) << 29)), (twoTrackFilter & (static_cast<uint32_t>(1) << 30)) || (twoTrackFilter & (static_cast<uint32_t>(1) << 31)),
1944+
true, true,
19441945
VarManager::fgValues[VarManager::kU2Q2], VarManager::fgValues[VarManager::kU3Q3],
19451946
VarManager::fgValues[VarManager::kR2EP_AB], VarManager::fgValues[VarManager::kR2SP_AB], VarManager::fgValues[VarManager::kCentFT0C],
19461947
VarManager::fgValues[VarManager::kCos2DeltaPhi], VarManager::fgValues[VarManager::kCos3DeltaPhi],
@@ -2169,6 +2170,7 @@ struct AnalysisSameEventPairing {
21692170
-999., -999., -999., -999.,
21702171
-999., -999., -999., -999.,
21712172
(twoTrackFilter & (static_cast<uint32_t>(1) << 28)) || (twoTrackFilter & (static_cast<uint32_t>(1) << 29)), (twoTrackFilter & (static_cast<uint32_t>(1) << 30)) || (twoTrackFilter & (static_cast<uint32_t>(1) << 31)),
2173+
true, true,
21722174
VarManager::fgValues[VarManager::kU2Q2], VarManager::fgValues[VarManager::kU3Q3],
21732175
VarManager::fgValues[VarManager::kR2EP_AB], VarManager::fgValues[VarManager::kR2SP_AB], VarManager::fgValues[VarManager::kCentFT0C],
21742176
VarManager::fgValues[VarManager::kCos2DeltaPhi], VarManager::fgValues[VarManager::kCos3DeltaPhi],

0 commit comments

Comments
 (0)