From 0ab27b3d1afed7e6e7cd9b06336cd028c4f6f9a5 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Mon, 13 Dec 2021 21:45:58 +0100
Subject: [PATCH] ditto Rotation
---
Sample/Scattering/DecoratedFF.h | 1 -
Sample/Scattering/FormFactorDecoratorRotation.cpp | 2 +-
Sample/Scattering/FormFactorDecoratorRotation.h | 3 ---
3 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/Sample/Scattering/DecoratedFF.h b/Sample/Scattering/DecoratedFF.h
index a0df713a0ba..132bd60faf4 100644
--- a/Sample/Scattering/DecoratedFF.h
+++ b/Sample/Scattering/DecoratedFF.h
@@ -72,7 +72,6 @@ protected:
std::unique_ptr<const Material> m_material;
std::unique_ptr<const Material> m_ambient_material;
std::unique_ptr<const R3> m_position;
-private:
std::unique_ptr<const RotMatrix> m_rotMatrix;
};
diff --git a/Sample/Scattering/FormFactorDecoratorRotation.cpp b/Sample/Scattering/FormFactorDecoratorRotation.cpp
index 005b42b40fc..a93b6697641 100644
--- a/Sample/Scattering/FormFactorDecoratorRotation.cpp
+++ b/Sample/Scattering/FormFactorDecoratorRotation.cpp
@@ -19,7 +19,7 @@
FormFactorDecoratorRotation::FormFactorDecoratorRotation(const IDecoratableBorn& ff,
const RotMatrix& rotMatrix)
- : DecoratedFF(ff), m_rotMatrix(std::make_unique<RotMatrix>(rotMatrix))
+ : DecoratedFF(ff)
{
setRotMatrix(rotMatrix);
}
diff --git a/Sample/Scattering/FormFactorDecoratorRotation.h b/Sample/Scattering/FormFactorDecoratorRotation.h
index a18804dfbca..6f52f90b57a 100644
--- a/Sample/Scattering/FormFactorDecoratorRotation.h
+++ b/Sample/Scattering/FormFactorDecoratorRotation.h
@@ -44,9 +44,6 @@ public:
#ifndef SWIG
Eigen::Matrix2cd thePolFF(const WavevectorInfo& wavevectors) const override;
#endif
-
-private:
- std::unique_ptr<RotMatrix> m_rotMatrix;
};
#endif // BORNAGAIN_SAMPLE_SCATTERING_FORMFACTORDECORATORROTATION_H
--
GitLab