From 1a2e6c6cf7309aede163b605c2884a57e97be04a Mon Sep 17 00:00:00 2001
From: Walter Van Herck <w.van.herck@fz-juelich.de>
Date: Tue, 9 Jun 2015 16:37:47 +0200
Subject: [PATCH] Mesocrystal: take rotations correctly into account (for outer
shape)
---
Core/Samples/src/MesoCrystal.cpp | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/Core/Samples/src/MesoCrystal.cpp b/Core/Samples/src/MesoCrystal.cpp
index 6afec3166f6..e299abf423f 100644
--- a/Core/Samples/src/MesoCrystal.cpp
+++ b/Core/Samples/src/MesoCrystal.cpp
@@ -84,18 +84,11 @@ const IMaterial *MesoCrystal::getAmbientMaterial() const
IFormFactor* MesoCrystal::createFormFactor(
complex_t wavevector_scattering_factor) const
{
- IFormFactor *p_result;
boost::scoped_ptr<IFormFactor> P_simple_ff(mp_particle_structure->createTotalFormFactor(
*mp_meso_form_factor, *getAmbientMaterial(), wavevector_scattering_factor) );
- if (m_position != kvector_t()) {
- p_result = new FormFactorDecoratorPositionFactor(*P_simple_ff, m_position);
- } else {
- p_result = P_simple_ff->clone();
- }
- return p_result;
+ return createTransformedFormFactor(*P_simple_ff);
}
-void MesoCrystal::applyTransformationToSubParticles(const IRotation& rotation)
+void MesoCrystal::applyTransformationToSubParticles(const IRotation&)
{
- mp_particle_structure->applyRotation(rotation);
}
--
GitLab