merge fct

Sim/Simulation/ISimulation.h

@@ -106,7 +106,7 @@ private:
     //! Normalizes the detector counts to beam intensity, to solid angle, and to exposure angle.
     virtual void normalize(size_t /*start*/, size_t /*n_elements*/) {}
 
-    virtual void addBackgroundIntensity(size_t start, size_t n_elements) = 0;
+    virtual void addBackgroundIntensity(size_t, size_t) {}
 
     virtual void addDataToCache(double weight) = 0;
 

Sim/Simulation/SpecularSimulation.cpp

@@ -54,16 +54,9 @@ void SpecularSimulation::runComputation(const ReSample& re_sample, size_t iEleme
 {
     SpecularElement& ele = *(m_eles.begin() + static_cast<long>(iElement));
     SpecularComputation(re_sample, options(), progress()).run(ele);
-}
 
-void SpecularSimulation::addBackgroundIntensity(size_t start, size_t n_elements)
-{
-    if (!background())
-        return;
-    for (size_t i = start, stop_point = start + n_elements; i < stop_point; ++i) {
-        SpecularElement& element = m_eles[i];
-        element.setIntensity(background()->addBackground(element.intensity()));
-    }
+    if (background())
+        ele.setIntensity(background()->addBackground(ele.intensity()));
 }
 
 void SpecularSimulation::addDataToCache(double weight)

Sim/Simulation/SpecularSimulation.h

@@ -48,8 +48,6 @@ private:
 
     void runComputation(const ReSample& re_sample, size_t iElement) override;
 
-    void addBackgroundIntensity(size_t start_ind, size_t n_elements) override;
-
     void addDataToCache(double weight) override;
 
     //... Overridden getters: