Skip to content
Snippets Groups Projects
Commit c688961d authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

correct name -> relayouts

parent 03b9a59c
No related branches found
No related tags found
1 merge request!1275streamline computation of scattering contributions
...@@ -346,12 +346,12 @@ ReSample ReSample::make(const MultiLayer& sample) ...@@ -346,12 +346,12 @@ ReSample ReSample::make(const MultiLayer& sample)
//... //...
ReSample::ReSample(const MultiLayer& sample, bool polarized, std::vector<ReLayout>&& layouts, ReSample::ReSample(const MultiLayer& sample, bool polarized, std::vector<ReLayout>&& relayouts,
const SliceStack& refined_stack, const SliceStack& refined_stack,
OwningVector<const ParticleLayoutContribution>&& re2layouts) OwningVector<const ParticleLayoutContribution>&& re2layouts)
: m_sample(sample) : m_sample(sample)
, m_polarized(polarized) , m_polarized(polarized)
, m_layouts(std::move(layouts)) , m_relayouts(std::move(relayouts))
, m_stack(refined_stack) , m_stack(refined_stack)
, m_re2layouts(std::move(re2layouts)) , m_re2layouts(std::move(re2layouts))
{ {
...@@ -374,9 +374,9 @@ const Slice& ReSample::avgeSlice(size_t i) const ...@@ -374,9 +374,9 @@ const Slice& ReSample::avgeSlice(size_t i) const
return m_stack.at(i); return m_stack.at(i);
} }
const std::vector<ReLayout>& ReSample::layouts() const const std::vector<ReLayout>& ReSample::relayouts() const
{ {
return m_layouts; return m_relayouts;
} }
double ReSample::sliceTopZ(size_t i) const double ReSample::sliceTopZ(size_t i) const
......
...@@ -47,7 +47,7 @@ public: ...@@ -47,7 +47,7 @@ public:
size_t numberOfSlices() const; size_t numberOfSlices() const;
const SliceStack& averageSlices() const; const SliceStack& averageSlices() const;
const Slice& avgeSlice(size_t i) const; const Slice& avgeSlice(size_t i) const;
const std::vector<ReLayout>& layouts() const; const std::vector<ReLayout>& relayouts() const;
double sliceTopZ(size_t i) const; double sliceTopZ(size_t i) const;
double sliceBottomZ(size_t i) const; double sliceBottomZ(size_t i) const;
bool containsMagneticMaterial() const; bool containsMagneticMaterial() const;
...@@ -72,7 +72,7 @@ private: ...@@ -72,7 +72,7 @@ private:
OwningVector<const ParticleLayoutContribution>&& re2layouts); OwningVector<const ParticleLayoutContribution>&& re2layouts);
const MultiLayer& m_sample; const MultiLayer& m_sample;
const bool m_polarized; const bool m_polarized;
std::vector<ReLayout> m_layouts; // const forbidden by move c'tor < needed by tests std::vector<ReLayout> m_relayouts; // const forbidden by move c'tor < needed by tests
const SliceStack m_stack; const SliceStack m_stack;
OwningVector<const ParticleLayoutContribution> m_re2layouts; OwningVector<const ParticleLayoutContribution> m_re2layouts;
}; };
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment