Layer: use OwningVector

Sample/Multilayer/Layer.cpp

@@ -42,8 +42,8 @@ Layer* Layer::clone() const
 std::vector<const INode*> Layer::nodeChildren() const
 {
     std::vector<const INode*> result;
-    for (const auto& layout : m_layouts)
-        result.push_back(layout.get());
+    for (const auto* layout : m_layouts)
+        result.push_back(layout);
     return result;
 }
 
@@ -55,8 +55,8 @@ void Layer::addLayout(const ParticleLayout& layout)
 std::vector<const ParticleLayout*> Layer::layouts() const
 {
     std::vector<const ParticleLayout*> result;
-    for (const auto& layout : m_layouts)
-        result.push_back(layout.get());
+    for (const auto* layout : m_layouts)
+        result.push_back(layout);
     return result;
 }
 

Sample/Multilayer/Layer.h

@@ -16,6 +16,7 @@
 #define BORNAGAIN_SAMPLE_MULTILAYER_LAYER_H
 
 #include "Sample/Material/Material.h"
+#include "Base/Types/OwningVector.h"
 #include "Sample/Scattering/ISampleNode.h"
 
 class ParticleLayout;
@@ -47,10 +48,10 @@ public:
     std::string validate() const override;
 
 private:
-    Material m_material;                                    //!< material
-    R3 m_B_field;                                           //!< cached value of magnetic induction
-    double m_thickness;                                     //!< layer thickness in nanometers
-    std::vector<std::unique_ptr<ParticleLayout>> m_layouts; //!< independent layouts in this layer
+    Material m_material;                    //!< material
+    R3 m_B_field;                           //!< cached value of magnetic induction
+    double m_thickness;                     //!< layer thickness in nanometers
+    OwningVector<ParticleLayout> m_layouts; //!< independent layouts in this layer
     unsigned int m_n_slices = 1; //!< number of slices to create for graded layer approach
 };