Propagator actors: use geometry context from propagator state

... instead of constructing a fake one

Author: Vakho Tsulaia

core/include/detray/propagator/actors/parameter_resetter.hpp

@@ -68,14 +68,10 @@ struct parameter_resetter : actor {
             return;
         }
 
-        using geo_cxt_t =
-            typename propagator_state_t::detector_type::geometry_context;
-        const geo_cxt_t ctx{};
-
         // Surface
         const auto sf = navigation.get_surface();
 
-        sf.template visit_mask<kernel>(sf.transform(ctx), sf.index(), stepping);
+        sf.template visit_mask<kernel>(sf.transform(propagation._context), sf.index(), stepping);
     }
 };
 

core/include/detray/propagator/actors/parameter_transporter.hpp

@@ -98,8 +98,6 @@ struct parameter_transporter : actor {
         }
 
         using detector_type = typename propagator_state_t::detector_type;
-        using geo_cxt_t = typename detector_type::geometry_context;
-        const geo_cxt_t ctx{};
 
         // Current Surface
         const auto sf = navigation.get_surface();
@@ -114,11 +112,11 @@ struct parameter_transporter : actor {
                                                     stepping.prev_sf_index()};
 
             const bound_to_free_matrix<algebra_t> bound_to_free_jacobian =
-                prev_sf.bound_to_free_jacobian(ctx, stepping.bound_params());
+                prev_sf.bound_to_free_jacobian(propagation._context, stepping.bound_params());
 
             stepping.set_full_jacobian(
                 sf.template visit_mask<get_full_jacobian_kernel>(
-                    sf.transform(ctx), bound_to_free_jacobian, propagation));
+                    sf.transform(propagation._context), bound_to_free_jacobian, propagation));
 
             // Calculate surface-to-surface covariance transport
             const bound_matrix_t new_cov =
@@ -130,7 +128,7 @@ struct parameter_transporter : actor {
 
         // Convert free to bound vector
         stepping.bound_params().set_parameter_vector(
-            sf.free_to_bound_vector(ctx, stepping()));
+            sf.free_to_bound_vector(propagation._context, stepping()));
 
         // Set surface link
         stepping.bound_params().set_surface_link(sf.barcode());

core/include/detray/propagator/actors/pointwise_material_interactor.hpp

@@ -130,10 +130,6 @@ struct pointwise_material_interactor : actor {
     DETRAY_HOST_DEVICE inline void operator()(
         state &interactor_state, propagator_state_t &prop_state) const {
 
-        // @Todo: Make context part of propagation state
-        using detector_type = typename propagator_state_t::detector_type;
-        using geo_context_type = typename detector_type::geometry_context;
-
         interactor_state.reset();
 
         const auto &navigation = prop_state._navigation;
@@ -143,7 +139,7 @@ struct pointwise_material_interactor : actor {
 
             auto &stepping = prop_state._stepping;
 
-            this->update(geo_context_type{}, stepping.particle_hypothesis(),
+            this->update(prop_state._context, stepping.particle_hypothesis(),
                          stepping.bound_params(), interactor_state,
                          static_cast<int>(navigation.direction()),
                          navigation.get_surface());