Skip to content

Commit

Permalink
Formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
fredevb committed Jul 14, 2023
1 parent 2388ab9 commit 8d0910a
Show file tree
Hide file tree
Showing 14 changed files with 190 additions and 190 deletions.
5 changes: 2 additions & 3 deletions core/include/detray/masks/annulus2D.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -302,12 +302,11 @@ class annulus2D {
/// no vertices an empty container will be returned.
template <typename point3_container_t,
template <typename, std::size_t> class bounds_t,
typename scalar_t,
std::size_t kDIM,
typename scalar_t, std::size_t kDIM,
typename std::enable_if_t<kDIM == e_size, bool> = true>
DETRAY_HOST inline point3_container_t local_vertices(
const bounds_t<scalar_t, kDIM>&) const {
return { };
return {};
}
};

Expand Down
7 changes: 3 additions & 4 deletions core/include/detray/masks/cuboid3D.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -136,11 +136,10 @@ class cuboid3D {
/// @returns a container of vertices.
template <typename point3_container_t,
template <typename, std::size_t> class bounds_t,
typename scalar_t,
std::size_t kDIM,
typename scalar_t, std::size_t kDIM,
typename std::enable_if_t<kDIM == e_size, bool> = true>
DETRAY_HOST inline point3_container_t local_vertices(
const bounds_t<scalar_t, kDIM>& bounds) const {
const bounds_t<scalar_t, kDIM> &bounds) const {
using point3_t = typename point3_container_t::value_type;
point3_t v1 = {bounds[e_min_x], bounds[e_min_y], bounds[e_min_z]};
point3_t v2 = {bounds[e_min_x], bounds[e_min_y], bounds[e_max_z]};
Expand All @@ -150,7 +149,7 @@ class cuboid3D {
point3_t v6 = {bounds[e_max_x], bounds[e_min_y], bounds[e_max_z]};
point3_t v7 = {bounds[e_max_x], bounds[e_max_y], bounds[e_min_z]};
point3_t v8 = {bounds[e_max_x], bounds[e_max_y], bounds[e_max_z]};
return { v1, v2, v4, v3, v7, v8, v6, v5};
return {v1, v2, v4, v3, v7, v8, v6, v5};
}
};

Expand Down
5 changes: 2 additions & 3 deletions core/include/detray/masks/cylinder2D.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -151,12 +151,11 @@ class cylinder2D {
/// no vertices an empty container will be returned.
template <typename point3_container_t,
template <typename, std::size_t> class bounds_t,
typename scalar_t,
std::size_t kDIM,
typename scalar_t, std::size_t kDIM,
typename std::enable_if_t<kDIM == e_size, bool> = true>
DETRAY_HOST inline point3_container_t local_vertices(
const bounds_t<scalar_t, kDIM>&) const {
return { };
return {};
}
};

Expand Down
7 changes: 3 additions & 4 deletions core/include/detray/masks/cylinder3D.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -133,12 +133,11 @@ class cylinder3D {
/// no vertices an empty container will be returned.
template <typename point3_container_t,
template <typename, std::size_t> class bounds_t,
typename scalar_t,
std::size_t kDIM,
typename scalar_t, std::size_t kDIM,
typename std::enable_if_t<kDIM == e_size, bool> = true>
DETRAY_HOST inline point3_container_t local_vertices(
const bounds_t<scalar_t, kDIM>&) const {
return { };
const bounds_t<scalar_t, kDIM> &) const {
return {};
}
};

Expand Down
5 changes: 2 additions & 3 deletions core/include/detray/masks/line.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -167,12 +167,11 @@ class line {
/// no vertices an empty container will be returned.
template <typename point3_container_t,
template <typename, std::size_t> class bounds_t,
typename scalar_t,
std::size_t kDIM,
typename scalar_t, std::size_t kDIM,
typename std::enable_if_t<kDIM == e_size, bool> = true>
DETRAY_HOST inline point3_container_t local_vertices(
const bounds_t<scalar_t, kDIM>&) const {
return { };
return {};
}
};

Expand Down
6 changes: 2 additions & 4 deletions core/include/detray/masks/rectangle2D.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,7 @@ class rectangle2D {
/// @returns a container of vertices in clockwise order.
template <typename point3_container_t,
template <typename, std::size_t> class bounds_t,
typename scalar_t,
std::size_t kDIM,
typename scalar_t, std::size_t kDIM,
typename std::enable_if_t<kDIM == e_size, bool> = true>
DETRAY_HOST inline point3_container_t local_vertices(
const bounds_t<scalar_t, kDIM>& bounds) const {
Expand All @@ -142,9 +141,8 @@ class rectangle2D {
point3_t v2 = {bounds[e_half_x], -bounds[e_half_y], 0};
point3_t v3 = {-bounds[e_half_x], -bounds[e_half_y], 0};
point3_t v4 = {-bounds[e_half_x], bounds[e_half_y], 0};
return { v1, v2, v3, v4 };
return {v1, v2, v3, v4};
}

};

} // namespace detray
5 changes: 2 additions & 3 deletions core/include/detray/masks/ring2D.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -134,12 +134,11 @@ class ring2D {
/// no vertices an empty container will be returned.
template <typename point3_container_t,
template <typename, std::size_t> class bounds_t,
typename scalar_t,
std::size_t kDIM,
typename scalar_t, std::size_t kDIM,
typename std::enable_if_t<kDIM == e_size, bool> = true>
DETRAY_HOST inline point3_container_t local_vertices(
const bounds_t<scalar_t, kDIM>&) const {
return { };
return {};
}
};

Expand Down
5 changes: 2 additions & 3 deletions core/include/detray/masks/single3D.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -130,12 +130,11 @@ class single3D {
/// no vertices an empty container will be returned.
template <typename point3_container_t,
template <typename, std::size_t> class bounds_t,
typename scalar_t,
std::size_t kDIM,
typename scalar_t, std::size_t kDIM,
typename std::enable_if_t<kDIM == e_size, bool> = true>
DETRAY_HOST inline point3_container_t local_vertices(
const bounds_t<scalar_t, kDIM>&) const {
return { };
return {};
}
};

Expand Down
5 changes: 2 additions & 3 deletions core/include/detray/masks/trapezoid2D.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,7 @@ class trapezoid2D {
/// @returns a container of vertices in clockwise order.
template <typename point3_container_t,
template <typename, std::size_t> class bounds_t,
typename scalar_t,
std::size_t kDIM,
typename scalar_t, std::size_t kDIM,
typename std::enable_if_t<kDIM == e_size, bool> = true>
DETRAY_HOST inline point3_container_t local_vertices(
const bounds_t<scalar_t, kDIM>& bounds) const {
Expand All @@ -156,7 +155,7 @@ class trapezoid2D {
point3_t v2 = {bounds[e_half_length_0], -bounds[e_half_length_2], 0};
point3_t v3 = {-bounds[e_half_length_0], -bounds[e_half_length_2], 0};
point3_t v4 = {-bounds[e_half_length_1], bounds[e_half_length_2], 0};
return { v1, v2, v3, v4 };
return {v1, v2, v3, v4};
}
};

Expand Down
12 changes: 6 additions & 6 deletions core/include/detray/masks/unbounded.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -89,14 +89,14 @@ class unbounded {
///
/// @returns a container of vertices. If the shape contains
/// no vertices an empty container will be returned.
template <typename point3_container_t,
template <typename, std::size_t> class bounds_t,
typename scalar_t,
std::size_t kDIM,
typename std::enable_if_t<kDIM == boundaries::e_size, bool> = true>
template <
typename point3_container_t,
template <typename, std::size_t> class bounds_t, typename scalar_t,
std::size_t kDIM,
typename std::enable_if_t<kDIM == boundaries::e_size, bool> = true>
DETRAY_HOST inline point3_container_t local_vertices(
const bounds_t<scalar_t, kDIM>&) const {
return { };
return {};
}
};

Expand Down
5 changes: 2 additions & 3 deletions core/include/detray/masks/unmasked.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -105,12 +105,11 @@ class unmasked {
/// no vertices an empty container will be returned.
template <typename point3_container_t,
template <typename, std::size_t> class bounds_t,
typename scalar_t,
std::size_t kDIM,
typename scalar_t, std::size_t kDIM,
typename std::enable_if_t<kDIM == e_size, bool> = true>
DETRAY_HOST inline point3_container_t local_vertices(
const bounds_t<scalar_t, kDIM>&) const {
return { };
return {};
}
};

Expand Down
Loading

0 comments on commit 8d0910a

Please sign in to comment.