Made background classes independent on SimulationElement

Core/Computation/ConstantBackground.cpp

@@ -31,9 +31,9 @@ ConstantBackground* ConstantBackground::clone() const
     return new ConstantBackground(m_background_value);
 }
 
-void ConstantBackground::addBackGround(SimulationElement& element) const
+double ConstantBackground::addBackGround(double intensity) const
 {
-    element.addIntensity(m_background_value);
+    return intensity + m_background_value;
 }
 
 void ConstantBackground::init_parameters()

Core/Computation/ConstantBackground.h

@@ -32,7 +32,7 @@ public:
 
     void accept(INodeVisitor* visitor) const override { visitor->visit(this); }
 
-    void addBackGround(SimulationElement& element) const override final;
+    double addBackGround(double intensity) const override final;
 private:
     void init_parameters();
 

Core/Computation/IBackground.cpp

@@ -15,11 +15,4 @@
 #include "IBackground.h"
 #include "SimulationElement.h"
 
-IBackground::~IBackground() {}
-
-void IBackground::addBackGround(std::vector<SimulationElement>::iterator start,
-                       std::vector<SimulationElement>::iterator end) const
-{
-    for (auto it = start; it != end; it++)
-        addBackGround(*it);
-}
+IBackground::~IBackground() = default;

Core/Computation/IBackground.h

@@ -31,10 +31,7 @@ public:
     virtual ~IBackground();
     virtual IBackground* clone() const =0;
 
-    void addBackGround(std::vector<SimulationElement>::iterator start,
-                       std::vector<SimulationElement>::iterator end) const;
-
-    virtual void addBackGround(SimulationElement& element) const = 0;
+    virtual double addBackGround(double element) const = 0;
 };
 
 #endif // IBACKGROUND_H

Core/Computation/PoissonNoiseBackground.cpp

@@ -28,8 +28,7 @@ PoissonNoiseBackground*PoissonNoiseBackground::clone() const
     return new PoissonNoiseBackground;
 }
 
-void PoissonNoiseBackground::addBackGround(SimulationElement& element) const
+double PoissonNoiseBackground::addBackGround(double intensity) const
 {
-    const double intensity = element.getIntensity();
-    element.setIntensity(MathFunctions::GeneratePoissonRandom(intensity));
+    return MathFunctions::GeneratePoissonRandom(intensity);
 }

Core/Computation/PoissonNoiseBackground.h

@@ -30,7 +30,7 @@ public:
 
     void accept(INodeVisitor* visitor) const override { visitor->visit(this); }
 
-    void addBackGround(SimulationElement& element) const override final;
+    double addBackGround(double intensity) const override final;
 };
 
 #endif // POISSONNOISEBACKGROUND_H

Core/Simulation/Simulation2D.cpp

@@ -91,7 +91,7 @@ void Simulation2D::addBackGroundIntensity(size_t start_ind, size_t n_elements)
         return;
     for (size_t i = start_ind, stop_point = start_ind + n_elements; i < stop_point; ++i) {
         SimulationElement& element = m_sim_elements[i];
-        mP_background->addBackGround(element);
+        element.setIntensity(mP_background->addBackGround(element.getIntensity()));
     }
 }
 

Core/Simulation/SpecularSimulation.cpp

@@ -211,7 +211,7 @@ void SpecularSimulation::addBackGroundIntensity(size_t start_ind, size_t n_eleme
         return;
     for (size_t i = start_ind, stop_point = start_ind + n_elements; i < stop_point; ++i) {
         SimulationElement& element = m_sim_elements[i];
-        mP_background->addBackGround(element);
+        element.setIntensity(mP_background->addBackGround(element.getIntensity()));
     }
 }