Moved createSimulationElementVector to base class

Redmine: #1910

Core/Simulation/GISASSimulation.cpp

@@ -124,11 +124,6 @@ GISASSimulation::GISASSimulation(const GISASSimulation& other)
     initialize();
 }
 
-void GISASSimulation::initSimulationElementVector()
-{
-    m_sim_elements = m_instrument.createSimulationElements();
-}
-
 void GISASSimulation::transferResultsToIntensityMap() {}
 
 void GISASSimulation::updateIntensityMap() {}

Core/Simulation/GISASSimulation.h

@@ -92,9 +92,6 @@ protected:
 private:
     GISASSimulation(const GISASSimulation& other);
 
-    //! Initializes the vector of Simulation elements
-    void initSimulationElementVector() final;
-
     //! Creates the appropriate data structure (e.g. 2D intensity map) from the calculated
     //! SimulationElement objects
     void transferResultsToIntensityMap() final;

Core/Simulation/Simulation.cpp

@@ -208,6 +208,11 @@ void Simulation::addParameterDistribution(const ParameterDistribution& par_distr
     m_distribution_handler.addParameterDistribution(par_distr);
 }
 
+void Simulation::initSimulationElementVector()
+{
+    m_sim_elements = m_instrument.createSimulationElements();
+}
+
 void Simulation::updateSample()
 {
     m_sample_provider.updateSample();

Core/Simulation/Simulation.h

@@ -98,7 +98,8 @@ public:
 protected:
     Simulation(const Simulation& other);
 
-    virtual void initSimulationElementVector() =0;
+    //! Initializes the vector of Simulation elements
+    virtual void initSimulationElementVector();
 
     //! Creates the appropriate data structure (e.g. 2D intensity map) from the calculated
     //! SimulationElement objects

Core/Simulation/SpecularSimulation.h

@@ -90,7 +90,6 @@ private:
     std::unique_ptr<OutputData<double>> getData(size_t i_layer, DataGetter fn_ptr) const;
 
     // unused methods
-    virtual void initSimulationElementVector() override {}
     virtual void transferResultsToIntensityMap() override {}
     virtual void updateIntensityMap() override {}