Move layout index out of LayerStrategyBuilder constructor

Core/Computation/ParticleLayoutComputation.cpp

@@ -43,8 +43,8 @@ void ParticleLayoutComputation::eval(
     const std::vector<SimulationElement>::iterator& end_it) const
 {
     const std::unique_ptr<const IInterferenceFunctionStrategy> p_strategy {
-        LayerStrategyBuilder(*mp_layer, polarized, options, m_layout_index, mP_specular_info.get()).
-            createStrategy() };
+        LayerStrategyBuilder(*mp_layer, mp_layer->getLayout(m_layout_index), polarized, options,
+                             mP_specular_info.get()).createStrategy() };
     double total_surface_density = mp_layer->getTotalParticleSurfaceDensity(m_layout_index);
 
     DelayedProgressCounter counter(100);

Core/Multilayer/LayerStrategyBuilder.cpp

@@ -28,18 +28,17 @@
 #include "SSCApproximationStrategy.h"
 
 LayerStrategyBuilder::LayerStrategyBuilder(
-    const Layer& decorated_layer, bool polarized,
-    const SimulationOptions& sim_params, size_t layout_index,
-    const LayerSpecularInfo* specular_info)
+    const Layer& decorated_layer, const ILayout* p_layout, bool polarized,
+    const SimulationOptions& sim_params, const LayerSpecularInfo* specular_info)
     : m_sim_params {sim_params}
     , mP_specular_info {nullptr}
+    , mp_layout(p_layout)
     , m_polarized {polarized}
 {
     mP_layer.reset(decorated_layer.clone());
     assert(mP_layer->getNumberOfLayouts() > 0);
     assert(specular_info);
     mP_specular_info.reset(specular_info->clone());
-    mp_layout = mP_layer->getLayout(layout_index);
 }
 
 LayerStrategyBuilder::~LayerStrategyBuilder()

Core/Multilayer/LayerStrategyBuilder.h

@@ -36,9 +36,8 @@ class BA_CORE_API_ LayerStrategyBuilder
 {
 public:
     LayerStrategyBuilder(
-        const Layer& decorated_layer, bool polarized,
-        const SimulationOptions& sim_params, size_t layout_index,
-        const LayerSpecularInfo* specular_info);
+        const Layer& decorated_layer, const ILayout* p_layout, bool polarized,
+        const SimulationOptions& sim_params, const LayerSpecularInfo* specular_info);
 
     ~LayerStrategyBuilder();