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

ParticleComposition: simplify check

parent a72d7b5b
No related branches found
No related tags found
1 merge request!531cleanup and simplify IParticle and subclasses; rename INode fcts
Pipeline #51725 passed
......@@ -13,6 +13,7 @@
// ************************************************************************************************
#include "Sample/Particle/ParticleComposition.h"
#include "Base/Util/Assert.h"
#include "Sample/Particle/FormFactorWeighted.h"
#include "Sample/Scattering/Rotations.h"
......@@ -62,7 +63,8 @@ SafePointerVector<IParticle> ParticleComposition::decompose() const
ZLimits ParticleComposition::zSpan() const
{
const auto particles = decompose();
ZLimits result = particles[check_index(0)]->zSpan();
ASSERT(particles.size()>0);
ZLimits result = particles[0]->zSpan();
for (const auto& particle : particles)
result = ZLimits::enclosingInterval(result, particle->zSpan());
return result;
......@@ -106,11 +108,3 @@ std::vector<const IParticle*> ParticleComposition::particles() const
result.push_back(P_particle.get());
return result;
}
size_t ParticleComposition::check_index(size_t index) const
{
return index < m_particles.size()
? index
: throw std::runtime_error(
"ParticleComposition::check_index() -> Index is out of bounds");
}
......@@ -47,8 +47,6 @@ public:
std::vector<const IParticle*> particles() const;
private:
size_t check_index(size_t index) const;
std::vector<std::unique_ptr<IParticle>> m_particles;
};
......
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