From 1f86d361093e6104a2578e5870d6d3615c9e7225 Mon Sep 17 00:00:00 2001 From: mstahl Date: Sat, 3 May 2025 20:32:04 +0200 Subject: [PATCH 1/4] add Ks efficiency vs phi histogram --- .../src/KSVelo2LongEfficiencyMonitor.cpp | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/Phys/ParticleMatching/src/KSVelo2LongEfficiencyMonitor.cpp b/Phys/ParticleMatching/src/KSVelo2LongEfficiencyMonitor.cpp index 9990ef3d16d..59223562640 100644 --- a/Phys/ParticleMatching/src/KSVelo2LongEfficiencyMonitor.cpp +++ b/Phys/ParticleMatching/src/KSVelo2LongEfficiencyMonitor.cpp @@ -15,6 +15,7 @@ #include "LHCbAlgs/Consumer.h" #include "Relations/RelationWeighted1D.h" #include +#include namespace { using WeightedRelationTable = LHCb::RelationWeighted1D; @@ -45,6 +46,10 @@ public: Axis1D{ static_cast( m_histodef_eff_eta.value().bins() ), m_histodef_eff_eta.value().lowEdge(), m_histodef_eff_eta.value().highEdge() } ); + m_efficiency_vs_phi.emplace( this, "EfficiencyVsPhi", m_histodef_eff_phi.value().title(), + Axis1D{ static_cast( m_histodef_eff_phi.value().bins() ), + m_histodef_eff_phi.value().lowEdge(), + m_histodef_eff_phi.value().highEdge() } ); m_efficiency_vs_p_den.emplace( this, "EfficiencyVsP_den", m_histodef_eff_p.value().title() + "_den", Axis1D{ static_cast( m_histodef_eff_p.value().bins() ), @@ -57,6 +62,10 @@ public: Axis1D{ static_cast( m_histodef_eff_eta.value().bins() ), m_histodef_eff_eta.value().lowEdge(), m_histodef_eff_eta.value().highEdge() } ); + m_efficiency_vs_phi_den.emplace( this, "EfficiencyVsPhi_den", m_histodef_eff_phi.value().title() + "_den", + Axis1D{ static_cast( m_histodef_eff_phi.value().bins() ), + m_histodef_eff_phi.value().lowEdge(), + m_histodef_eff_phi.value().highEdge() } ); m_efficiency_vs_p_num.emplace( this, "EfficiencyVsP_num", m_histodef_eff_p.value().title() + "_num", Axis1D{ static_cast( m_histodef_eff_p.value().bins() ), @@ -69,6 +78,10 @@ public: Axis1D{ static_cast( m_histodef_eff_eta.value().bins() ), m_histodef_eff_eta.value().lowEdge(), m_histodef_eff_eta.value().highEdge() } ); + m_efficiency_vs_phi_num.emplace( this, "EfficiencyVsPhi_num", m_histodef_eff_phi.value().title() + "_num", + Axis1D{ static_cast( m_histodef_eff_phi.value().bins() ), + m_histodef_eff_phi.value().lowEdge(), + m_histodef_eff_phi.value().highEdge() } ); m_efficiency_vs_eta_p.emplace( this, "EfficiencyVsEtaP", m_histodef_eff_eta.value().title(), Axis1D{ static_cast( m_histodef_eff_eta.value().bins() / 2 ), @@ -123,6 +136,7 @@ public: ( *m_efficiency_vs_p_den )[probe_momentum.P() / 1000.] += weight; ( *m_efficiency_vs_pt_den )[probe_momentum.Pt() / 1000.] += weight; ( *m_efficiency_vs_eta_den )[probe_momentum.Eta()] += weight; + ( *m_efficiency_vs_phi_den )[probe_momentum.Phi()] += weight; float matched = 0.; auto const& matches = matching_table.relations( probe ); int n_fthits = 0; @@ -155,6 +169,7 @@ public: ( *m_efficiency_vs_p )[probe_momentum.P() / 1000.] += matched; ( *m_efficiency_vs_pt )[probe_momentum.Pt() / 1000.] += matched; ( *m_efficiency_vs_eta )[probe_momentum.Eta()] += matched; + ( *m_efficiency_vs_phi )[probe_momentum.Phi()] += matched; ( *m_efficiency_vs_eta_p )[{ probe_momentum.Eta(), probe_momentum.P() / 1000. }] += matched; ( *m_efficiency_vs_eta_pt )[{ probe_momentum.Eta(), probe_momentum.Pt() / 1000. }] += matched; } @@ -162,6 +177,7 @@ public: ( *m_efficiency_vs_p_num )[probe_momentum.P() / 1000.] += weight; ( *m_efficiency_vs_pt_num )[probe_momentum.Pt() / 1000.] += weight; ( *m_efficiency_vs_eta_num )[probe_momentum.Eta()] += weight; + ( *m_efficiency_vs_phi_num )[probe_momentum.Eta()] += weight; m_fthits[n_fthits] += weight; } } @@ -195,18 +211,23 @@ private: this, "HistogramDefEffPt", { "Efficiency versus pt [GeV]", 0.25, 5., 19 }, "Histogram definition" }; Gaudi::Property m_histodef_eff_eta{ this, "HistogramDefEffEta", { "Efficiency versus eta", 1.5, 5., 14 }, "Histogram definition" }; + Gaudi::Property m_histodef_eff_phi{ + this, "HistogramDefEffPhi", { "Efficiency versus phi", -std::numbers::pi, std::numbers::pi, 48 }, "Histogram definition" }; mutable std::optional> m_efficiency_vs_p; mutable std::optional> m_efficiency_vs_pt; mutable std::optional> m_efficiency_vs_eta; + mutable std::optional> m_efficiency_vs_phi; mutable std::optional> m_efficiency_vs_p_den; mutable std::optional> m_efficiency_vs_pt_den; mutable std::optional> m_efficiency_vs_eta_den; + mutable std::optional> m_efficiency_vs_phi_den; mutable std::optional> m_efficiency_vs_p_num; mutable std::optional> m_efficiency_vs_pt_num; mutable std::optional> m_efficiency_vs_eta_num; + mutable std::optional> m_efficiency_vs_phi_num; mutable std::optional> m_efficiency_vs_eta_p; mutable std::optional> m_efficiency_vs_eta_pt; -- GitLab From c449868344a4c87d2b13084ca3a4b633926b64e6 Mon Sep 17 00:00:00 2001 From: Gitlab CI Date: Sat, 3 May 2025 18:32:46 +0000 Subject: [PATCH 2/4] pre-commit fixes patch generated by https://gitlab.cern.ch/lhcb/Rec/-/jobs/55375817 --- Phys/ParticleMatching/src/KSVelo2LongEfficiencyMonitor.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Phys/ParticleMatching/src/KSVelo2LongEfficiencyMonitor.cpp b/Phys/ParticleMatching/src/KSVelo2LongEfficiencyMonitor.cpp index 59223562640..cf22c6fcf86 100644 --- a/Phys/ParticleMatching/src/KSVelo2LongEfficiencyMonitor.cpp +++ b/Phys/ParticleMatching/src/KSVelo2LongEfficiencyMonitor.cpp @@ -212,7 +212,10 @@ private: Gaudi::Property m_histodef_eff_eta{ this, "HistogramDefEffEta", { "Efficiency versus eta", 1.5, 5., 14 }, "Histogram definition" }; Gaudi::Property m_histodef_eff_phi{ - this, "HistogramDefEffPhi", { "Efficiency versus phi", -std::numbers::pi, std::numbers::pi, 48 }, "Histogram definition" }; + this, + "HistogramDefEffPhi", + { "Efficiency versus phi", -std::numbers::pi, std::numbers::pi, 48 }, + "Histogram definition" }; mutable std::optional> m_efficiency_vs_p; mutable std::optional> m_efficiency_vs_pt; -- GitLab From d82614a853cfc4f0f1937f23eec4423168464c09 Mon Sep 17 00:00:00 2001 From: mstahl Date: Sun, 4 May 2025 11:54:45 +0200 Subject: [PATCH 3/4] oops --- Phys/ParticleMatching/src/KSVelo2LongEfficiencyMonitor.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Phys/ParticleMatching/src/KSVelo2LongEfficiencyMonitor.cpp b/Phys/ParticleMatching/src/KSVelo2LongEfficiencyMonitor.cpp index cf22c6fcf86..0a6dc5e7be0 100644 --- a/Phys/ParticleMatching/src/KSVelo2LongEfficiencyMonitor.cpp +++ b/Phys/ParticleMatching/src/KSVelo2LongEfficiencyMonitor.cpp @@ -177,7 +177,7 @@ public: ( *m_efficiency_vs_p_num )[probe_momentum.P() / 1000.] += weight; ( *m_efficiency_vs_pt_num )[probe_momentum.Pt() / 1000.] += weight; ( *m_efficiency_vs_eta_num )[probe_momentum.Eta()] += weight; - ( *m_efficiency_vs_phi_num )[probe_momentum.Eta()] += weight; + ( *m_efficiency_vs_phi_num )[probe_momentum.Phi()] += weight; m_fthits[n_fthits] += weight; } } -- GitLab From 2ea1a196892029f1ac4434d4634214d576e0d6f5 Mon Sep 17 00:00:00 2001 From: Marian Stahl Date: Mon, 5 May 2025 10:07:04 +0000 Subject: [PATCH 4/4] change binning --- Phys/ParticleMatching/src/KSVelo2LongEfficiencyMonitor.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Phys/ParticleMatching/src/KSVelo2LongEfficiencyMonitor.cpp b/Phys/ParticleMatching/src/KSVelo2LongEfficiencyMonitor.cpp index 0a6dc5e7be0..824d767e043 100644 --- a/Phys/ParticleMatching/src/KSVelo2LongEfficiencyMonitor.cpp +++ b/Phys/ParticleMatching/src/KSVelo2LongEfficiencyMonitor.cpp @@ -214,7 +214,7 @@ private: Gaudi::Property m_histodef_eff_phi{ this, "HistogramDefEffPhi", - { "Efficiency versus phi", -std::numbers::pi, std::numbers::pi, 48 }, + { "Efficiency versus phi", -std::numbers::pi, std::numbers::pi, 24 }, "Histogram definition" }; mutable std::optional> m_efficiency_vs_p; -- GitLab