Skip to content

Commit aa18ff3

Browse files
niermann999niermann999
committed
Make detray work with the new metadata
1 parent c5c1080 commit aa18ff3

File tree

53 files changed

+1018
-1131
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+1018
-1131
lines changed

‎core/include/detray/builders/cuboid_portal_generator.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ class cuboid_portal_generator final
116116
auto surfaces_offset{static_cast<dindex>(n_surfaces)};
117117

118118
// Fetch the position in the mask tuple for the rectangle portals
119-
constexpr auto rectangle_id{detector_t::masks::id::e_portal_rectangle2};
119+
constexpr auto rectangle_id{detector_t::masks::id::e_rectangle2D};
120120

121121
// The material will be added in a later step
122122
constexpr auto no_material = surface_t::material_id::e_none;

‎core/include/detray/builders/cylinder_portal_generator.hpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -305,14 +305,14 @@ class cylinder_portal_generator final
305305

306306
// Add transform and mask data
307307
transforms.emplace_back(ctx, tsl);
308-
masks.template emplace_back<mask_id::e_portal_cylinder2>(
308+
masks.template emplace_back<mask_id::e_concentric_cylinder2D>(
309309
empty_context{}, vol_link, r, min_z, max_z);
310310

311311
// Add surface links
312312
mask_link_t mask_link{};
313313
const auto mask_idx{static_cast<dindex>(
314-
masks.template size<mask_id::e_portal_cylinder2>() - 1u)};
315-
set_mask_link(mask_link, mask_id::e_portal_cylinder2, mask_idx);
314+
masks.template size<mask_id::e_concentric_cylinder2D>() - 1u)};
315+
set_mask_link(mask_link, mask_id::e_concentric_cylinder2D, mask_idx);
316316

317317
material_link_t material_link{material_id::e_none, dindex_invalid};
318318

@@ -341,14 +341,14 @@ class cylinder_portal_generator final
341341

342342
// Add transform and mask data
343343
transforms.emplace_back(ctx, tsl);
344-
masks.template emplace_back<mask_id::e_portal_ring2>(
345-
empty_context{}, vol_link, min_r, max_r);
344+
masks.template emplace_back<mask_id::e_ring2D>(empty_context{},
345+
vol_link, min_r, max_r);
346346

347347
// Add surface links
348348
mask_link_t mask_link{};
349-
const auto mask_idx{static_cast<dindex>(
350-
masks.template size<mask_id::e_portal_ring2>() - 1u)};
351-
set_mask_link(mask_link, mask_id::e_portal_ring2, mask_idx);
349+
const auto mask_idx{
350+
static_cast<dindex>(masks.template size<mask_id::e_ring2D>() - 1u)};
351+
set_mask_link(mask_link, mask_id::e_ring2D, mask_idx);
352352

353353
material_link_t material_link{material_id::e_none, dindex_invalid};
354354

‎core/include/detray/builders/detail/volume_connector.hpp‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -248,8 +248,9 @@ void connect_cylindrical_volumes(
248248
0., 0., volume_bounds[bound_index]};
249249

250250
// Get the mask context group and fill it
251-
constexpr auto disc_id = detector_t::masks::id::e_portal_ring2;
252-
constexpr auto slab_id = detector_t::materials::id::e_slab;
251+
constexpr auto disc_id = detector_t::masks::id::e_ring2D;
252+
constexpr auto slab_id =
253+
detector_t::materials::id::e_material_slab;
253254
typename portal_t::mask_link mask_index = {
254255
disc_id, portal_masks.template size<disc_id>()};
255256
typename portal_t::material_link material_index = {
@@ -298,7 +299,8 @@ void connect_cylindrical_volumes(
298299
detector_t::masks::id::e_portal_cylinder3;
299300
typename portal_t::mask_link mask_index = {
300301
cylinder_id, portal_masks.template size<cylinder_id>()};
301-
constexpr auto slab_id = detector_t::materials::id::e_slab;
302+
constexpr auto slab_id =
303+
detector_t::materials::id::e_material_slab;
302304

303305
for (auto &info_ : portals_info) {
304306
// Add new mask to container

‎core/include/detray/builders/homogeneous_material_builder.hpp‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -97,34 +97,38 @@ class homogeneous_material_builder final : public volume_decorator<detector_t> {
9797
for (auto &sf : this->surfaces()) {
9898
DETRAY_DEBUG_HOST("-> sf=" << sf);
9999
DETRAY_DEBUG_HOST(" -> material_id=" << sf.material().id());
100-
if (sf.material().id() == material_id::e_slab) {
101-
dindex offset = material.template size<material_id::e_slab>();
100+
if (sf.material().id() == material_id::e_material_slab) {
101+
dindex offset =
102+
material.template size<material_id::e_material_slab>();
102103
DETRAY_DEBUG_HOST("-> update material slab offset: " << offset);
103104
sf.update_material(offset);
104105
DETRAY_DEBUG_HOST("-> material now: " << sf.material());
105106
}
106107
if constexpr (types::contains<typename detector_t::materials,
107108
material_rod<scalar_type>>) {
108-
if (sf.material().id() == material_id::e_rod) {
109+
if (sf.material().id() == material_id::e_material_rod) {
109110
DETRAY_DEBUG_HOST(
110111
"-> update material rod offset: "
111-
<< material.template size<material_id::e_rod>());
112+
<< material
113+
.template size<material_id::e_material_rod>());
112114
sf.update_material(
113-
material.template size<material_id::e_rod>());
115+
material.template size<material_id::e_material_rod>());
114116
}
115117
}
116118
}
117119

118120
// Add material to the detector
119-
DETRAY_DEBUG_HOST("-> Appending "
120-
<< m_materials.template size<material_id::e_slab>()
121-
<< " slabs into detector materials");
121+
DETRAY_DEBUG_HOST(
122+
"-> Appending "
123+
<< m_materials.template size<material_id::e_material_slab>()
124+
<< " slabs into detector materials");
122125

123126
if constexpr (types::contains<typename detector_t::materials,
124127
material_rod<scalar_type>>) {
125-
DETRAY_DEBUG_HOST("-> Appending "
126-
<< m_materials.template size<material_id::e_rod>()
127-
<< " rods into detector materials");
128+
DETRAY_DEBUG_HOST(
129+
"-> Appending "
130+
<< m_materials.template size<material_id::e_material_rod>()
131+
<< " rods into detector materials");
128132
}
129133
det._materials.append(std::move(m_materials));
130134
m_materials.clear_all();

‎core/include/detray/builders/homogeneous_material_factory.hpp‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -352,18 +352,19 @@ class homogeneous_material_factory final
352352
DETRAY_DEBUG_HOST(" mat=" << mat << " thickness=" << t);
353353

354354
dindex mat_idx{0u};
355-
if (m_links.at(sf_idx).first == material_id::e_slab) {
356-
auto &mat_coll = materials.template get<material_id::e_slab>();
355+
if (m_links.at(sf_idx).first == material_id::e_material_slab) {
356+
auto &mat_coll =
357+
materials.template get<material_id::e_material_slab>();
357358

358359
material_slab<scalar_type> mat_slab{mat, t};
359360
mat_idx = this->insert_in_container(mat_coll, mat_slab,
360361
m_links.at(sf_idx).second);
361362
}
362363
if constexpr (types::contains<typename detector_t::materials,
363364
material_rod<scalar_type>>) {
364-
if (m_links.at(sf_idx).first == material_id::e_rod) {
365+
if (m_links.at(sf_idx).first == material_id::e_material_rod) {
365366
auto &mat_coll =
366-
materials.template get<material_id::e_rod>();
367+
materials.template get<material_id::e_material_rod>();
367368

368369
material_rod<scalar_type> mat_rod{mat, t};
369370
mat_idx = this->insert_in_container(mat_coll, mat_rod,

‎core/include/detray/builders/homogeneous_material_generator.hpp‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -198,20 +198,21 @@ class homogeneous_material_generator final
198198
is_line = true;
199199

200200
auto &mat_coll =
201-
materials.template get<material_id::e_rod>();
201+
materials.template get<material_id::e_material_rod>();
202202
mat_coll.emplace_back(*mat_ptr, m_cfg.thickness());
203203

204-
mat_link = {material_id::e_rod,
204+
mat_link = {material_id::e_material_rod,
205205
static_cast<dindex>(mat_coll.size() - 1u)};
206206
}
207207
}
208208

209209
// For all surfaces that are not lines, generate a material slab
210210
if (!is_line) {
211-
auto &mat_coll = materials.template get<material_id::e_slab>();
211+
auto &mat_coll =
212+
materials.template get<material_id::e_material_slab>();
212213
mat_coll.emplace_back(*mat_ptr, m_cfg.thickness());
213214

214-
mat_link = {material_id::e_slab,
215+
mat_link = {material_id::e_material_slab,
215216
static_cast<dindex>(mat_coll.size() - 1u)};
216217
}
217218

‎core/include/detray/builders/volume_builder.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class volume_builder : public volume_builder_interface<detector_t> {
5252
// force method that will at least contain the portals
5353
m_volume.template set_accel_link<
5454
static_cast<typename volume_type::object_id>(0)>(
55-
detector_t::accel::id::e_default, 0);
55+
detector_t::accel::id::e_surface_default, 0);
5656

5757
DETRAY_VERBOSE_HOST("Created builder for volume: " << idx);
5858
};
@@ -253,7 +253,7 @@ class volume_builder : public volume_builder_interface<detector_t> {
253253
}
254254

255255
// Place the appropriate surfaces in the brute force search method.
256-
constexpr auto default_acc_id{detector_t::accel::id::e_default};
256+
constexpr auto default_acc_id{detector_t::accel::id::e_surface_default};
257257

258258
// Strip the source link from the lookup data structure
259259
typename detector_t::surface_container descriptors;

‎core/include/detray/core/detector.hpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ class detector {
232232
// TODO: Add volume accelerator builder
233233
volume_type v_desc{};
234234
v_desc.template set_accel_link<geo_obj_ids::e_volume>(
235-
accel::id::e_default_volume_searcher, 0u);
235+
accel::id::e_volume_default, 0u);
236236
tracking_volume world{*this, v_desc};
237237

238238
dindex volume_index{0u};
@@ -248,7 +248,8 @@ class detector {
248248
DETRAY_HOST_DEVICE
249249
inline const auto &portals() const {
250250
// All portals are registered with the brute force search
251-
return _accelerators.template get<accel::id::e_brute_force>().all();
251+
return _accelerators.template get<accel::id::e_surface_brute_force>()
252+
.all();
252253
}
253254

254255
/// @returns the sub-volumes of the detector - const access

‎core/include/detray/utils/detector_statistics.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ DETRAY_HOST_DEVICE inline std::size_t n_material_maps(const detector_t& det) {
8989
template <typename detector_t>
9090
DETRAY_HOST_DEVICE inline std::size_t n_material_slabs(const detector_t& det) {
9191
if constexpr (detray::concepts::has_material_slabs<detector_t>) {
92-
constexpr auto slab_id{detector_t::materials::id::e_slab};
92+
constexpr auto slab_id{detector_t::materials::id::e_material_slab};
9393
return det.material_store().template size<slab_id>();
9494
} else {
9595
return 0u;
@@ -100,7 +100,7 @@ DETRAY_HOST_DEVICE inline std::size_t n_material_slabs(const detector_t& det) {
100100
template <typename detector_t>
101101
DETRAY_HOST_DEVICE inline std::size_t n_material_rods(const detector_t& det) {
102102
if constexpr (detray::concepts::has_material_rods<detector_t>) {
103-
constexpr auto rod_id{detector_t::materials::id::e_rod};
103+
constexpr auto rod_id{detector_t::materials::id::e_material_rod};
104104
return det.material_store().template size<rod_id>();
105105
} else {
106106
return 0u;

0 commit comments

Comments
 (0)