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

rename -> m_rotMatrix

parent 0e51378d
No related branches found
No related tags found
1 merge request!530Rename Transform3D -> RotMatrix
......@@ -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)
{
}
......@@ -47,7 +47,7 @@ public:
#endif
private:
Transform3D m_transform;
Transform3D m_rotMatrix;
//! Private constructor for cloning.
FormFactorDecoratorRotation(const IFormFactor& ff, const Transform3D& transform);
};
......
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