diff --git a/device/selections/Hlt1/include/GatherSelections.cuh b/device/selections/Hlt1/include/GatherSelections.cuh index 78e41d460dd5c3f7bbd508fdf08ffe87e54ad1b3..489fd64ee9eccb3bd8b803281e1314e245d1e8b2 100644 --- a/device/selections/Hlt1/include/GatherSelections.cuh +++ b/device/selections/Hlt1/include/GatherSelections.cuh @@ -86,17 +86,14 @@ namespace gather_selections { void monitor_operator(const ArgumentReferences& arguments, gsl::span) const; - void monitor_postscaled_operator( - const ArgumentReferences& arguments, - const Constants& constants, - gsl::span) const; + void monitor_postscaled_operator(const ArgumentReferences& arguments, const Constants&, gsl::span) + const; private: mutable std::vector>> m_pass_counters; mutable std::vector>> m_rate_counters; void* histogram_line_passes; void* histogram_line_rates; - std::vector histograms_rates_vs_time; #endif }; } // namespace gather_selections diff --git a/device/selections/Hlt1/src/GatherSelections.cpp b/device/selections/Hlt1/src/GatherSelections.cpp index 4254016bfd95e8c78556225d1f6c9079b536cc1b..3fc41161905ec520a64cb0855cea39840ddd2b27 100644 --- a/device/selections/Hlt1/src/GatherSelections.cpp +++ b/device/selections/Hlt1/src/GatherSelections.cpp @@ -27,11 +27,8 @@ void gather_selections::gather_selections_t::init_monitor() while (std::getline(is, line_name, ',')) { const std::string pass_counter_name {line_name + "Pass"}; const std::string rate_counter_name {line_name + "Rate"}; - const std::string rate_hist_name {line_name + "RateVsTime"}; m_pass_counters.push_back(std::make_unique>(this, pass_counter_name)); m_rate_counters.push_back(std::make_unique>(this, rate_counter_name)); - histograms_rates_vs_time.emplace_back((void*) new gaudi_histo_t<1>( - this, rate_hist_name, rate_hist_name, Gaudi::Accumulators::Axis {100, 0, 1000.})); line_labels.push_back(line_name); } unsigned int n_lines = line_labels.size(); @@ -65,25 +62,18 @@ void gather_selections::gather_selections_t::monitor_operator( void gather_selections::gather_selections_t::monitor_postscaled_operator( const ArgumentReferences& arguments, - const Constants& constants, + const Constants&, gsl::span postscaled_decisions) const { auto* histogram_line_rates_p = reinterpret_cast*>(histogram_line_rates); auto hist_buf = histogram_line_rates_p->buffer(); - auto time_bin = (std::chrono::duration_cast>( - std::chrono::high_resolution_clock::now() - constants.histogram_time_epoch)) - .count() / - 10.f; // Fill postscaled counters and histograms for (auto j = 0u; j < first(arguments); ++j) { auto buf = m_rate_counters[j]->buffer(); - auto* histograms_rates_vs_time_p = reinterpret_cast*>(histograms_rates_vs_time[j]); - auto buf_time = histograms_rates_vs_time_p->buffer(); for (auto i = 0u; i < first(arguments); ++i) { if (postscaled_decisions[i * first(arguments) + j]) { ++buf; ++hist_buf[j]; - ++buf_time[time_bin]; } } } diff --git a/stream/sequence/include/Constants.cuh b/stream/sequence/include/Constants.cuh index 263f71c9ac453f4a40b623497f72c8d249a7217c..e4e30e5fd9a556244f49cad44ed51f66b7795acd 100644 --- a/stream/sequence/include/Constants.cuh +++ b/stream/sequence/include/Constants.cuh @@ -124,9 +124,6 @@ struct Constants { // Kalman filter ParKalmanFilter::KalmanParametrizations* dev_kalman_params = nullptr; - // Monitoring - std::chrono::high_resolution_clock::time_point histogram_time_epoch; - /** * @brief Reserves and initializes constants. */ @@ -172,6 +169,4 @@ struct Constants { const std::vector& monotone_constraints, float nominal_cut, float lambda); - - void initialize_histogram_time_epoch() { histogram_time_epoch = std::chrono::high_resolution_clock::now(); } }; diff --git a/stream/sequence/src/Constants.cpp b/stream/sequence/src/Constants.cpp index fcf374385473c27968ea53f894e0d66d628a9359..7ab015cca9f941c8a5dbfd47990f3aaff14e6732 100644 --- a/stream/sequence/src/Constants.cpp +++ b/stream/sequence/src/Constants.cpp @@ -74,8 +74,6 @@ void Constants::initialize_constants( &host_muonmatch_search_windows, sizeof(MatchUpstreamMuon::SearchWindows), Allen::memcpyHostToDevice); - - initialize_histogram_time_epoch(); } void Constants::initialize_muon_catboost_model_constants(