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

revert insertion of iSlice in ParticleInSlice

parent 9b79ccae
No related branches found
No related tags found
1 merge request!542simplify initialization of ProcessedLayout
...@@ -143,7 +143,6 @@ ProcessedLayout::processParticle(const IParticle& particle, const SliceStack& sl ...@@ -143,7 +143,6 @@ ProcessedLayout::processParticle(const IParticle& particle, const SliceStack& sl
limits = {slice.zBottom() - z1, slice.zTop() - z1}; limits = {slice.zBottom() - z1, slice.zTop() - z1};
} }
ParticleInSlice pis = particle->createParticleInSlice(limits); ParticleInSlice pis = particle->createParticleInSlice(limits);
pis.iSlice = iSlice;
const Material& material = slices.at(iSlice).material(); const Material& material = slices.at(iSlice).material();
const std::unique_ptr<IFormFactor> ff(pis.sliced_ff->clone()); const std::unique_ptr<IFormFactor> ff(pis.sliced_ff->clone());
......
...@@ -63,5 +63,5 @@ ParticleInSlice Particle::createParticleInSlice(const ZLimits& limits) const ...@@ -63,5 +63,5 @@ ParticleInSlice Particle::createParticleInSlice(const ZLimits& limits) const
Material transformed_material( Material transformed_material(
m_rotation ? m_material.rotatedMaterial(m_rotation->getRotMatrix()) : m_material); m_rotation ? m_material.rotatedMaterial(m_rotation->getRotMatrix()) : m_material);
sliced_ff->setMaterial(transformed_material); sliced_ff->setMaterial(transformed_material);
return {0, std::move(sliced_ff), {{{volume, transformed_material}}}}; return {std::move(sliced_ff), {{{volume, transformed_material}}}};
} }
...@@ -31,7 +31,6 @@ ...@@ -31,7 +31,6 @@
//! @ingroup intern //! @ingroup intern
struct ParticleInSlice { struct ParticleInSlice {
size_t iSlice {0};
std::unique_ptr<IFormFactor> sliced_ff; std::unique_ptr<IFormFactor> sliced_ff;
Admixtures admixtures; Admixtures admixtures;
}; };
......
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