From dd1fac3709c7caa20c56b40ccc4997e6dace4297 Mon Sep 17 00:00:00 2001 From: dtou Date: Fri, 9 May 2025 19:10:23 +0200 Subject: [PATCH 1/4] Added pt, tx and ty monitoring to long tracks, unify binning schemes for long. --- .../consolidate/include/ConsolidateSciFi.cuh | 24 ++++++++-- .../SciFi/consolidate/src/ConsolidateSciFi.cu | 45 +++++++++++++++---- .../include/MakeLongTrackParticles.cuh | 12 +++-- .../ParKalman/src/MakeLongTrackParticles.cu | 15 ++++++- .../include/ConsolidateMatchedTracks.cuh | 23 +++++++++- .../src/ConsolidateMatchedTracks.cu | 19 ++++++++ .../include/VeloKalmanFilter.cuh | 6 +-- 7 files changed, 123 insertions(+), 21 deletions(-) diff --git a/device/SciFi/consolidate/include/ConsolidateSciFi.cuh b/device/SciFi/consolidate/include/ConsolidateSciFi.cuh index b2f49766838..6635b9df6ab 100644 --- a/device/SciFi/consolidate/include/ConsolidateSciFi.cuh +++ b/device/SciFi/consolidate/include/ConsolidateSciFi.cuh @@ -115,7 +115,10 @@ namespace scifi_consolidate_tracks { Allen::Monitoring::Histogram<>::DeviceType& dev_histo_long_track_forward_eta, Allen::Monitoring::Histogram<>::DeviceType& dev_histo_long_track_forward_phi, Allen::Monitoring::Histogram<>::DeviceType& dev_histo_long_track_forward_nhits, - Allen::Monitoring::Histogram<>::DeviceType& dev_histo_long_track_forward_qop); + Allen::Monitoring::Histogram<>::DeviceType& dev_histo_long_track_forward_qop, + Allen::Monitoring::Histogram<>::DeviceType& dev_histo_long_track_forward_pt, + Allen::Monitoring::Histogram<>::DeviceType& dev_histo_long_track_forward_tx, + Allen::Monitoring::Histogram<>::DeviceType& dev_histo_long_track_forward_ty); private: Allen::Property m_block_dim {this, "block_dim", {128, 1, 1}, "block dimensions"}; @@ -139,7 +142,7 @@ namespace scifi_consolidate_tracks { Allen::Monitoring::Histogram<> m_histogram_long_track_forward_phi {this, "long_track_forward_phi", "#phi", - {16, -4.f, 4.f}}; + {400u, -3.2f, 3.2f}}; Allen::Monitoring::Histogram<> m_histogram_long_track_forward_nhits {this, "long_track_forward_nhits", @@ -149,6 +152,21 @@ namespace scifi_consolidate_tracks { "long_track_forward_qop", "q/p", {200u, -1e-3f, 1e-3f}}; - }; + + Allen::Monitoring::Histogram<> m_histogram_long_track_forward_pt {this, + "long_track_forward_pt", + "pt", + {500u, 0.f, 1e4f}}; + + Allen::Monitoring::Histogram<> m_histogram_long_track_forward_tx {this, + "long_track_forward_tx", + "tx", + {200u, -1.0f, 1.0f}}; + + Allen::Monitoring::Histogram<> m_histogram_long_track_forward_ty {this, + "long_track_forward_ty", + "ty", + {200u, -0.4f, 0.4f}}; + }; } // namespace scifi_consolidate_tracks diff --git a/device/SciFi/consolidate/src/ConsolidateSciFi.cu b/device/SciFi/consolidate/src/ConsolidateSciFi.cu index 46c89f21c66..3320437d1ee 100644 --- a/device/SciFi/consolidate/src/ConsolidateSciFi.cu +++ b/device/SciFi/consolidate/src/ConsolidateSciFi.cu @@ -21,7 +21,10 @@ __device__ void create_scifi_views_impl( Allen::Monitoring::Histogram<>::DeviceType& dev_histo_long_track_forward_eta, Allen::Monitoring::Histogram<>::DeviceType& dev_histo_long_track_forward_phi, Allen::Monitoring::Histogram<>::DeviceType& dev_histo_long_track_forward_nhits, - Allen::Monitoring::Histogram<>::DeviceType& dev_histo_long_track_forward_qop) + Allen::Monitoring::Histogram<>::DeviceType& dev_histo_long_track_forward_qop, + Allen::Monitoring::Histogram<>::DeviceType& dev_histo_long_track_forward_pt, + Allen::Monitoring::Histogram<>::DeviceType& dev_histo_long_track_forward_tx, + Allen::Monitoring::Histogram<>::DeviceType& dev_histo_long_track_forward_ty) { const unsigned number_of_events = parameters.dev_number_of_events[0]; const unsigned event_number = blockIdx.x; @@ -83,7 +86,10 @@ __device__ void create_scifi_views_impl( dev_histo_long_track_forward_eta, dev_histo_long_track_forward_phi, dev_histo_long_track_forward_nhits, - dev_histo_long_track_forward_qop); + dev_histo_long_track_forward_qop, + dev_histo_long_track_forward_pt, + dev_histo_long_track_forward_tx, + dev_histo_long_track_forward_ty); } if (threadIdx.x == 0) { @@ -114,7 +120,10 @@ __global__ void create_scifi_views( Allen::Monitoring::Histogram<>::DeviceType dev_histo_long_track_forward_eta, Allen::Monitoring::Histogram<>::DeviceType dev_histo_long_track_forward_phi, Allen::Monitoring::Histogram<>::DeviceType dev_histo_long_track_forward_nhits, - Allen::Monitoring::Histogram<>::DeviceType dev_histo_long_track_forward_qop) + Allen::Monitoring::Histogram<>::DeviceType dev_histo_long_track_forward_qop, + Allen::Monitoring::Histogram<>::DeviceType dev_histo_long_track_forward_pt, + Allen::Monitoring::Histogram<>::DeviceType dev_histo_long_track_forward_tx, + Allen::Monitoring::Histogram<>::DeviceType dev_histo_long_track_forward_ty) { const auto* ut_tracks = Allen::dyn_cast(*parameters.dev_tracks_view); @@ -125,7 +134,10 @@ __global__ void create_scifi_views( dev_histo_long_track_forward_eta, dev_histo_long_track_forward_phi, dev_histo_long_track_forward_nhits, - dev_histo_long_track_forward_qop); + dev_histo_long_track_forward_qop, + dev_histo_long_track_forward_pt, + dev_histo_long_track_forward_tx, + dev_histo_long_track_forward_ty); } else { const auto* velo_tracks = @@ -136,7 +148,10 @@ __global__ void create_scifi_views( dev_histo_long_track_forward_eta, dev_histo_long_track_forward_phi, dev_histo_long_track_forward_nhits, - dev_histo_long_track_forward_qop); + dev_histo_long_track_forward_qop, + dev_histo_long_track_forward_pt, + dev_histo_long_track_forward_tx, + dev_histo_long_track_forward_ty); } } @@ -188,6 +203,9 @@ void scifi_consolidate_tracks::scifi_consolidate_tracks_t::operator()( auto dev_histo_long_track_forward_phi = m_histogram_long_track_forward_phi.data(context); auto dev_histo_long_track_forward_nhits = m_histogram_long_track_forward_nhits.data(context); auto dev_histo_long_track_forward_qop = m_histogram_long_track_forward_qop.data(context); + auto dev_histo_long_track_forward_pt = m_histogram_long_track_forward_pt.data(context); + auto dev_histo_long_track_forward_tx = m_histogram_long_track_forward_tx.data(context); + auto dev_histo_long_track_forward_ty = m_histogram_long_track_forward_ty.data(context); global_function(scifi_consolidate_tracks)(dim3(size(arguments)), m_block_dim, context)( arguments, @@ -201,7 +219,10 @@ void scifi_consolidate_tracks::scifi_consolidate_tracks_t::operator()( dev_histo_long_track_forward_eta, dev_histo_long_track_forward_phi, dev_histo_long_track_forward_nhits, - dev_histo_long_track_forward_qop); + dev_histo_long_track_forward_qop, + dev_histo_long_track_forward_pt, + dev_histo_long_track_forward_tx, + dev_histo_long_track_forward_ty); if (with_ut) { PrefixSum::prefix_sum(*this, arguments, context); @@ -399,14 +420,16 @@ __global__ void scifi_consolidate_tracks::scifi_consolidate_tracks( } } __device__ void scifi_consolidate_tracks::scifi_consolidate_tracks_t::monitor( - const Allen::Views::Physics::LongTrack long_track, +const Allen::Views::Physics::LongTrack long_track, const Allen::Views::Physics::KalmanState velo_state, Allen::Monitoring::Histogram<>::DeviceType& dev_histo_long_track_forward_eta, Allen::Monitoring::Histogram<>::DeviceType& dev_histo_long_track_forward_phi, Allen::Monitoring::Histogram<>::DeviceType& dev_histo_long_track_forward_nhits, - Allen::Monitoring::Histogram<>::DeviceType& dev_histo_long_track_forward_qop) + Allen::Monitoring::Histogram<>::DeviceType& dev_histo_long_track_forward_qop, + Allen::Monitoring::Histogram<>::DeviceType& dev_histo_long_track_forward_pt, + Allen::Monitoring::Histogram<>::DeviceType& dev_histo_long_track_forward_tx, + Allen::Monitoring::Histogram<>::DeviceType& dev_histo_long_track_forward_ty) { - const auto tx = velo_state.tx(); const auto ty = velo_state.ty(); const float slope2 = tx * tx + ty * ty; @@ -414,10 +437,14 @@ __device__ void scifi_consolidate_tracks::scifi_consolidate_tracks_t::monitor( const auto nhits = long_track.number_of_hits(); const auto eta = eta_from_rho(rho); const auto phi = std::atan2(ty, tx); + const auto pt = long_track.pt(velo_state); // printf("tx %.4f , ty %.4f, nhits: %d \n", tx,ty,nhits); dev_histo_long_track_forward_eta.increment(eta); dev_histo_long_track_forward_phi.increment(phi); dev_histo_long_track_forward_nhits.increment(nhits); dev_histo_long_track_forward_qop.increment(long_track.qop()); + dev_histo_long_track_forward_pt.increment(pt); + dev_histo_long_track_forward_tx.increment(tx); + dev_histo_long_track_forward_ty.increment(ty); } diff --git a/device/kalman/ParKalman/include/MakeLongTrackParticles.cuh b/device/kalman/ParKalman/include/MakeLongTrackParticles.cuh index c93730dc81b..a1b1412d0f0 100644 --- a/device/kalman/ParKalman/include/MakeLongTrackParticles.cuh +++ b/device/kalman/ParKalman/include/MakeLongTrackParticles.cuh @@ -62,7 +62,10 @@ namespace make_long_track_particles { Allen::Monitoring::Histogram<>::DeviceType dev_histogram_n_trks, Allen::Monitoring::Histogram<>::DeviceType dev_histogram_trk_eta, Allen::Monitoring::Histogram<>::DeviceType dev_histogram_trk_phi, - Allen::Monitoring::Histogram<>::DeviceType dev_histogram_trk_pt); + Allen::Monitoring::Histogram<>::DeviceType dev_histogram_trk_qop, + Allen::Monitoring::Histogram<>::DeviceType dev_histogram_trk_pt, + Allen::Monitoring::Histogram<>::DeviceType dev_histogram_trk_tx, + Allen::Monitoring::Histogram<>::DeviceType dev_histogram_trk_ty); struct make_long_track_particles_t : public DeviceAlgorithm, Parameters { void set_arguments_size(ArgumentReferences arguments, const RuntimeOptions&, const Constants&) const; @@ -78,8 +81,11 @@ namespace make_long_track_particles { Allen::Monitoring::Histogram<> m_histogram_n_trks {this, "number_of_trks", "NTrks", {500 + 1, -0.5f, 500 + 0.5}}; Allen::Monitoring::Histogram<> m_histogram_trk_eta {this, "trk_eta", "etaTrk", {400u, 0.f, 10.f}}; - Allen::Monitoring::Histogram<> m_histogram_trk_phi {this, "trk_phi", "phiTrk", {1000u, -3.2f, 3.2f}}; - Allen::Monitoring::Histogram<> m_histogram_trk_pt {this, "trk_pt", "ptTrk", {1000u, 0.f, 1e4f}}; + Allen::Monitoring::Histogram<> m_histogram_trk_phi {this, "trk_phi", "phiTrk", {400u, -3.2f, 3.2f}}; + Allen::Monitoring::Histogram<> m_histogram_trk_qop {this, "trk_qop", "q/p", {200u, -1e-3f, 1e-3f}}; + Allen::Monitoring::Histogram<> m_histogram_trk_pt {this, "trk_pt", "ptTrk", {500u, 0.f, 1e4f}}; + Allen::Monitoring::Histogram<> m_histogram_trk_tx {this, "trk_tx", "txTrk", {200u, -1.0f, 1.0f}}; + Allen::Monitoring::Histogram<> m_histogram_trk_ty {this, "trk_ty", "tyTrk", {200u, -0.4f, 0.4f}}; }; } // namespace make_long_track_particles diff --git a/device/kalman/ParKalman/src/MakeLongTrackParticles.cu b/device/kalman/ParKalman/src/MakeLongTrackParticles.cu index e7697a06520..1b0d40d5b75 100644 --- a/device/kalman/ParKalman/src/MakeLongTrackParticles.cu +++ b/device/kalman/ParKalman/src/MakeLongTrackParticles.cu @@ -39,16 +39,24 @@ void make_long_track_particles::make_long_track_particles_t::operator()( m_histogram_n_trks.data(context), m_histogram_trk_eta.data(context), m_histogram_trk_phi.data(context), - m_histogram_trk_pt.data(context)); + m_histogram_trk_qop.data(context), + m_histogram_trk_pt.data(context), + m_histogram_trk_tx.data(context), + m_histogram_trk_ty.data(context)); } + + void __global__ make_long_track_particles::make_particles( make_long_track_particles::Parameters parameters, unsigned event_list_size, Allen::Monitoring::Histogram<>::DeviceType dev_histogram_n_trks, Allen::Monitoring::Histogram<>::DeviceType dev_histogram_trk_eta, Allen::Monitoring::Histogram<>::DeviceType dev_histogram_trk_phi, - Allen::Monitoring::Histogram<>::DeviceType dev_histogram_trk_pt) + Allen::Monitoring::Histogram<>::DeviceType dev_histogram_trk_qop, + Allen::Monitoring::Histogram<>::DeviceType dev_histogram_trk_pt, + Allen::Monitoring::Histogram<>::DeviceType dev_histogram_trk_tx, + Allen::Monitoring::Histogram<>::DeviceType dev_histogram_trk_ty) { const unsigned number_of_events = parameters.dev_number_of_events[0]; const unsigned event_index = blockIdx.x; @@ -80,7 +88,10 @@ void __global__ make_long_track_particles::make_particles( auto state = (parameters.dev_kalman_states_view + event_number)->state(i); dev_histogram_trk_eta.increment(state.eta()); dev_histogram_trk_phi.increment(std::atan2(state.ty(), state.tx())); + dev_histogram_trk_qop.increment(state.qop()); dev_histogram_trk_pt.increment(state.pt()); + dev_histogram_trk_tx.increment(state.tx()); + dev_histogram_trk_ty.increment(state.ty()); } } diff --git a/device/track_matching/consolidate/include/ConsolidateMatchedTracks.cuh b/device/track_matching/consolidate/include/ConsolidateMatchedTracks.cuh index 03825477cbc..f06c65adfe5 100644 --- a/device/track_matching/consolidate/include/ConsolidateMatchedTracks.cuh +++ b/device/track_matching/consolidate/include/ConsolidateMatchedTracks.cuh @@ -124,6 +124,9 @@ namespace matching_consolidate_tracks { Allen::Monitoring::Histogram<>::DeviceType, Allen::Monitoring::Histogram<>::DeviceType, Allen::Monitoring::Histogram<>::DeviceType, + Allen::Monitoring::Histogram<>::DeviceType, + Allen::Monitoring::Histogram<>::DeviceType, + Allen::Monitoring::Histogram<>::DeviceType, Allen::Monitoring::AveragingCounter<>::DeviceType); struct matching_consolidate_tracks_t : public DeviceAlgorithm, Parameters { @@ -144,6 +147,9 @@ namespace matching_consolidate_tracks { Allen::Monitoring::Histogram<>::DeviceType&, Allen::Monitoring::Histogram<>::DeviceType&, Allen::Monitoring::Histogram<>::DeviceType&, + Allen::Monitoring::Histogram<>::DeviceType&, + Allen::Monitoring::Histogram<>::DeviceType&, + Allen::Monitoring::Histogram<>::DeviceType&, Allen::Monitoring::Histogram<>::DeviceType&); private: @@ -161,7 +167,7 @@ namespace matching_consolidate_tracks { Allen::Monitoring::Histogram<> m_histogram_long_track_matching_phi {this, "long_track_matching_phi", "#phi", - {160u, -4.f, 4.f}}; + {400u, -3.2f, 3.2f}}; Allen::Monitoring::Histogram<> m_histogram_long_track_matching_nhits {this, "long_track_matching_nhits", "N. hits / track", @@ -174,5 +180,20 @@ namespace matching_consolidate_tracks { "long_track_ghost_prob", "GhostProb", {100u, 0.f, 0.6f}}; + + Allen::Monitoring::Histogram<> m_histogram_long_track_matching_pt {this, + "long_track_matching_pt", + "pt", + {500u, 0.f, 1e4f}}; + + Allen::Monitoring::Histogram<> m_histogram_long_track_matching_tx {this, + "long_track_matching_tx", + "tx", + {200u, -1.0f, 1.0f}}; + + Allen::Monitoring::Histogram<> m_histogram_long_track_matching_ty {this, + "long_track_matching_ty", + "ty", + {200u, -0.4f, 0.4f}}; }; } // namespace matching_consolidate_tracks diff --git a/device/track_matching/consolidate/src/ConsolidateMatchedTracks.cu b/device/track_matching/consolidate/src/ConsolidateMatchedTracks.cu index 2845178df7b..33e32ae0036 100644 --- a/device/track_matching/consolidate/src/ConsolidateMatchedTracks.cu +++ b/device/track_matching/consolidate/src/ConsolidateMatchedTracks.cu @@ -86,6 +86,9 @@ void matching_consolidate_tracks::matching_consolidate_tracks_t::operator()( m_histogram_long_track_ghost_prob.data(context), m_histogram_n_long_tracks_matching.data(context), m_histogram_long_track_matching_qop.data(context), + m_histogram_long_track_matching_pt.data(context), + m_histogram_long_track_matching_tx.data(context), + m_histogram_long_track_matching_ty.data(context), m_long_tracks_matching.data(context)); global_function(matching_create_longtracks_views)(first(arguments), 256, context)( @@ -102,6 +105,9 @@ void matching_consolidate_tracks::matching_consolidate_tracks_t::operator()( m_histogram_long_track_ghost_prob.data(context), m_histogram_n_long_tracks_matching.data(context), m_histogram_long_track_matching_qop.data(context), + m_histogram_long_track_matching_pt.data(context), + m_histogram_long_track_matching_tx.data(context), + m_histogram_long_track_matching_ty.data(context), m_long_tracks_matching.data(context)); global_function(matching_create_longtracks_views)(first(arguments), 256, context)( arguments); @@ -196,6 +202,9 @@ __global__ void matching_consolidate_tracks::matching_consolidate_tracks( [[maybe_unused]] Allen::Monitoring::Histogram<>::DeviceType dev_histogram_long_track_ghost_prob, [[maybe_unused]] Allen::Monitoring::Histogram<>::DeviceType dev_histogram_n_long_tracks_matching, [[maybe_unused]] Allen::Monitoring::Histogram<>::DeviceType dev_histogram_long_track_matching_qop, + [[maybe_unused]] Allen::Monitoring::Histogram<>::DeviceType dev_histogram_long_track_matching_pt, + [[maybe_unused]] Allen::Monitoring::Histogram<>::DeviceType dev_histogram_long_track_matching_tx, + [[maybe_unused]] Allen::Monitoring::Histogram<>::DeviceType dev_histogram_long_track_matching_ty, [[maybe_unused]] Allen::Monitoring::AveragingCounter<>::DeviceType dev_n_long_tracks_matching_counter) { const unsigned event_number = parameters.dev_event_list[blockIdx.x]; @@ -289,6 +298,9 @@ __global__ void matching_consolidate_tracks::matching_consolidate_tracks( dev_histogram_long_track_matching_eta, dev_histogram_long_track_matching_phi, dev_histogram_long_track_matching_qop, + dev_histogram_long_track_matching_pt, + dev_histogram_long_track_matching_tx, + dev_histogram_long_track_matching_ty, dev_histogram_long_track_matching_nhits, dev_histogram_long_track_ghost_prob); } @@ -309,6 +321,9 @@ __device__ void matching_consolidate_tracks::matching_consolidate_tracks_t::moni Allen::Monitoring::Histogram<>::DeviceType& dev_histogram_long_track_matching_eta, Allen::Monitoring::Histogram<>::DeviceType& dev_histogram_long_track_matching_phi, Allen::Monitoring::Histogram<>::DeviceType& dev_histogram_long_track_matching_qop, + Allen::Monitoring::Histogram<>::DeviceType& dev_histogram_long_track_matching_pt, + Allen::Monitoring::Histogram<>::DeviceType& dev_histogram_long_track_matching_tx, + Allen::Monitoring::Histogram<>::DeviceType& dev_histogram_long_track_matching_ty, Allen::Monitoring::Histogram<>::DeviceType& dev_histogram_long_track_matching_nhits, Allen::Monitoring::Histogram<>::DeviceType& dev_histogram_long_track_ghost_prob) { @@ -320,10 +335,14 @@ __device__ void matching_consolidate_tracks::matching_consolidate_tracks_t::moni velo_track.number_of_hits() + matched_track.number_of_hits_ut + scifi_track.number_of_scifi_hits(); const auto eta = eta_from_rho(rho); const auto phi = std::atan2(ty, tx); + const auto pt = long_track.pt(velo_state); dev_histogram_long_track_matching_eta.increment(eta); dev_histogram_long_track_matching_phi.increment(phi); dev_histogram_long_track_matching_nhits.increment(nhits); dev_histogram_long_track_matching_qop.increment(matched_track.qop); + dev_histogram_long_track_matching_pt.increment(pt); + dev_histogram_long_track_matching_tx.increment(tx); + dev_histogram_long_track_matching_ty.increment(ty); dev_histogram_long_track_ghost_prob.increment(matched_track.score); } diff --git a/device/velo/simplified_kalman_filter/include/VeloKalmanFilter.cuh b/device/velo/simplified_kalman_filter/include/VeloKalmanFilter.cuh index 7e9f3d2c5d2..09c62598e75 100644 --- a/device/velo/simplified_kalman_filter/include/VeloKalmanFilter.cuh +++ b/device/velo/simplified_kalman_filter/include/VeloKalmanFilter.cuh @@ -243,7 +243,7 @@ namespace velo_kalman_filter { Allen::Monitoring::Histogram<> m_histogram_velo_total_track_phi {this, "velo_total_track_phi", "#total_phi", - {160u, -4.f, 4.f}}; + {400u, -3.2f, 3.2f}}; Allen::Monitoring::Histogram<> m_histogram_velo_total_track_nhits {this, "velo_total_track_nhits", "total N. hits / track", @@ -255,7 +255,7 @@ namespace velo_kalman_filter { Allen::Monitoring::Histogram<> m_histogram_velo_forward_track_phi {this, "velo_forward_track_phi", "#forward_phi", - {160u, -4.f, 4.f}}; + {400u, -3.2f, 3.2f}}; Allen::Monitoring::Histogram<> m_histogram_velo_forward_track_nhits {this, "velo_forward_track_nhits", "forward N. hits / track", @@ -267,7 +267,7 @@ namespace velo_kalman_filter { Allen::Monitoring::Histogram<> m_histogram_velo_backward_track_phi {this, "velo_backward_track_phi", "#backward_phi", - {160u, -4.f, 4.f}}; + {400u, -3.2f, 3.2f}}; Allen::Monitoring::Histogram<> m_histogram_velo_backward_track_nhits {this, "velo_backward_track_nhits", "backward N. hits / track", -- GitLab From 6a86455dd360ee9c0ed09e5ecd6c1466eda743f5 Mon Sep 17 00:00:00 2001 From: Gitlab CI Date: Mon, 9 Jun 2025 09:29:35 +0000 Subject: [PATCH 2/4] Fixed formatting patch generated by https://gitlab.cern.ch/lhcb/Allen/-/jobs/57200895 --- .../consolidate/include/ConsolidateSciFi.cuh | 20 +++++++------- .../SciFi/consolidate/src/ConsolidateSciFi.cu | 2 +- .../ParKalman/src/MakeLongTrackParticles.cu | 2 -- .../include/ConsolidateMatchedTracks.cuh | 26 +++++++++---------- 4 files changed, 24 insertions(+), 26 deletions(-) diff --git a/device/SciFi/consolidate/include/ConsolidateSciFi.cuh b/device/SciFi/consolidate/include/ConsolidateSciFi.cuh index 6635b9df6ab..0ad7c77e2cd 100644 --- a/device/SciFi/consolidate/include/ConsolidateSciFi.cuh +++ b/device/SciFi/consolidate/include/ConsolidateSciFi.cuh @@ -154,19 +154,19 @@ namespace scifi_consolidate_tracks { {200u, -1e-3f, 1e-3f}}; Allen::Monitoring::Histogram<> m_histogram_long_track_forward_pt {this, - "long_track_forward_pt", - "pt", - {500u, 0.f, 1e4f}}; + "long_track_forward_pt", + "pt", + {500u, 0.f, 1e4f}}; Allen::Monitoring::Histogram<> m_histogram_long_track_forward_tx {this, - "long_track_forward_tx", - "tx", - {200u, -1.0f, 1.0f}}; + "long_track_forward_tx", + "tx", + {200u, -1.0f, 1.0f}}; Allen::Monitoring::Histogram<> m_histogram_long_track_forward_ty {this, - "long_track_forward_ty", - "ty", - {200u, -0.4f, 0.4f}}; - }; + "long_track_forward_ty", + "ty", + {200u, -0.4f, 0.4f}}; + }; } // namespace scifi_consolidate_tracks diff --git a/device/SciFi/consolidate/src/ConsolidateSciFi.cu b/device/SciFi/consolidate/src/ConsolidateSciFi.cu index 3320437d1ee..e26d10ee418 100644 --- a/device/SciFi/consolidate/src/ConsolidateSciFi.cu +++ b/device/SciFi/consolidate/src/ConsolidateSciFi.cu @@ -420,7 +420,7 @@ __global__ void scifi_consolidate_tracks::scifi_consolidate_tracks( } } __device__ void scifi_consolidate_tracks::scifi_consolidate_tracks_t::monitor( -const Allen::Views::Physics::LongTrack long_track, + const Allen::Views::Physics::LongTrack long_track, const Allen::Views::Physics::KalmanState velo_state, Allen::Monitoring::Histogram<>::DeviceType& dev_histo_long_track_forward_eta, Allen::Monitoring::Histogram<>::DeviceType& dev_histo_long_track_forward_phi, diff --git a/device/kalman/ParKalman/src/MakeLongTrackParticles.cu b/device/kalman/ParKalman/src/MakeLongTrackParticles.cu index 1b0d40d5b75..4a029bfcd9c 100644 --- a/device/kalman/ParKalman/src/MakeLongTrackParticles.cu +++ b/device/kalman/ParKalman/src/MakeLongTrackParticles.cu @@ -45,8 +45,6 @@ void make_long_track_particles::make_long_track_particles_t::operator()( m_histogram_trk_ty.data(context)); } - - void __global__ make_long_track_particles::make_particles( make_long_track_particles::Parameters parameters, unsigned event_list_size, diff --git a/device/track_matching/consolidate/include/ConsolidateMatchedTracks.cuh b/device/track_matching/consolidate/include/ConsolidateMatchedTracks.cuh index f06c65adfe5..2ff135904e9 100644 --- a/device/track_matching/consolidate/include/ConsolidateMatchedTracks.cuh +++ b/device/track_matching/consolidate/include/ConsolidateMatchedTracks.cuh @@ -182,18 +182,18 @@ namespace matching_consolidate_tracks { {100u, 0.f, 0.6f}}; Allen::Monitoring::Histogram<> m_histogram_long_track_matching_pt {this, - "long_track_matching_pt", - "pt", - {500u, 0.f, 1e4f}}; - - Allen::Monitoring::Histogram<> m_histogram_long_track_matching_tx {this, - "long_track_matching_tx", - "tx", - {200u, -1.0f, 1.0f}}; - - Allen::Monitoring::Histogram<> m_histogram_long_track_matching_ty {this, - "long_track_matching_ty", - "ty", - {200u, -0.4f, 0.4f}}; + "long_track_matching_pt", + "pt", + {500u, 0.f, 1e4f}}; + + Allen::Monitoring::Histogram<> m_histogram_long_track_matching_tx {this, + "long_track_matching_tx", + "tx", + {200u, -1.0f, 1.0f}}; + + Allen::Monitoring::Histogram<> m_histogram_long_track_matching_ty {this, + "long_track_matching_ty", + "ty", + {200u, -0.4f, 0.4f}}; }; } // namespace matching_consolidate_tracks -- GitLab From 69cac06154875ffff77aa7b90b05873bf2dcf3fb Mon Sep 17 00:00:00 2001 From: dtou Date: Mon, 9 Jun 2025 17:42:02 +0800 Subject: [PATCH 3/4] Made the binning scheme for phi and eta more fine. --- .../SciFi/consolidate/include/ConsolidateSciFi.cuh | 8 ++++---- .../ParKalman/include/MakeLongTrackParticles.cuh | 6 +++--- .../consolidate/include/ConsolidateMatchedTracks.cuh | 4 ++-- .../include/VeloKalmanFilter.cuh | 12 ++++++------ 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/device/SciFi/consolidate/include/ConsolidateSciFi.cuh b/device/SciFi/consolidate/include/ConsolidateSciFi.cuh index 0ad7c77e2cd..3e4f036c2d8 100644 --- a/device/SciFi/consolidate/include/ConsolidateSciFi.cuh +++ b/device/SciFi/consolidate/include/ConsolidateSciFi.cuh @@ -132,22 +132,22 @@ namespace scifi_consolidate_tracks { Allen::Monitoring::Histogram<> m_histogram_n_long_tracks_forward {this, "n_long_tracks_forward_event", "n_long_tracks_forward_event", - {201, -0.5f, 200.5f}}; + {501u, -0.5f, 500.5f}}; Allen::Monitoring::Histogram<> m_histogram_long_track_forward_eta {this, "long_track_forward_eta", "#eta", - {400, 0.f, 10.f}}; + {500u, 0.f, 10.f}}; Allen::Monitoring::Histogram<> m_histogram_long_track_forward_phi {this, "long_track_forward_phi", "#phi", - {400u, -3.2f, 3.2f}}; + {1000u, -3.2f, 3.2f}}; Allen::Monitoring::Histogram<> m_histogram_long_track_forward_nhits {this, "long_track_forward_nhits", "N. hits / track", - {51, -0.5f, 50.5f}}; + {51u, -0.5f, 50.5f}}; Allen::Monitoring::Histogram<> m_histogram_long_track_forward_qop {this, "long_track_forward_qop", "q/p", diff --git a/device/kalman/ParKalman/include/MakeLongTrackParticles.cuh b/device/kalman/ParKalman/include/MakeLongTrackParticles.cuh index a1b1412d0f0..d72f318899d 100644 --- a/device/kalman/ParKalman/include/MakeLongTrackParticles.cuh +++ b/device/kalman/ParKalman/include/MakeLongTrackParticles.cuh @@ -79,9 +79,9 @@ namespace make_long_track_particles { private: Allen::Property m_block_dim {this, "block_dim", {128, 1, 1}, "block dimensions"}; - Allen::Monitoring::Histogram<> m_histogram_n_trks {this, "number_of_trks", "NTrks", {500 + 1, -0.5f, 500 + 0.5}}; - Allen::Monitoring::Histogram<> m_histogram_trk_eta {this, "trk_eta", "etaTrk", {400u, 0.f, 10.f}}; - Allen::Monitoring::Histogram<> m_histogram_trk_phi {this, "trk_phi", "phiTrk", {400u, -3.2f, 3.2f}}; + Allen::Monitoring::Histogram<> m_histogram_n_trks {this, "number_of_trks", "NTrks", {501u, -0.5f, 500.5f}}; + Allen::Monitoring::Histogram<> m_histogram_trk_eta {this, "trk_eta", "etaTrk", {500u, 0.f, 10.f}}; + Allen::Monitoring::Histogram<> m_histogram_trk_phi {this, "trk_phi", "phiTrk", {1000u, -3.2f, 3.2f}}; Allen::Monitoring::Histogram<> m_histogram_trk_qop {this, "trk_qop", "q/p", {200u, -1e-3f, 1e-3f}}; Allen::Monitoring::Histogram<> m_histogram_trk_pt {this, "trk_pt", "ptTrk", {500u, 0.f, 1e4f}}; Allen::Monitoring::Histogram<> m_histogram_trk_tx {this, "trk_tx", "txTrk", {200u, -1.0f, 1.0f}}; diff --git a/device/track_matching/consolidate/include/ConsolidateMatchedTracks.cuh b/device/track_matching/consolidate/include/ConsolidateMatchedTracks.cuh index 2ff135904e9..5941c61920b 100644 --- a/device/track_matching/consolidate/include/ConsolidateMatchedTracks.cuh +++ b/device/track_matching/consolidate/include/ConsolidateMatchedTracks.cuh @@ -163,11 +163,11 @@ namespace matching_consolidate_tracks { Allen::Monitoring::Histogram<> m_histogram_long_track_matching_eta {this, "long_track_matching_eta", "#eta", - {400u, 0.f, 10.f}}; + {500u, 0.f, 10.f}}; Allen::Monitoring::Histogram<> m_histogram_long_track_matching_phi {this, "long_track_matching_phi", "#phi", - {400u, -3.2f, 3.2f}}; + {1000u, -3.2f, 3.2f}}; Allen::Monitoring::Histogram<> m_histogram_long_track_matching_nhits {this, "long_track_matching_nhits", "N. hits / track", diff --git a/device/velo/simplified_kalman_filter/include/VeloKalmanFilter.cuh b/device/velo/simplified_kalman_filter/include/VeloKalmanFilter.cuh index 09c62598e75..72264a94476 100644 --- a/device/velo/simplified_kalman_filter/include/VeloKalmanFilter.cuh +++ b/device/velo/simplified_kalman_filter/include/VeloKalmanFilter.cuh @@ -239,11 +239,11 @@ namespace velo_kalman_filter { Allen::Monitoring::Histogram<> m_histogram_velo_total_track_eta {this, "velo_total_track_eta", "#total_eta", - {800u, -10.f, 10.f}}; + {1000u, -10.f, 10.f}}; Allen::Monitoring::Histogram<> m_histogram_velo_total_track_phi {this, "velo_total_track_phi", "#total_phi", - {400u, -3.2f, 3.2f}}; + {1000u, -3.2f, 3.2f}}; Allen::Monitoring::Histogram<> m_histogram_velo_total_track_nhits {this, "velo_total_track_nhits", "total N. hits / track", @@ -251,11 +251,11 @@ namespace velo_kalman_filter { Allen::Monitoring::Histogram<> m_histogram_velo_forward_track_eta {this, "velo_forward_track_eta", "#forward_eta", - {800u, -10.f, 10.f}}; + {1000u, -10.f, 10.f}}; Allen::Monitoring::Histogram<> m_histogram_velo_forward_track_phi {this, "velo_forward_track_phi", "#forward_phi", - {400u, -3.2f, 3.2f}}; + {1000u, -3.2f, 3.2f}}; Allen::Monitoring::Histogram<> m_histogram_velo_forward_track_nhits {this, "velo_forward_track_nhits", "forward N. hits / track", @@ -263,11 +263,11 @@ namespace velo_kalman_filter { Allen::Monitoring::Histogram<> m_histogram_velo_backward_track_eta {this, "velo_backward_track_eta", "#backward_eta", - {800u, -10.f, 10.f}}; + {1000u, -10.f, 10.f}}; Allen::Monitoring::Histogram<> m_histogram_velo_backward_track_phi {this, "velo_backward_track_phi", "#backward_phi", - {400u, -3.2f, 3.2f}}; + {1000u, -3.2f, 3.2f}}; Allen::Monitoring::Histogram<> m_histogram_velo_backward_track_nhits {this, "velo_backward_track_nhits", "backward N. hits / track", -- GitLab From 598a58e7406f6f29b78a5cbd9045cabf5288fdee Mon Sep 17 00:00:00 2001 From: dtou Date: Mon, 9 Jun 2025 14:33:03 +0200 Subject: [PATCH 4/4] Fixed pt in tracking matching consolidate monitoring. --- .../consolidate/src/ConsolidateMatchedTracks.cu | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/device/track_matching/consolidate/src/ConsolidateMatchedTracks.cu b/device/track_matching/consolidate/src/ConsolidateMatchedTracks.cu index 33e32ae0036..8072e6e35a1 100644 --- a/device/track_matching/consolidate/src/ConsolidateMatchedTracks.cu +++ b/device/track_matching/consolidate/src/ConsolidateMatchedTracks.cu @@ -335,12 +335,13 @@ __device__ void matching_consolidate_tracks::matching_consolidate_tracks_t::moni velo_track.number_of_hits() + matched_track.number_of_hits_ut + scifi_track.number_of_scifi_hits(); const auto eta = eta_from_rho(rho); const auto phi = std::atan2(ty, tx); - const auto pt = long_track.pt(velo_state); + const auto qop = matched_track.qop; + const auto pt = std::sqrt(slope2 / (1.0f + slope2)) / std::fabs(qop); dev_histogram_long_track_matching_eta.increment(eta); dev_histogram_long_track_matching_phi.increment(phi); dev_histogram_long_track_matching_nhits.increment(nhits); - dev_histogram_long_track_matching_qop.increment(matched_track.qop); + dev_histogram_long_track_matching_qop.increment(qop); dev_histogram_long_track_matching_pt.increment(pt); dev_histogram_long_track_matching_tx.increment(tx); dev_histogram_long_track_matching_ty.increment(ty); -- GitLab