rm recently introduced 'mutable's

Sim/Simulation/DepthprobeSimulation.cpp

@@ -197,7 +197,7 @@ size_t DepthprobeSimulation::numberOfElements() const
     return alphaAxis()->size();
 }
 
-SimulationResult DepthprobeSimulation::packResult() const
+SimulationResult DepthprobeSimulation::packResult()
 {
     const size_t N = m_depth_eles.size();
     ASSERT(m_cache.size() == N);

Sim/Simulation/DepthprobeSimulation.h

@@ -87,7 +87,7 @@ private:
     //! Returns the number of elements this simulation needs to calculate
     size_t numberOfElements() const override;
 
-    SimulationResult packResult() const override;
+    SimulationResult packResult() override;
 
     //! Checks the distribution validity for simulation.
     void validateParametrization(const ParameterDistribution& par_distr) const override;
@@ -105,7 +105,7 @@ private:
     //... Caches:
     std::unique_ptr<IAxis> m_alpha_axis;
     std::unique_ptr<IAxis> m_z_axis;
-    mutable std::vector<std::valarray<double>> m_cache;
+    std::vector<std::valarray<double>> m_cache;
     std::vector<DepthprobeElement> m_depth_eles;
 #endif // SWIG
 };

Sim/Simulation/ISimulation.h

@@ -120,7 +120,7 @@ private:
     virtual size_t numberOfElements() const = 0;
 
     //! Returns simulation result, based on intensity held in elements vector.
-    virtual SimulationResult packResult() const = 0;
+    virtual SimulationResult packResult() = 0;
 
     //! Checks the distribution validity for simulation.
     virtual void validateParametrization(const ParameterDistribution&) const {}

Sim/Simulation/OffspecSimulation.cpp

@@ -193,7 +193,7 @@ size_t OffspecSimulation::numberOfElements() const
     return m_active_indices.size() * m_alpha_i_axis->size();
 }
 
-SimulationResult OffspecSimulation::packResult() const
+SimulationResult OffspecSimulation::packResult()
 {
 
     ASSERT(m_eles.size() == m_cache.size());

Sim/Simulation/OffspecSimulation.h

@@ -90,7 +90,7 @@ private:
     //! Returns the number of elements this simulation needs to calculate
     size_t numberOfElements() const override;
 
-    SimulationResult packResult() const override;
+    SimulationResult packResult() override;
 
     //! Checks the distribution validity for simulation.
     void validateParametrization(const ParameterDistribution& par_distr) const override;
@@ -103,8 +103,8 @@ private:
     std::unique_ptr<IDetector> m_detector;
 
     //... Caches:
-    mutable std::vector<double> m_cache;
-    mutable std::vector<DiffuseElement> m_eles;
+    std::vector<double> m_cache;
+    std::vector<DiffuseElement> m_eles;
     std::vector<size_t> m_active_indices; //!< The sequence of bin indices (unmasked, in ROI)
     OwningVector<const IPixel> m_pixels;  //!< All unmasked pixels inside ROI.
     std::unique_ptr<IAxis> m_alpha_i_axis;

Sim/Simulation/ScatteringSimulation.cpp

@@ -175,7 +175,7 @@ size_t ScatteringSimulation::numberOfElements() const
     return m_active_indices.size();
 }
 
-SimulationResult ScatteringSimulation::packResult() const
+SimulationResult ScatteringSimulation::packResult()
 {
     ASSERT(m_eles.size() == m_cache.size());
     for (size_t i = 0; i < m_eles.size(); i++)

Sim/Simulation/ScatteringSimulation.h

@@ -94,7 +94,7 @@ private:
     //! Returns the number of elements this simulation needs to calculate
     size_t numberOfElements() const override;
 
-    SimulationResult packResult() const override;
+    SimulationResult packResult() override;
 
     //... Local function:
     std::vector<DiffuseElement> generateElements(const Beam& beam);
@@ -104,8 +104,8 @@ private:
     std::unique_ptr<IDetector> m_detector;
 
     //... Caches:
-    mutable std::vector<double> m_cache;
-    mutable std::vector<DiffuseElement> m_eles;
+    std::vector<double> m_cache;
+    std::vector<DiffuseElement> m_eles;
     std::vector<size_t> m_active_indices; //!< The sequence of bin indices (unmasked, in ROI)
     OwningVector<const IPixel> m_pixels;  //!< All unmasked pixels inside ROI.
 

Sim/Simulation/SpecularSimulation.cpp

@@ -101,7 +101,7 @@ size_t SpecularSimulation::numberOfElements() const
     return m_scan->nSteps();
 }
 
-SimulationResult SpecularSimulation::packResult() const
+SimulationResult SpecularSimulation::packResult()
 {
     ASSERT(m_eles.size() == m_cache.size());
     for (size_t i = 0; i < m_eles.size(); i++)

Sim/Simulation/SpecularSimulation.h

@@ -64,7 +64,7 @@ private:
     //! Returns the number of elements this simulation needs to calculate
     size_t numberOfElements() const override;
 
-    SimulationResult packResult() const override;
+    SimulationResult packResult() override;
 
     //! Checks the distribution validity for simulation.
     void validateParametrization(const ParameterDistribution& par_distr) const override;
@@ -73,8 +73,8 @@ private:
     std::unique_ptr<const ISpecularScan> m_scan;
 
     //... Caches:
-    mutable std::vector<SpecularElement> m_eles;
-    mutable std::vector<double> m_cache;
+    std::vector<SpecularElement> m_eles;
+    std::vector<double> m_cache;
 #endif // SWIG
 };