From 58eb1a68f47f5bb64ea5efb08603a0a2a972a50a Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Wed, 8 Dec 2021 14:53:45 +0100
Subject: [PATCH] rename -> m_rotMatrix
---
Sample/Scattering/FormFactorDecoratorRotation.cpp | 14 +++++++-------
Sample/Scattering/FormFactorDecoratorRotation.h | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Sample/Scattering/FormFactorDecoratorRotation.cpp b/Sample/Scattering/FormFactorDecoratorRotation.cpp
index 96402f29399..3c2c157c386 100644
--- a/Sample/Scattering/FormFactorDecoratorRotation.cpp
+++ b/Sample/Scattering/FormFactorDecoratorRotation.cpp
@@ -21,40 +21,40 @@ FormFactorDecoratorRotation::FormFactorDecoratorRotation(const IFormFactor& ff,
const IRotation& rotation)
: IFormFactorDecorator(ff)
{
- m_transform = rotation.getTransform3D();
+ m_rotMatrix = rotation.getTransform3D();
}
FormFactorDecoratorRotation* FormFactorDecoratorRotation::clone() const
{
- return new FormFactorDecoratorRotation(*m_ff, m_transform);
+ return new FormFactorDecoratorRotation(*m_ff, m_rotMatrix);
}
double FormFactorDecoratorRotation::bottomZ(const IRotation* rotation) const
{
Transform3D transform = rotation ? rotation->getTransform3D() : Transform3D();
- std::unique_ptr<IRotation> total_rotation(IRotation::createRotation(transform * m_transform));
+ std::unique_ptr<IRotation> total_rotation(IRotation::createRotation(transform * m_rotMatrix));
return m_ff->bottomZ(total_rotation.get());
}
double FormFactorDecoratorRotation::topZ(const IRotation* rotation) const
{
Transform3D transform = rotation ? rotation->getTransform3D() : Transform3D();
- std::unique_ptr<IRotation> total_rotation(IRotation::createRotation(transform * m_transform));
+ std::unique_ptr<IRotation> total_rotation(IRotation::createRotation(transform * m_rotMatrix));
return m_ff->topZ(total_rotation.get());
}
complex_t FormFactorDecoratorRotation::theFF(const WavevectorInfo& wavevectors) const
{
- return m_ff->theFF(wavevectors.transformed(m_transform.getInverse()));
+ return m_ff->theFF(wavevectors.transformed(m_rotMatrix.getInverse()));
}
Eigen::Matrix2cd FormFactorDecoratorRotation::thePolFF(const WavevectorInfo& wavevectors) const
{
- return m_ff->thePolFF(wavevectors.transformed(m_transform.getInverse()));
+ return m_ff->thePolFF(wavevectors.transformed(m_rotMatrix.getInverse()));
}
FormFactorDecoratorRotation::FormFactorDecoratorRotation(const IFormFactor& ff,
const Transform3D& transform)
- : IFormFactorDecorator(ff), m_transform(transform)
+ : IFormFactorDecorator(ff), m_rotMatrix(transform)
{
}
diff --git a/Sample/Scattering/FormFactorDecoratorRotation.h b/Sample/Scattering/FormFactorDecoratorRotation.h
index df5832188c0..1987745b8cf 100644
--- a/Sample/Scattering/FormFactorDecoratorRotation.h
+++ b/Sample/Scattering/FormFactorDecoratorRotation.h
@@ -47,7 +47,7 @@ public:
#endif
private:
- Transform3D m_transform;
+ Transform3D m_rotMatrix;
//! Private constructor for cloning.
FormFactorDecoratorRotation(const IFormFactor& ff, const Transform3D& transform);
};
--
GitLab