Skip to content

Commit

Permalink
Minor updates
Browse files Browse the repository at this point in the history
  • Loading branch information
fredevb committed Oct 18, 2023
1 parent 36a6d52 commit 16d1d72
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ auto r_phi_split(const std::vector<d_scalar_t>& edges_rphi) {
return std::tuple(edges_phi, r);
}

/// @return returns the actsvg grid type and edge values for a detray cylinder
/// @returns the actsvg grid type and edge values for a detray cylinder
/// grid.
template <typename detector_t, typename link_t, typename view_t>
auto cylinder2_grid_type_and_edges(const detector_t& detector,
Expand All @@ -74,7 +74,7 @@ auto cylinder2_grid_type_and_edges(const detector_t& detector,
auto edges_rphi = bin_edges<detray::n_axis::label::e_rphi>(detector, link);
auto edges_z = bin_edges<detray::n_axis::label::e_cyl_z>(detector, link);
auto [edges_phi, r] = r_phi_split(edges_rphi);
std::vector edges_r{0.f, r};
std::vector edges_r{r, r};

if (std::is_same_v<view_t, actsvg::views::x_y>) {
return std::tuple(actsvg::proto::grid::e_r_phi, edges_r, edges_phi);
Expand All @@ -93,7 +93,7 @@ auto cylinder2_grid_type_and_edges(const detector_t& detector,
std::vector<scalar_t>{});
}

/// @return returns the actsvg grid type and edge values for a detray disc grid.
/// @returns the actsvg grid type and edge values for a detray disc grid.
template <typename detector_t, typename link_t, typename view_t>
auto disc_grid_type_and_edges(const detector_t& detector, const link_t& link,
const view_t&) {
Expand All @@ -109,7 +109,7 @@ auto disc_grid_type_and_edges(const detector_t& detector, const link_t& link,
std::vector<scalar_t>{});
}

/// @return returns the detray grids respective actsvg grid type and edge
/// @returns the detray grids respective actsvg grid type and edge
/// values.
template <typename accel_ids_t, typename detector_t, typename link_t,
typename view_t>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,10 @@ inline auto intersection_record(const container_t& points) {
using p_intersection_record_t =
svgtools::meta::proto::intersection_record<point3_t>;
p_intersection_record_t p_ir;
std::vector<typename p_intersection_record_t::landmark_type> landmarks;
for (const auto& point : points) {
const auto p_lm = svgtools::conversion::landmark<point3_t>(point);
landmarks.push_back(p_lm);
p_ir._landmarks.push_back(p_lm);
}
p_ir._landmarks = landmarks;
return p_ir;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#include "actsvg/core.hpp"

// System include(s)
#include <string>
#include <vector>

namespace detray::svgtools::utils {
Expand Down

0 comments on commit 16d1d72

Please sign in to comment.