Fluxes: class, not 'using'

Resample/Element/DiffuseElement.cpp

@@ -61,12 +61,12 @@ void DiffuseElement::setFluxes(const Fluxes* fluxes_in, const Fluxes* fluxes_out
 
 const IFlux* DiffuseElement::fluxIn(size_t i_layer) const
 {
-    return (*m_fluxes_in)[i_layer].get();
+    return (*m_fluxes_in)[i_layer];
 }
 
 const IFlux* DiffuseElement::fluxOut(size_t i_layer) const
 {
-    return (*m_fluxes_out)[i_layer].get();
+    return (*m_fluxes_out)[i_layer];
 }
 
 DiffuseElement DiffuseElement::pointElement(double x, double y) const

Resample/Element/DiffuseElement.h

@@ -25,12 +25,11 @@
 #include <memory>
 #include <vector>
 
+class Fluxes;
 class IFlux;
 class IPixel;
 class WavevectorInfo;
 
-using Fluxes = std::vector<std::unique_ptr<const IFlux>>;
-
 //! Data stucture containing both input and output of a single detector cell.
 //! @ingroup simulation
 

Resample/Flux/IFlux.h

@@ -21,8 +21,7 @@
 #define BORNAGAIN_RESAMPLE_FLUX_IFLUX_H
 
 #include "Base/Spin/Spinor.h"
-#include <memory>
-#include <vector>
+#include "Base/Types/OwningVector.h"
 
 //! Interface to access reflection/transmission coefficients.
 //! Realized by ScalarFlux and MatrixFlux.
@@ -45,5 +44,7 @@ public:
     virtual Spinor getKz() const = 0;
 };
 
+class Fluxes : public OwningVector<IFlux> {};
+
 #endif // BORNAGAIN_RESAMPLE_FLUX_IFLUX_H
 #endif // USER_API

Resample/Processed/ReSample.h

@@ -25,14 +25,12 @@
 #include <memory>
 #include <vector>
 
-class IFlux;
+class Fluxes;
 class Material;
 class MultiLayer;
 class reLayout;
 class SimulationOptions;
 
-using Fluxes = std::vector<std::unique_ptr<const IFlux>>;
-
 //! Data structure that contains all the necessary data for scattering calculations.
 //!
 //! If the usage of average materials is requested, layers and particles are sliced into multiple

Resample/Specular/ComputeFluxMagnetic.cpp

@@ -183,7 +183,7 @@ Fluxes Compute::SpecularMagnetic::fluxes(const SliceStack& slices, const R3& k,
 
     Fluxes result;
     for (auto& coeff : computeFlux(slices, kz, slices.roughnessModel(), forward))
-        result.emplace_back(std::make_unique<const MatrixFlux>(coeff));
+        result.emplace_back(new MatrixFlux(coeff));
 
     return result;
 }

Resample/Specular/ComputeFluxMagnetic.h

@@ -21,15 +21,12 @@
 #define BORNAGAIN_RESAMPLE_SPECULAR_COMPUTEFLUXMAGNETIC_H
 
 #include "Base/Spin/SpinMatrix.h"
-#include "Sample/Multilayer/RoughnessModels.h"
 #include <heinz/Complex.h>
 #include <heinz/Vectors3D.h>
-#include <memory>
 #include <vector>
 
-class IFlux;
+class Fluxes;
 class SliceStack;
-using Fluxes = std::vector<std::unique_ptr<const IFlux>>;
 
 //! Methods to compute polarized propagation directions and fluxes as function of slice.
 //!

Resample/Specular/ComputeFluxScalar.cpp

@@ -129,7 +129,7 @@ Fluxes Compute::SpecularScalar::fluxes(const SliceStack& slices, const R3& k)
 
     Fluxes result;
     for (size_t i = 0; i < kz.size(); ++i)
-        result.emplace_back(std::make_unique<const ScalarFlux>(kz[i], TR[i]));
+        result.emplace_back(new ScalarFlux(kz[i], TR[i]));
     return result;
 }
 

Resample/Specular/ComputeFluxScalar.h

@@ -23,12 +23,10 @@
 #include "Sample/Multilayer/RoughnessModels.h"
 #include <heinz/Complex.h>
 #include <heinz/Vectors3D.h>
-#include <memory>
 #include <vector>
 
-class IFlux;
+class Fluxes;
 class SliceStack;
-using Fluxes = std::vector<std::unique_ptr<const IFlux>>;
 
 //! Methods to compute scalar propagation directions and fluxes as function of slice.
 

Sim/Computation/DepthProbeComputation.cpp

@@ -55,7 +55,7 @@ void DepthProbeComputation::runProtected()
             z_layer_top = i_layer ? m_re_sample.sliceTopZ(i_layer) : 0;
 
             // get R & T coefficients for current layer
-            const auto* flux = dynamic_cast<const ScalarFlux*>(fluxes[i_layer].get());
+            const auto* flux = dynamic_cast<const ScalarFlux*>(fluxes[i_layer]);
             ASSERT(flux);
             const complex_t R = flux->getScalarR();
             const complex_t T = flux->getScalarT();

Tests/Unit/Resample/RTTest.cpp

@@ -33,7 +33,7 @@ protected:
     {
         std::vector<ScalarFlux> result;
         for (auto& flux : fluxes)
-            result.push_back(*dynamic_cast<const ScalarFlux*>(flux.get()));
+            result.push_back(*dynamic_cast<const ScalarFlux*>(flux));
         return result;
     }
     const Material air = RefractiveMaterial("Air", 1e-8, 1e-8);

auto/Wrap/doxygenResample.i

@@ -130,6 +130,10 @@ Tells if simulation element corresponds to a specular peak.
 ";
 
 
+// File: classFluxes.xml
+%feature("docstring") Fluxes "";
+
+
 // File: classIFlux.xml
 %feature("docstring") IFlux "