diff --git a/Base/Vector/RotMatrix.cpp b/Base/Vector/RotMatrix.cpp index 42d27ec6c0af50fb7db148855e2411afe83d7a0a..fd68d7dfe4b038686bd4e48b07172a81b945d77c 100644 --- a/Base/Vector/RotMatrix.cpp +++ b/Base/Vector/RotMatrix.cpp @@ -67,7 +67,7 @@ std::array<double, 3> RotMatrix::zxzEulerAngles() const return {std::atan2(m02, -m12), beta, std::atan2(m20, m21)}; } -RotMatrix RotMatrix::getInverse() const +RotMatrix RotMatrix::Inverse() const { return {-x, -y, -z, s}; } @@ -91,7 +91,7 @@ template C3 RotMatrix::transformed<C3>(const C3& v) const; template <class T> T RotMatrix::transformedInverse(const T& v) const { - return getInverse().transformed(v); + return Inverse().transformed(v); } template R3 RotMatrix::transformedInverse<R3>(const R3& v) const; diff --git a/Base/Vector/RotMatrix.h b/Base/Vector/RotMatrix.h index 9559667362c0f251d5d929b4c9d9f6c80c678280..18300152e4fe066666957654e1a83370642c4068 100644 --- a/Base/Vector/RotMatrix.h +++ b/Base/Vector/RotMatrix.h @@ -46,7 +46,7 @@ public: std::array<double, 3> zxzEulerAngles() const; //! Returns the inverse transformation. - RotMatrix getInverse() const; + RotMatrix Inverse() const; //! Return transformed vector _v_. template <class T> diff --git a/Resample/Particle/ReParticle.cpp b/Resample/Particle/ReParticle.cpp index cfee7e137e5f02417189c1a7abc5ec1ac292273f..307ecfbc6ec92793654d4e48b0da2729cb5e8553 100644 --- a/Resample/Particle/ReParticle.cpp +++ b/Resample/Particle/ReParticle.cpp @@ -100,7 +100,7 @@ complex_t ReParticle::formfactor_at_bottom(C3 q) const complex_t ReParticle::theFF(const WavevectorInfo& wavevectors) const { WavevectorInfo wavevectors2 = - m_rotMatrix ? wavevectors.transformed(m_rotMatrix->getInverse()) : wavevectors; + m_rotMatrix ? wavevectors.transformed(m_rotMatrix->Inverse()) : wavevectors; complex_t result = m_ff->theFF(wavevectors2); if (m_material && m_ambient_material) result = (m_material->scalarSubtrSLD(wavevectors2) @@ -114,7 +114,7 @@ complex_t ReParticle::theFF(const WavevectorInfo& wavevectors) const SpinMatrix ReParticle::thePolFF(const WavevectorInfo& wavevectors) const { WavevectorInfo wavevectors2 = - m_rotMatrix ? wavevectors.transformed(m_rotMatrix->getInverse()) : wavevectors; + m_rotMatrix ? wavevectors.transformed(m_rotMatrix->Inverse()) : wavevectors; SpinMatrix result = m_ff->thePolFF(wavevectors2); if (m_material && m_ambient_material) { // the conjugated linear part of time reversal operator T diff --git a/Sample/Scattering/Rotations.cpp b/Sample/Scattering/Rotations.cpp index 5fb7365459b7d2364d41befa856be373b5de92c1..3d9d1b97e586640badd53ce7552fed0e2b5a91ae 100644 --- a/Sample/Scattering/Rotations.cpp +++ b/Sample/Scattering/Rotations.cpp @@ -166,7 +166,7 @@ RotationEuler::RotationEuler(double alpha, double beta, double gamma) IRotation* RotationEuler::createInverse() const { - RotMatrix inverse_transform(rotMatrix().getInverse()); + RotMatrix inverse_transform(rotMatrix().Inverse()); return createRotation(inverse_transform); } diff --git a/Tests/Unit/Base/RotMatrixTest.cpp b/Tests/Unit/Base/RotMatrixTest.cpp index 7102934fbb67554f3c754b2bfdf68127686e82b1..bfdfda9cdda06d6bd11ce50a78fc2ffed414abda 100644 --- a/Tests/Unit/Base/RotMatrixTest.cpp +++ b/Tests/Unit/Base/RotMatrixTest.cpp @@ -14,7 +14,7 @@ protected: void InversionTest(const RotMatrix& mRot, const R3& a0) { - const RotMatrix mInv = mRot.getInverse(); + const RotMatrix mInv = mRot.Inverse(); const R3 a1 = mRot.transformed(a0); const R3 a2 = mInv.transformed(a1); @@ -47,7 +47,7 @@ TEST_F(RotMatrixTest, RotateZ) EXPECT_NEAR(v.y(), 1.0, epsilon); EXPECT_DOUBLE_EQ(v.z(), 2.0); - const RotMatrix m4 = m3.getInverse(); + const RotMatrix m4 = m3.Inverse(); const R3 w = m4.transformed(v); EXPECT_NEAR(w.x(), a.x(), epsilon);