From 810bcf8a1e182c2898f21a62b15934d76f415a27 Mon Sep 17 00:00:00 2001
From: Walter Van Herck <w.van.herck@fz-juelich.de>
Date: Thu, 15 Sep 2016 15:26:00 +0200
Subject: [PATCH] Place override specifier in form factors

---
 Core/HardParticle/FormFactorAnisoPyramid.h    |   8 +-
 Core/HardParticle/FormFactorBox.h             |   9 +-
 Core/HardParticle/FormFactorCone.h            |  10 +-
 Core/HardParticle/FormFactorCone6.h           |   8 +-
 Core/HardParticle/FormFactorCuboctahedron.h   |   8 +-
 Core/HardParticle/FormFactorCylinder.h        |  10 +-
 Core/HardParticle/FormFactorDodecahedron.h    |   9 +-
 .../FormFactorEllipsoidalCylinder.h           |   8 +-
 Core/HardParticle/FormFactorFullSphere.h      |   9 +-
 Core/HardParticle/FormFactorFullSpheroid.h    |   9 +-
 Core/HardParticle/FormFactorHemiEllipsoid.h   |   8 +-
 Core/HardParticle/FormFactorIcosahedron.h     |   9 +-
 Core/HardParticle/FormFactorLongBoxGauss.h    |   8 +-
 Core/HardParticle/FormFactorLongBoxLorentz.h  |   8 +-
 .../HardParticle/FormFactorLongRipple1Gauss.h |  13 +-
 .../FormFactorLongRipple1Lorentz.h            |  13 +-
 .../HardParticle/FormFactorLongRipple2Gauss.h |  14 +-
 .../FormFactorLongRipple2Lorentz.h            |   9 +-
 Core/HardParticle/FormFactorPolyhedron.h      |  17 +-
 Core/HardParticle/FormFactorPrism3.h          |   9 +-
 Core/HardParticle/FormFactorPrism6.h          |  10 +-
 Core/HardParticle/FormFactorPyramid.h         |   8 +-
 Core/HardParticle/FormFactorRipple1.h         |  14 +-
 Core/HardParticle/FormFactorRipple2.cpp       |  60 +-
 Core/HardParticle/FormFactorRipple2.h         |  14 +-
 Core/HardParticle/FormFactorTetrahedron.h     |   8 +-
 Core/HardParticle/FormFactorTriangle.h        |   8 +-
 Core/HardParticle/FormFactorTrivial.h         |   8 +-
 Core/HardParticle/FormFactorTruncatedCube.h   |   8 +-
 .../FormFactorTruncatedSphere.cpp             |   2 -
 Core/HardParticle/FormFactorTruncatedSphere.h |  12 +-
 .../FormFactorTruncatedSpheroid.h             |  14 +-
 Core/SoftParticle/FormFactorGauss.h           |   9 +-
 Core/SoftParticle/FormFactorLorentz.h         |   9 +-
 .../FormFactorSphereGaussianRadius.cpp        |  10 +-
 .../FormFactorSphereGaussianRadius.h          |  12 +-
 .../FormFactorSphereLogNormalRadius.cpp       |  12 +-
 .../FormFactorSphereLogNormalRadius.h         |  12 +-
 .../FormFactorSphereUniformRadius.h           |   8 +-
 auto/Wrap/libBornAgainCore.py                 |  72 +-
 auto/Wrap/libBornAgainCore_wrap.cpp           | 724 +++++++++---------
 41 files changed, 621 insertions(+), 609 deletions(-)

diff --git a/Core/HardParticle/FormFactorAnisoPyramid.h b/Core/HardParticle/FormFactorAnisoPyramid.h
index 4b088db09cb..56a1f7c77dd 100644
--- a/Core/HardParticle/FormFactorAnisoPyramid.h
+++ b/Core/HardParticle/FormFactorAnisoPyramid.h
@@ -26,18 +26,20 @@ class BA_CORE_API_ FormFactorAnisoPyramid : public FormFactorPolyhedron
 public:
     FormFactorAnisoPyramid(double length, double width, double height, double alpha);
 
-    FormFactorAnisoPyramid* clone() const final {
+    FormFactorAnisoPyramid* clone() const override final {
         return new FormFactorAnisoPyramid(m_length, m_width, m_height, m_alpha); }
-    void accept(ISampleVisitor* visitor) const final { visitor->visit(this); }
+    void accept(ISampleVisitor* visitor) const override final { visitor->visit(this); }
 
     double getLength() const { return m_length; }
     double getWidth()  const { return m_width; }
     double getHeight() const { return m_height; }
     double getAlpha()  const { return m_alpha; }
 
+protected:
+    void onChange() override final;
+
 private:
     static const PolyhedralTopology topology;
-    void onChange() final;
 
     double m_length;
     double m_width;
diff --git a/Core/HardParticle/FormFactorBox.h b/Core/HardParticle/FormFactorBox.h
index 4b1b2a43ab7..aa82a3e1eec 100644
--- a/Core/HardParticle/FormFactorBox.h
+++ b/Core/HardParticle/FormFactorBox.h
@@ -26,17 +26,18 @@ class BA_CORE_API_ FormFactorBox : public IFormFactorBorn
 public:
     FormFactorBox( double length, double width, double height);
 
-    FormFactorBox* clone() const { return new FormFactorBox(m_length, m_width, m_height); }
+    FormFactorBox* clone() const override final {
+        return new FormFactorBox(m_length, m_width, m_height); }
 
-    void accept(ISampleVisitor* visitor) const final { visitor->visit(this); }
+    void accept(ISampleVisitor* visitor) const override final { visitor->visit(this); }
 
     double getLength() const { return m_length; }
     double getHeight() const { return m_height; }
     double getWidth() const { return m_width; }
 
-    double getRadialExtension() const final { return m_length/2.0; }
+    double getRadialExtension() const override final { return m_length/2.0; }
 
-    complex_t evaluate_for_q(const cvector_t q) const final;
+    complex_t evaluate_for_q(const cvector_t q) const override final;
 
 private:
     double m_length;
diff --git a/Core/HardParticle/FormFactorCone.h b/Core/HardParticle/FormFactorCone.h
index 18645537181..660f03a1e3e 100644
--- a/Core/HardParticle/FormFactorCone.h
+++ b/Core/HardParticle/FormFactorCone.h
@@ -29,18 +29,18 @@ class BA_CORE_API_ FormFactorCone : public IFormFactorBorn
 {
 public:
     FormFactorCone(double radius, double height,  double alpha);
-    virtual ~FormFactorCone() {}
 
-    FormFactorCone* clone() const { return new FormFactorCone(m_radius, m_height, m_alpha); }
-    void accept(ISampleVisitor* visitor) const final { visitor->visit(this); }
+    FormFactorCone* clone() const override final {
+        return new FormFactorCone(m_radius, m_height, m_alpha); }
+    void accept(ISampleVisitor* visitor) const override final { visitor->visit(this); }
 
     double getHeight() const { return m_height; }
     double getAlpha() const { return m_alpha; }
     double getRadius() const { return m_radius; }
 
-    double getRadialExtension() const final { return m_radius; }
+    double getRadialExtension() const override final { return m_radius; }
 
-    complex_t evaluate_for_q (const cvector_t q) const final;
+    complex_t evaluate_for_q (const cvector_t q) const override final;
 
 private:
     complex_t Integrand(double Z) const;
diff --git a/Core/HardParticle/FormFactorCone6.h b/Core/HardParticle/FormFactorCone6.h
index c183a4dc848..d5b08462581 100644
--- a/Core/HardParticle/FormFactorCone6.h
+++ b/Core/HardParticle/FormFactorCone6.h
@@ -26,17 +26,19 @@ class BA_CORE_API_ FormFactorCone6 : public FormFactorPolyhedron
 public:
     FormFactorCone6(double base_edge, double height,  double alpha);
 
-    virtual FormFactorCone6* clone() const {
+    FormFactorCone6* clone() const override final {
         return new FormFactorCone6(m_base_edge, m_height, m_alpha); }
-    virtual void accept(ISampleVisitor *visitor) const { visitor->visit(this); }
+    void accept(ISampleVisitor *visitor) const override final { visitor->visit(this); }
 
     double getBaseEdge() const { return m_base_edge; }
     double getHeight() const { return m_height; }
     double getAlpha() const { return m_alpha; }
 
+protected:
+    void onChange() override final;
+
 private:
     static const PolyhedralTopology topology;
-    void onChange() final;
     double m_base_edge;
     double m_height;
     double m_alpha;
diff --git a/Core/HardParticle/FormFactorCuboctahedron.h b/Core/HardParticle/FormFactorCuboctahedron.h
index eb3a31c7484..f5d690652cc 100644
--- a/Core/HardParticle/FormFactorCuboctahedron.h
+++ b/Core/HardParticle/FormFactorCuboctahedron.h
@@ -26,18 +26,20 @@ class BA_CORE_API_ FormFactorCuboctahedron : public FormFactorPolyhedron
 public:
     FormFactorCuboctahedron(double length, double height, double height_ratio, double alpha);
 
-    FormFactorCuboctahedron *clone() const final {
+    FormFactorCuboctahedron *clone() const override final {
         return new FormFactorCuboctahedron(m_length, m_height, m_height_ratio, m_alpha); }
-    void accept(ISampleVisitor *visitor) const final { visitor->visit(this); }
+    void accept(ISampleVisitor *visitor) const override final { visitor->visit(this); }
 
     double getLength() const { return m_length; }
     double getHeight() const { return m_height; }
     double getHeightRatio() const { return m_height_ratio; }
     double getAlpha() const { return m_alpha; }
 
+protected:
+    void onChange() override final;
+
 private:
     static const PolyhedralTopology topology;
-    void onChange() final;
 
     double m_length;
     double m_height;
diff --git a/Core/HardParticle/FormFactorCylinder.h b/Core/HardParticle/FormFactorCylinder.h
index 0193f611342..482e516610c 100644
--- a/Core/HardParticle/FormFactorCylinder.h
+++ b/Core/HardParticle/FormFactorCylinder.h
@@ -25,17 +25,17 @@ class BA_CORE_API_ FormFactorCylinder : public IFormFactorBorn
 {
 public:
     FormFactorCylinder(double radius, double height);
-    virtual ~FormFactorCylinder() {}
 
-    FormFactorCylinder* clone() const { return new FormFactorCylinder(m_radius, m_height); }
-    void accept(ISampleVisitor* visitor) const final { visitor->visit(this); }
+    FormFactorCylinder* clone() const override final {
+        return new FormFactorCylinder(m_radius, m_height); }
+    void accept(ISampleVisitor* visitor) const override final { visitor->visit(this); }
 
     double getHeight() const { return m_height; }
     double getRadius() const { return m_radius; }
 
-    double getRadialExtension() const final { return m_radius; }
+    double getRadialExtension() const override final { return m_radius; }
 
-    complex_t evaluate_for_q(const cvector_t q) const final;
+    complex_t evaluate_for_q(const cvector_t q) const override final;
 
 private:
     double m_radius;
diff --git a/Core/HardParticle/FormFactorDodecahedron.h b/Core/HardParticle/FormFactorDodecahedron.h
index 0525080c220..df88a123571 100644
--- a/Core/HardParticle/FormFactorDodecahedron.h
+++ b/Core/HardParticle/FormFactorDodecahedron.h
@@ -28,14 +28,17 @@ public:
     //! @param edge length
     FormFactorDodecahedron(double edge);
 
-    FormFactorDodecahedron *clone() const final { return new FormFactorDodecahedron(m_edge); }
-    void accept(ISampleVisitor *visitor) const final { visitor->visit(this); }
+    FormFactorDodecahedron *clone() const override final {
+        return new FormFactorDodecahedron(m_edge); }
+    void accept(ISampleVisitor *visitor) const override final { visitor->visit(this); }
 
     double getEdge() const { return m_edge; }
 
+protected:
+    void onChange() override final;
+
 private:
     static const PolyhedralTopology topology;
-    void onChange() final;
     double m_edge;
 };
 
diff --git a/Core/HardParticle/FormFactorEllipsoidalCylinder.h b/Core/HardParticle/FormFactorEllipsoidalCylinder.h
index b8c7085004f..7e24803359d 100644
--- a/Core/HardParticle/FormFactorEllipsoidalCylinder.h
+++ b/Core/HardParticle/FormFactorEllipsoidalCylinder.h
@@ -26,17 +26,17 @@ class BA_CORE_API_ FormFactorEllipsoidalCylinder : public IFormFactorBorn
 public:
     FormFactorEllipsoidalCylinder(double radius_x, double radius_y, double height);
 
-    FormFactorEllipsoidalCylinder* clone() const {
+    FormFactorEllipsoidalCylinder* clone() const override final {
         return new FormFactorEllipsoidalCylinder(m_radius_x, m_radius_y, m_height); }
-    void accept(ISampleVisitor* visitor) const final { visitor->visit(this); }
+    void accept(ISampleVisitor* visitor) const override final { visitor->visit(this); }
 
     double getRadiusX() const { return m_radius_x; }
     double getRadiusY() const { return m_radius_y; }
     double getHeight() const { return m_height; }
 
-    double getRadialExtension() const final;
+    double getRadialExtension() const override final;
 
-    complex_t evaluate_for_q(const cvector_t q) const final;
+    complex_t evaluate_for_q(const cvector_t q) const override final;
 
 private:
     double m_radius_x;
diff --git a/Core/HardParticle/FormFactorFullSphere.h b/Core/HardParticle/FormFactorFullSphere.h
index f67a8a90262..b8484d998ae 100644
--- a/Core/HardParticle/FormFactorFullSphere.h
+++ b/Core/HardParticle/FormFactorFullSphere.h
@@ -26,14 +26,15 @@ class BA_CORE_API_ FormFactorFullSphere : public IFormFactorBorn
 public:
     FormFactorFullSphere(double radius);
 
-    FormFactorFullSphere* clone() const{ return new FormFactorFullSphere(m_radius); }
-    void accept(ISampleVisitor* visitor) const final { visitor->visit(this); }
+    FormFactorFullSphere* clone() const override final {
+        return new FormFactorFullSphere(m_radius); }
+    void accept(ISampleVisitor* visitor) const override final { visitor->visit(this); }
 
     double getRadius() const { return m_radius; }
 
-    double getRadialExtension() const final { return m_radius; }
+    double getRadialExtension() const override final { return m_radius; }
 
-    complex_t evaluate_for_q(const cvector_t q) const final;
+    complex_t evaluate_for_q(const cvector_t q) const override final;
 
 private:
     double m_radius;
diff --git a/Core/HardParticle/FormFactorFullSpheroid.h b/Core/HardParticle/FormFactorFullSpheroid.h
index fae208f94ef..45130d5004c 100644
--- a/Core/HardParticle/FormFactorFullSpheroid.h
+++ b/Core/HardParticle/FormFactorFullSpheroid.h
@@ -27,15 +27,16 @@ class BA_CORE_API_ FormFactorFullSpheroid : public IFormFactorBorn
 public:
     FormFactorFullSpheroid(double radius, double height);
 
-    FormFactorFullSpheroid* clone() const { return new FormFactorFullSpheroid(m_radius, m_height); }
-    void accept(ISampleVisitor* visitor) const final { visitor->visit(this); }
+    FormFactorFullSpheroid* clone() const override final {
+        return new FormFactorFullSpheroid(m_radius, m_height); }
+    void accept(ISampleVisitor* visitor) const override final { visitor->visit(this); }
 
     double getHeight() const { return m_height; }
     double getRadius() const { return m_radius; }
 
-    double getRadialExtension() const final { return m_radius; }
+    double getRadialExtension() const override final { return m_radius; }
 
-    complex_t evaluate_for_q(const cvector_t q) const final;
+    complex_t evaluate_for_q(const cvector_t q) const override final;
 
 private:
     complex_t Integrand(double Z) const;
diff --git a/Core/HardParticle/FormFactorHemiEllipsoid.h b/Core/HardParticle/FormFactorHemiEllipsoid.h
index aac1fb313c8..732b77e5621 100644
--- a/Core/HardParticle/FormFactorHemiEllipsoid.h
+++ b/Core/HardParticle/FormFactorHemiEllipsoid.h
@@ -29,17 +29,17 @@ public:
     FormFactorHemiEllipsoid(double radius_x, double radius_y, double height);
     virtual ~FormFactorHemiEllipsoid() {}
 
-    FormFactorHemiEllipsoid* clone() const {
+    FormFactorHemiEllipsoid* clone() const override final {
         return new FormFactorHemiEllipsoid(m_radius_x, m_radius_y, m_height); }
-    void accept(ISampleVisitor *visitor) const final { visitor->visit(this); }
+    void accept(ISampleVisitor *visitor) const override final { visitor->visit(this); }
 
     double getHeight() const { return m_height; }
     double getRadiusX() const { return m_radius_x; }
     double getRadiusY() const { return m_radius_y; }
 
-    double getRadialExtension() const final;
+    double getRadialExtension() const override final;
 
-    complex_t evaluate_for_q (const cvector_t q) const final;
+    complex_t evaluate_for_q (const cvector_t q) const override final;
 
 private:
     complex_t Integrand(double Z) const;
diff --git a/Core/HardParticle/FormFactorIcosahedron.h b/Core/HardParticle/FormFactorIcosahedron.h
index cfc44d2f1c3..2e3272b8118 100644
--- a/Core/HardParticle/FormFactorIcosahedron.h
+++ b/Core/HardParticle/FormFactorIcosahedron.h
@@ -26,14 +26,17 @@ class BA_CORE_API_ FormFactorIcosahedron : public FormFactorPolyhedron
 public:
     FormFactorIcosahedron(double edge);
 
-    FormFactorIcosahedron *clone() const final { return new FormFactorIcosahedron(m_edge); }
-    void accept(ISampleVisitor *visitor) const final { visitor->visit(this); }
+    FormFactorIcosahedron *clone() const override final {
+        return new FormFactorIcosahedron(m_edge); }
+    void accept(ISampleVisitor *visitor) const override final { visitor->visit(this); }
 
     double getEdge() const { return m_edge; }
 
+protected:
+    void onChange() override final;
+
 private:
     static const PolyhedralTopology topology;
-    void onChange() final;
     double m_edge;
 };
 
diff --git a/Core/HardParticle/FormFactorLongBoxGauss.h b/Core/HardParticle/FormFactorLongBoxGauss.h
index c46033f348a..7756ed00891 100644
--- a/Core/HardParticle/FormFactorLongBoxGauss.h
+++ b/Core/HardParticle/FormFactorLongBoxGauss.h
@@ -30,16 +30,16 @@ public:
     //! @param height of Box
     FormFactorLongBoxGauss( double length, double width, double height);
 
-    FormFactorLongBoxGauss *clone() const {
+    FormFactorLongBoxGauss *clone() const override final {
         return new FormFactorLongBoxGauss(m_length, m_width, m_height); }
-    void accept(ISampleVisitor *visitor) const final { visitor->visit(this); }
+    void accept(ISampleVisitor *visitor) const override final { visitor->visit(this); }
 
     double getLength() const { return m_length; }
     double getHeight() const { return m_height; }
     double getWidth() const { return m_width; }
-    double getRadialExtension() const final{ return m_length/2.0; }
+    double getRadialExtension() const override final{ return m_length/2.0; }
 
-    complex_t evaluate_for_q(const cvector_t q) const final;
+    complex_t evaluate_for_q(const cvector_t q) const override final;
 
 private:
     double m_length;
diff --git a/Core/HardParticle/FormFactorLongBoxLorentz.h b/Core/HardParticle/FormFactorLongBoxLorentz.h
index 14ec255fd99..8cc5aa8568a 100644
--- a/Core/HardParticle/FormFactorLongBoxLorentz.h
+++ b/Core/HardParticle/FormFactorLongBoxLorentz.h
@@ -30,17 +30,17 @@ public:
     //! @param height of Box
     FormFactorLongBoxLorentz( double length, double width, double height);
 
-    FormFactorLongBoxLorentz* clone() const {
+    FormFactorLongBoxLorentz* clone() const override final {
         return new FormFactorLongBoxLorentz(m_length, m_width, m_height); }
-    void accept(ISampleVisitor *visitor) const final { visitor->visit(this); }
+    void accept(ISampleVisitor *visitor) const override final { visitor->visit(this); }
 
     double getLength() const { return m_length; }
     double getHeight() const { return m_height; }
     double getWidth() const { return m_width; }
 
-    double getRadialExtension() const final { return m_length/2.0; }
+    double getRadialExtension() const override final { return m_length/2.0; }
 
-    complex_t evaluate_for_q(const cvector_t q) const final;
+    complex_t evaluate_for_q(const cvector_t q) const override final;
 
 private:
     double m_length;
diff --git a/Core/HardParticle/FormFactorLongRipple1Gauss.h b/Core/HardParticle/FormFactorLongRipple1Gauss.h
index 389566f9ea3..020d70df520 100644
--- a/Core/HardParticle/FormFactorLongRipple1Gauss.h
+++ b/Core/HardParticle/FormFactorLongRipple1Gauss.h
@@ -30,25 +30,22 @@ public:
     //! @param width of cosine cross section
     //! @param height of cosine cross section
     FormFactorLongRipple1Gauss(double length, double width, double height);
-    virtual ~FormFactorLongRipple1Gauss() {}
 
-    FormFactorLongRipple1Gauss* clone() const {
+    FormFactorLongRipple1Gauss* clone() const override final {
         return new FormFactorLongRipple1Gauss(m_length, m_width, m_height); }
-    void accept(ISampleVisitor* visitor) const final { visitor->visit(this); }
+    void accept(ISampleVisitor* visitor) const override final { visitor->visit(this); }
 
     double getHeight() const { return m_height; }
     double getWidth() const { return m_width; }
     double getLength() const { return m_length; }
 
-    double getRadialExtension() const final;
+    double getRadialExtension() const override final;
 
-    complex_t evaluate_for_q(const cvector_t q) const final;
-
-protected:
-    virtual bool check_initialization() const;
+    complex_t evaluate_for_q(const cvector_t q) const override final;
 
 private:
     complex_t Integrand(double Z) const;
+    bool check_initialization() const;
 
     double m_length;
     double m_width;
diff --git a/Core/HardParticle/FormFactorLongRipple1Lorentz.h b/Core/HardParticle/FormFactorLongRipple1Lorentz.h
index da7a2fabd0d..c4bdf0ba666 100644
--- a/Core/HardParticle/FormFactorLongRipple1Lorentz.h
+++ b/Core/HardParticle/FormFactorLongRipple1Lorentz.h
@@ -30,25 +30,22 @@ public:
     //! @param width of cosine cross section
     //! @param height of cosine cross section
     FormFactorLongRipple1Lorentz(double length, double width, double height);
-    virtual ~FormFactorLongRipple1Lorentz() {}
 
-    FormFactorLongRipple1Lorentz* clone() const {
+    FormFactorLongRipple1Lorentz* clone() const override final {
         return new FormFactorLongRipple1Lorentz(m_length, m_width, m_height); }
-    void accept(ISampleVisitor* visitor) const final { visitor->visit(this); }
+    void accept(ISampleVisitor* visitor) const override final { visitor->visit(this); }
 
-    double getRadialExtension() const final;
+    double getRadialExtension() const override final;
 
     double getHeight() const { return m_height; }
     double getWidth() const { return m_width; }
     double getLength() const { return m_length; }
 
-    complex_t evaluate_for_q(const cvector_t q) const final;
-
-protected:
-    virtual bool check_initialization() const;
+    complex_t evaluate_for_q(const cvector_t q) const override final;
 
 private:
     complex_t Integrand(double Z) const;
+    bool check_initialization() const;
 
     double m_length;
     double m_width;
diff --git a/Core/HardParticle/FormFactorLongRipple2Gauss.h b/Core/HardParticle/FormFactorLongRipple2Gauss.h
index f6f82d72c3e..13acd7b8980 100644
--- a/Core/HardParticle/FormFactorLongRipple2Gauss.h
+++ b/Core/HardParticle/FormFactorLongRipple2Gauss.h
@@ -31,25 +31,23 @@ public:
     //! @param asymmetry length of triangular cross section
     FormFactorLongRipple2Gauss(double length, double width, double height, double asymmetry);
 
-    virtual ~FormFactorLongRipple2Gauss() {}
 
-    FormFactorLongRipple2Gauss* clone() const {
+    FormFactorLongRipple2Gauss* clone() const override final {
         return new FormFactorLongRipple2Gauss(m_length, m_width, m_height, m_d); }
-    void accept(ISampleVisitor* visitor) const final { visitor->visit(this); }
+    void accept(ISampleVisitor* visitor) const override final { visitor->visit(this); }
 
     double getHeight() const { return m_height; }
     double getWidth() const { return m_width; }
     double getLength() const { return m_length; }
     double getAsymmetry() const { return m_d; }
 
-    double getRadialExtension() const final;
+    double getRadialExtension() const override final;
 
-    complex_t evaluate_for_q(const cvector_t q) const final;
-
-protected:
-    virtual bool check_initialization() const;
+    complex_t evaluate_for_q(const cvector_t q) const override final;
 
 private:
+    bool check_initialization() const;
+
     double m_width;
     double m_height;
     double m_length;
diff --git a/Core/HardParticle/FormFactorLongRipple2Lorentz.h b/Core/HardParticle/FormFactorLongRipple2Lorentz.h
index 72986eed8eb..05810989bb9 100644
--- a/Core/HardParticle/FormFactorLongRipple2Lorentz.h
+++ b/Core/HardParticle/FormFactorLongRipple2Lorentz.h
@@ -25,20 +25,19 @@ class BA_CORE_API_ FormFactorLongRipple2Lorentz : public IFormFactorBorn
 {
 public:
     FormFactorLongRipple2Lorentz(double length, double width, double height, double asymmetry);
-    virtual ~FormFactorLongRipple2Lorentz() {}
 
-    FormFactorLongRipple2Lorentz *clone() const {
+    FormFactorLongRipple2Lorentz *clone() const override final {
         return new FormFactorLongRipple2Lorentz(m_length, m_width, m_height, m_d); }
-    void accept(ISampleVisitor *visitor) const final { visitor->visit(this); }
+    void accept(ISampleVisitor *visitor) const override final { visitor->visit(this); }
 
     double getHeight() const { return m_height; }
     double getWidth() const { return m_width; }
     double getLength() const { return m_length; }
     double getAsymmetry() const { return m_d; }
 
-    double getRadialExtension() const final;
+    double getRadialExtension() const override final;
 
-    complex_t evaluate_for_q(const cvector_t q) const final;
+    complex_t evaluate_for_q(const cvector_t q) const override final;
 
 private:
     void check_parameters() const;
diff --git a/Core/HardParticle/FormFactorPolyhedron.h b/Core/HardParticle/FormFactorPolyhedron.h
index 81934b96cf5..41be20c322d 100644
--- a/Core/HardParticle/FormFactorPolyhedron.h
+++ b/Core/HardParticle/FormFactorPolyhedron.h
@@ -105,12 +105,11 @@ public:
 
     FormFactorPolyhedron() {}
 
-    virtual void onChange() = 0;
-    complex_t evaluate_for_q(const cvector_t q) const final;
+    complex_t evaluate_for_q(const cvector_t q) const override final;
     complex_t evaluate_centered(const cvector_t q) const;
 
-    double getVolume() const final { return m_volume; }
-    double getRadialExtension() const final { return m_radius; }
+    double getVolume() const override final { return m_volume; }
+    double getRadialExtension() const override final { return m_radius; }
     void assert_platonic() const;
 
 protected:
@@ -136,10 +135,10 @@ class BA_CORE_API_ FormFactorPolygonalPrism : public IFormFactorBorn {
 public:
     FormFactorPolygonalPrism(const double height) : m_height(height) {}
 
-    complex_t evaluate_for_q(const cvector_t q) const final;
+    complex_t evaluate_for_q(const cvector_t q) const override final;
     double getVolume() const;
     double getHeight() const { return m_height; }
-    double getRadialExtension() const final { return std::sqrt(m_base->area()); }
+    double getRadialExtension() const override final { return std::sqrt(m_base->area()); }
 
 protected:
     std::unique_ptr<PolyhedralFace> m_base;
@@ -154,9 +153,9 @@ class FormFactorPolygonalSurface : public IFormFactorBorn {
 public:
     FormFactorPolygonalSurface() {}
 
-    complex_t evaluate_for_q(const cvector_t q) const final;
-    double getVolume() const { return 0; }
-    double getRadialExtension() const final { return std::sqrt(m_base->area()); }
+    complex_t evaluate_for_q(const cvector_t q) const override final;
+    double getVolume() const override { return 0; }
+    double getRadialExtension() const override final { return std::sqrt(m_base->area()); }
 
 protected:
     std::unique_ptr<PolyhedralFace> m_base;
diff --git a/Core/HardParticle/FormFactorPrism3.h b/Core/HardParticle/FormFactorPrism3.h
index fd706978148..b119ce69417 100644
--- a/Core/HardParticle/FormFactorPrism3.h
+++ b/Core/HardParticle/FormFactorPrism3.h
@@ -25,13 +25,16 @@ class BA_CORE_API_ FormFactorPrism3 : public FormFactorPolygonalPrism
 public:
     FormFactorPrism3(const double base_edge, const double height);
 
-    virtual FormFactorPrism3 *clone() const { return new FormFactorPrism3(m_base_edge, m_height); }
-    virtual void accept(ISampleVisitor *visitor) const { visitor->visit(this); }
+    FormFactorPrism3 *clone() const override final {
+        return new FormFactorPrism3(m_base_edge, m_height); }
+    void accept(ISampleVisitor *visitor) const override final { visitor->visit(this); }
 
     double getBaseEdge() const { return m_base_edge; }
 
+protected:
+    void onChange() override final;
+
 private:
-    void onChange() final;
     double m_base_edge;
 };
 
diff --git a/Core/HardParticle/FormFactorPrism6.h b/Core/HardParticle/FormFactorPrism6.h
index 24b02269b9d..b46071a05b8 100644
--- a/Core/HardParticle/FormFactorPrism6.h
+++ b/Core/HardParticle/FormFactorPrism6.h
@@ -25,14 +25,16 @@ class BA_CORE_API_ FormFactorPrism6 : public FormFactorPolygonalPrism
 public:
     FormFactorPrism6(const double base_edge, const double height);
 
-    virtual FormFactorPrism6 *clone() const {
+    FormFactorPrism6 *clone() const override final {
         return new FormFactorPrism6(m_base_edge, m_height); }
-    virtual void accept(ISampleVisitor *visitor) const { visitor->visit(this); }
+    void accept(ISampleVisitor *visitor) const override final { visitor->visit(this); }
 
-    virtual double getBaseEdge() const { return m_base_edge; }
+    double getBaseEdge() const { return m_base_edge; }
+
+protected:
+    void onChange() override final;
 
 private:
-    void onChange() final;
     double m_base_edge;
 };
 
diff --git a/Core/HardParticle/FormFactorPyramid.h b/Core/HardParticle/FormFactorPyramid.h
index bed38befdd8..9ece0f1947a 100644
--- a/Core/HardParticle/FormFactorPyramid.h
+++ b/Core/HardParticle/FormFactorPyramid.h
@@ -26,17 +26,19 @@ class BA_CORE_API_ FormFactorPyramid : public FormFactorPolyhedron
 public:
     FormFactorPyramid(double base_edge, double height, double alpha);
 
-    FormFactorPyramid* clone() const final {
+    FormFactorPyramid* clone() const override final {
         return new FormFactorPyramid(m_base_edge, m_height, m_alpha); }
-    void accept(ISampleVisitor *visitor) const final { visitor->visit(this); }
+    void accept(ISampleVisitor *visitor) const override final { visitor->visit(this); }
 
     double getHeight() const { return m_height; }
     double getBaseEdge() const { return m_base_edge; }
     double getAlpha() const { return m_alpha; }
 
+protected:
+    void onChange() override final;
+
 private:
     static const PolyhedralTopology topology;
-    void onChange() final;
 
     double m_base_edge;
     double m_height;
diff --git a/Core/HardParticle/FormFactorRipple1.h b/Core/HardParticle/FormFactorRipple1.h
index a42b99606c1..bcfc54dc3c8 100644
--- a/Core/HardParticle/FormFactorRipple1.h
+++ b/Core/HardParticle/FormFactorRipple1.h
@@ -30,24 +30,22 @@ public:
     //! @param width of cosine cross section
     //! @param height of cosine cross section
     FormFactorRipple1(double length, double width, double height);
-    virtual ~FormFactorRipple1() {}
 
-    FormFactorRipple1* clone() const { return new FormFactorRipple1(m_length, m_width, m_height); }
-    void accept(ISampleVisitor* visitor) const final { visitor->visit(this); }
+    FormFactorRipple1* clone() const override final {
+        return new FormFactorRipple1(m_length, m_width, m_height); }
+    void accept(ISampleVisitor* visitor) const override final { visitor->visit(this); }
 
     double getLength() const { return m_length; }
     double getHeight() const { return m_height; }
     double getWidth() const { return m_width; }
 
-    double getRadialExtension() const final;
+    double getRadialExtension() const override final;
 
-    complex_t evaluate_for_q(const cvector_t q) const final;
-
-protected:
-    virtual bool check_initialization() const;
+    complex_t evaluate_for_q(const cvector_t q) const override final;
 
 private:
     complex_t Integrand(double u) const;
+    bool check_initialization() const;
 
     double m_length;
     double m_width;
diff --git a/Core/HardParticle/FormFactorRipple2.cpp b/Core/HardParticle/FormFactorRipple2.cpp
index 06ee2d6430d..72a9e61c8b8 100644
--- a/Core/HardParticle/FormFactorRipple2.cpp
+++ b/Core/HardParticle/FormFactorRipple2.cpp
@@ -30,36 +30,6 @@ FormFactorRipple2::FormFactorRipple2(double length, double width, double height,
     registerParameter(BornAgain::AsymmetryLength, &m_d).setUnit("nm");
 }
 
-bool FormFactorRipple2::check_initialization() const
-{
-    bool result(true);
-    std::string message;
-    if(-1*m_width > 2.*m_d) {
-        result = false;
-        message = std::string("Check for '-1*width <= 2.*asymmetry' failed.");
-    }
-    if(m_width < 2.*m_d) {
-        result = false;
-        message = std::string("Check for 'width >= 2.*asymmetry' failed.");
-    }
-    if(m_height <=0) {
-        result = false;
-        message = std::string("Check for 'height > 0' failed.");
-    }
-
-    if(!result) {
-        std::ostringstream ostr;
-        ostr << "FormFactorRipple2() -> Error in class initialization with parameters ";
-        ostr << " width:" << m_width;
-        ostr << " height:" << m_height;
-        ostr << " length:" << m_length;
-        ostr << " asymmetry:" << m_d << "\n\n";
-        ostr << message;
-        throw Exceptions::ClassInitializationException(ostr.str());
-    }
-    return result;
-}
-
 double FormFactorRipple2::getRadialExtension() const
 {
     return ( m_width + m_length ) / 4.0;
@@ -95,3 +65,33 @@ complex_t FormFactorRipple2::evaluate_for_q(const cvector_t q) const
     }
     return factor * result;
 }
+
+bool FormFactorRipple2::check_initialization() const
+{
+    bool result(true);
+    std::string message;
+    if(-1*m_width > 2.*m_d) {
+        result = false;
+        message = std::string("Check for '-1*width <= 2.*asymmetry' failed.");
+    }
+    if(m_width < 2.*m_d) {
+        result = false;
+        message = std::string("Check for 'width >= 2.*asymmetry' failed.");
+    }
+    if(m_height <=0) {
+        result = false;
+        message = std::string("Check for 'height > 0' failed.");
+    }
+
+    if(!result) {
+        std::ostringstream ostr;
+        ostr << "FormFactorRipple2() -> Error in class initialization with parameters ";
+        ostr << " width:" << m_width;
+        ostr << " height:" << m_height;
+        ostr << " length:" << m_length;
+        ostr << " asymmetry:" << m_d << "\n\n";
+        ostr << message;
+        throw Exceptions::ClassInitializationException(ostr.str());
+    }
+    return result;
+}
diff --git a/Core/HardParticle/FormFactorRipple2.h b/Core/HardParticle/FormFactorRipple2.h
index 3c6a022b0c3..98314f1636f 100644
--- a/Core/HardParticle/FormFactorRipple2.h
+++ b/Core/HardParticle/FormFactorRipple2.h
@@ -31,25 +31,21 @@ public:
     //! @param asymmetry length of triangular cross section
     FormFactorRipple2(double length, double width, double height, double asymmetry);
 
-    virtual ~FormFactorRipple2() { }
-
-    FormFactorRipple2 *clone() const{
+    FormFactorRipple2 *clone() const override final {
         return new FormFactorRipple2(m_length, m_width, m_height, m_d); }
-    void accept(ISampleVisitor *visitor) const final { visitor->visit(this); }
+    void accept(ISampleVisitor *visitor) const override final { visitor->visit(this); }
 
     double getHeight() const { return m_height; }
     double getWidth() const { return m_width; }
     double getLength() const { return m_length; }
     double getAsymmetry() const { return m_d; }
 
-    double getRadialExtension() const final;
-
-    complex_t evaluate_for_q(const cvector_t q) const final;
+    double getRadialExtension() const override final;
 
-protected:
-    virtual bool check_initialization() const;
+    complex_t evaluate_for_q(const cvector_t q) const override final;
 
 private:
+    bool check_initialization() const;
     double m_length;
     double m_width;
     double m_height;
diff --git a/Core/HardParticle/FormFactorTetrahedron.h b/Core/HardParticle/FormFactorTetrahedron.h
index c8887742bdc..51215d6ecb8 100644
--- a/Core/HardParticle/FormFactorTetrahedron.h
+++ b/Core/HardParticle/FormFactorTetrahedron.h
@@ -26,17 +26,19 @@ class BA_CORE_API_ FormFactorTetrahedron : public FormFactorPolyhedron
 public:
     FormFactorTetrahedron(double base_edge, double height, double alpha);
 
-    virtual FormFactorTetrahedron *clone() const {
+    FormFactorTetrahedron *clone() const override final {
         return new FormFactorTetrahedron(m_base_edge, m_height, m_alpha); }
-    virtual void accept(ISampleVisitor *visitor) const { visitor->visit(this); }
+    void accept(ISampleVisitor *visitor) const override final { visitor->visit(this); }
 
     double getBaseEdge() const { return m_base_edge; }
     double getHeight() const { return m_height; }
     double getAlpha() const { return m_alpha; }
 
+protected:
+    void onChange() override final;
+
 private:
     static const PolyhedralTopology topology;
-    void onChange() final;
     double m_base_edge;
     double m_height;
     double m_alpha;
diff --git a/Core/HardParticle/FormFactorTriangle.h b/Core/HardParticle/FormFactorTriangle.h
index e3b2fd12578..a84ce2ddfed 100644
--- a/Core/HardParticle/FormFactorTriangle.h
+++ b/Core/HardParticle/FormFactorTriangle.h
@@ -24,13 +24,15 @@ class BA_CORE_API_ FormFactorTriangle : public FormFactorPolygonalSurface
 public:
     FormFactorTriangle(const double base_edge);
 
-    virtual FormFactorTriangle* clone() const { return new FormFactorTriangle(m_base_edge); }
-    virtual void accept(ISampleVisitor* visitor) const { visitor->visit(this); }
+    FormFactorTriangle* clone() const override final { return new FormFactorTriangle(m_base_edge); }
+    void accept(ISampleVisitor* visitor) const override final { visitor->visit(this); }
 
     double getBaseEdge() const { return m_base_edge; }
 
+protected:
+    void onChange() override final;
+
 private:
-    void onChange() final;
     double m_base_edge;
 };
 
diff --git a/Core/HardParticle/FormFactorTrivial.h b/Core/HardParticle/FormFactorTrivial.h
index 2d1216f9084..8a31f7917b2 100644
--- a/Core/HardParticle/FormFactorTrivial.h
+++ b/Core/HardParticle/FormFactorTrivial.h
@@ -26,13 +26,13 @@ class BA_CORE_API_ FormFactorTrivial : public IFormFactorBorn
 public:
     FormFactorTrivial();
 
-    FormFactorTrivial* clone() const { return new FormFactorTrivial(); }
+    FormFactorTrivial* clone() const override final { return new FormFactorTrivial(); }
 
-    void accept(ISampleVisitor* visitor) const final { visitor->visit(this); }
+    void accept(ISampleVisitor* visitor) const override final { visitor->visit(this); }
 
-    double getRadialExtension() const final { return 0; }
+    double getRadialExtension() const override final { return 0; }
 
-    complex_t evaluate_for_q(const cvector_t) const final { return 1; }
+    complex_t evaluate_for_q(const cvector_t) const override final { return 1; }
 };
 
 #endif // FORMFACTORTRIVIAL_H
diff --git a/Core/HardParticle/FormFactorTruncatedCube.h b/Core/HardParticle/FormFactorTruncatedCube.h
index 99319c0ca87..a5048daf635 100644
--- a/Core/HardParticle/FormFactorTruncatedCube.h
+++ b/Core/HardParticle/FormFactorTruncatedCube.h
@@ -26,16 +26,18 @@ class BA_CORE_API_ FormFactorTruncatedCube : public FormFactorPolyhedron
 public:
     FormFactorTruncatedCube(double length, double removed_length);
 
-    FormFactorTruncatedCube*clone() const final {
+    FormFactorTruncatedCube*clone() const override final {
         return new FormFactorTruncatedCube(m_length, m_removed_length); }
-    void accept(ISampleVisitor*visitor) const final { visitor->visit(this); }
+    void accept(ISampleVisitor*visitor) const override final { visitor->visit(this); }
 
     double getLength() const { return m_length; }
     double getRemovedLength() const { return m_removed_length; }
 
+protected:
+    void onChange() override final;
+
 private:
     static const PolyhedralTopology topology;
-    void onChange() final;
     double m_length;
     double m_removed_length;
 };
diff --git a/Core/HardParticle/FormFactorTruncatedSphere.cpp b/Core/HardParticle/FormFactorTruncatedSphere.cpp
index 97e5dad665d..9937f791467 100644
--- a/Core/HardParticle/FormFactorTruncatedSphere.cpp
+++ b/Core/HardParticle/FormFactorTruncatedSphere.cpp
@@ -34,8 +34,6 @@ FormFactorTruncatedSphere::FormFactorTruncatedSphere(double radius, double heigh
     mP_integrator = make_integrator_complex(this, &FormFactorTruncatedSphere::Integrand);
 }
 
-FormFactorTruncatedSphere::~FormFactorTruncatedSphere() {}
-
 bool FormFactorTruncatedSphere::check_initialization() const
 {
     bool result(true);
diff --git a/Core/HardParticle/FormFactorTruncatedSphere.h b/Core/HardParticle/FormFactorTruncatedSphere.h
index f34aac4f94d..658fe2e4e51 100644
--- a/Core/HardParticle/FormFactorTruncatedSphere.h
+++ b/Core/HardParticle/FormFactorTruncatedSphere.h
@@ -26,22 +26,20 @@ class BA_CORE_API_ FormFactorTruncatedSphere : public IFormFactorBorn
 {
 public:
     FormFactorTruncatedSphere(double radius, double height);
-    virtual ~FormFactorTruncatedSphere();
 
-    FormFactorTruncatedSphere *clone() const {
+    FormFactorTruncatedSphere *clone() const override final {
         return new FormFactorTruncatedSphere(m_radius, m_height); }
-    void accept(ISampleVisitor *visitor) const final { visitor->visit(this); }
+    void accept(ISampleVisitor *visitor) const override final { visitor->visit(this); }
 
     double getHeight() const { return m_height; }
     double getRadius() const { return m_radius; }
 
-    double getRadialExtension() const final { return m_radius; }
+    double getRadialExtension() const override final { return m_radius; }
 
-protected:
-    virtual bool check_initialization() const;
-    virtual complex_t evaluate_for_q(const cvector_t q) const;
+    complex_t evaluate_for_q(const cvector_t q) const override final;
 
 private:
+    bool check_initialization() const;
     complex_t Integrand(double Z) const;
 
     double m_radius;
diff --git a/Core/HardParticle/FormFactorTruncatedSpheroid.h b/Core/HardParticle/FormFactorTruncatedSpheroid.h
index 5654a1d2cd8..bf03b07d5d6 100644
--- a/Core/HardParticle/FormFactorTruncatedSpheroid.h
+++ b/Core/HardParticle/FormFactorTruncatedSpheroid.h
@@ -27,25 +27,21 @@ class BA_CORE_API_ FormFactorTruncatedSpheroid : public IFormFactorBorn
 {
 public:
     FormFactorTruncatedSpheroid(double radius, double height, double height_flattening);
-    virtual ~FormFactorTruncatedSpheroid() {}
 
-    FormFactorTruncatedSpheroid* clone() const {
+    FormFactorTruncatedSpheroid* clone() const override final {
         return new FormFactorTruncatedSpheroid(m_radius, m_height, m_height_flattening); }
-    void accept(ISampleVisitor* visitor) const final { visitor->visit(this); }
+    void accept(ISampleVisitor* visitor) const override final { visitor->visit(this); }
 
     double getRadius() const { return m_radius; }
     double getHeight() const { return m_height; }
     double getHeightFlattening() const { return m_height_flattening; }
 
-    double getRadialExtension() const final { return m_radius; }
+    double getRadialExtension() const override final { return m_radius; }
 
-    complex_t evaluate_for_q(const cvector_t q) const final;
-
-protected:
-    virtual bool check_initialization() const;
+    complex_t evaluate_for_q(const cvector_t q) const override final;
 
 private:
-
+    bool check_initialization() const;
     complex_t Integrand(double Z) const;
 
     double m_radius;
diff --git a/Core/SoftParticle/FormFactorGauss.h b/Core/SoftParticle/FormFactorGauss.h
index cdc5803ab5f..5b948bd32dd 100644
--- a/Core/SoftParticle/FormFactorGauss.h
+++ b/Core/SoftParticle/FormFactorGauss.h
@@ -27,15 +27,16 @@ public:
     FormFactorGauss(double volume);
     FormFactorGauss(double width, double height);
 
-    FormFactorGauss* clone() const final { return new FormFactorGauss(m_width, m_height); }
-    void accept(ISampleVisitor* visitor) const final { visitor->visit(this); }
+    FormFactorGauss* clone() const override final {
+        return new FormFactorGauss(m_width, m_height); }
+    void accept(ISampleVisitor* visitor) const override final { visitor->visit(this); }
 
     double getWidth() const { return m_width; }
     double getHeight() const { return m_height; }
 
-    double getRadialExtension() const final { return m_width; }
+    double getRadialExtension() const override final { return m_width; }
 
-    complex_t evaluate_for_q(const cvector_t q) const final;
+    complex_t evaluate_for_q(const cvector_t q) const override final;
 
 private:
     double m_width;
diff --git a/Core/SoftParticle/FormFactorLorentz.h b/Core/SoftParticle/FormFactorLorentz.h
index 71deb786d95..cd45c711677 100644
--- a/Core/SoftParticle/FormFactorLorentz.h
+++ b/Core/SoftParticle/FormFactorLorentz.h
@@ -27,15 +27,16 @@ public:
     FormFactorLorentz(double volume);
     FormFactorLorentz(double width, double height);
 
-    FormFactorLorentz* clone() const final { return new FormFactorLorentz(m_width, m_height); }
-    void accept(ISampleVisitor* visitor) const final { visitor->visit(this); }
+    FormFactorLorentz* clone() const override final {
+        return new FormFactorLorentz(m_width, m_height); }
+    void accept(ISampleVisitor* visitor) const override final { visitor->visit(this); }
 
     double getWidth() const { return m_width; }
     double getHeight() const { return m_height; }
 
-    double getRadialExtension() const final;
+    double getRadialExtension() const override final;
 
-    complex_t evaluate_for_q(const cvector_t q) const final;
+    complex_t evaluate_for_q(const cvector_t q) const override final;
 
 private:
     double m_width;
diff --git a/Core/SoftParticle/FormFactorSphereGaussianRadius.cpp b/Core/SoftParticle/FormFactorSphereGaussianRadius.cpp
index dd87bb7580b..3b54d77d243 100644
--- a/Core/SoftParticle/FormFactorSphereGaussianRadius.cpp
+++ b/Core/SoftParticle/FormFactorSphereGaussianRadius.cpp
@@ -24,25 +24,19 @@ FormFactorSphereGaussianRadius::FormFactorSphereGaussianRadius(double mean, doub
 : m_mean(mean)
 , m_sigma(sigma)
 , m_mean_r3(0.0)
-, p_ff_sphere(0)
 {
     setName(FormFactorSphereGaussianRadiusType);
     m_mean_r3 = calculateMeanR3();
-    p_ff_sphere = new FormFactorFullSphere(m_mean_r3);
+    P_ff_sphere.reset(new FormFactorFullSphere(m_mean_r3));
     registerParameter(BornAgain::MeanRadius, &m_mean).setUnit("nm").setNonnegative();
     registerParameter(BornAgain::SigmaRadius, &m_sigma).setUnit("nm").setNonnegative();
 }
 
-FormFactorSphereGaussianRadius::~FormFactorSphereGaussianRadius()
-{
-    delete p_ff_sphere;
-}
-
 complex_t FormFactorSphereGaussianRadius::evaluate_for_q(const cvector_t q) const
 {
     double q2 = std::norm(q.x()) + std::norm(q.y()) + std::norm(q.z());
     double dw = std::exp(-q2*m_sigma*m_sigma/2.0);
-    return dw*p_ff_sphere->evaluate_for_q(q);
+    return dw*P_ff_sphere->evaluate_for_q(q);
 }
 
 double FormFactorSphereGaussianRadius::calculateMeanR3() const
diff --git a/Core/SoftParticle/FormFactorSphereGaussianRadius.h b/Core/SoftParticle/FormFactorSphereGaussianRadius.h
index c47afb146b9..86c9d7c6103 100644
--- a/Core/SoftParticle/FormFactorSphereGaussianRadius.h
+++ b/Core/SoftParticle/FormFactorSphereGaussianRadius.h
@@ -17,6 +17,7 @@
 #define FORMFACTORSPHEREGAUSSIANRADIUS_H
 
 #include "FormFactorFullSphere.h"
+#include <memory>
 
 //! A sphere with gaussian radius distribution.
 //! @ingroup softParticle
@@ -25,16 +26,15 @@ class BA_CORE_API_ FormFactorSphereGaussianRadius : public IFormFactorBorn
 {
 public:
     FormFactorSphereGaussianRadius(double mean, double sigma);
-    virtual ~FormFactorSphereGaussianRadius();
 
-    FormFactorSphereGaussianRadius* clone() const final {
+    FormFactorSphereGaussianRadius* clone() const override final {
         return new FormFactorSphereGaussianRadius(m_mean, m_sigma); }
 
-    void accept(ISampleVisitor* visitor) const final { visitor->visit(this); }
+    void accept(ISampleVisitor* visitor) const override final { visitor->visit(this); }
 
-    double getRadialExtension() const final { return m_mean; }
+    double getRadialExtension() const override final { return m_mean; }
 
-    complex_t evaluate_for_q(const cvector_t q) const final;
+    complex_t evaluate_for_q(const cvector_t q) const override final;
 
 private:
     double calculateMeanR3() const;
@@ -42,7 +42,7 @@ private:
     double m_mean; //!< This is the mean radius
     double m_sigma;
     double m_mean_r3; //!< This is the radius that gives the mean volume
-    FormFactorFullSphere* p_ff_sphere;
+    std::unique_ptr<FormFactorFullSphere> P_ff_sphere;
 };
 
 #endif // FORMFACTORSPHEREGAUSSIANRADIUS_H
diff --git a/Core/SoftParticle/FormFactorSphereLogNormalRadius.cpp b/Core/SoftParticle/FormFactorSphereLogNormalRadius.cpp
index 00400127c7f..71529a0c623 100644
--- a/Core/SoftParticle/FormFactorSphereLogNormalRadius.cpp
+++ b/Core/SoftParticle/FormFactorSphereLogNormalRadius.cpp
@@ -23,17 +23,16 @@ FormFactorSphereLogNormalRadius::FormFactorSphereLogNormalRadius(
     : m_mean(mean)
     , m_scale_param(scale_param)
     , m_n_samples(n_samples)
-    , mp_distribution(0)
 {
     setName(BornAgain::FormFactorSphereLogNormalRadiusType);
-    mp_distribution = new DistributionLogNormal(mean, scale_param);
+    mP_distribution.reset(new DistributionLogNormal(mean, scale_param));
     registerParameter(BornAgain::MeanRadius, &m_mean).setUnit("nm").setNonnegative();
     registerParameter(BornAgain::ScaleParameter, &m_scale_param);
-    if (!mp_distribution) return;
+    if (!mP_distribution) return;
     // Init vectors:
     m_form_factors.clear();
     m_probabilities.clear();
-    std::vector<ParameterSample> samples = mp_distribution->generateSamples(m_n_samples);
+    std::vector<ParameterSample> samples = mP_distribution->generateSamples(m_n_samples);
     for (size_t i=0; i<samples.size(); ++i) {
         double radius = samples[i].value;
         m_form_factors.push_back(new FormFactorFullSphere(radius));
@@ -41,11 +40,6 @@ FormFactorSphereLogNormalRadius::FormFactorSphereLogNormalRadius(
     }
 }
 
-FormFactorSphereLogNormalRadius::~FormFactorSphereLogNormalRadius()
-{
-    delete mp_distribution;
-}
-
 complex_t FormFactorSphereLogNormalRadius::evaluate_for_q(const cvector_t q) const
 {
     if (m_form_factors.size()<1)
diff --git a/Core/SoftParticle/FormFactorSphereLogNormalRadius.h b/Core/SoftParticle/FormFactorSphereLogNormalRadius.h
index 493bd337651..6b1b15b93e1 100644
--- a/Core/SoftParticle/FormFactorSphereLogNormalRadius.h
+++ b/Core/SoftParticle/FormFactorSphereLogNormalRadius.h
@@ -18,6 +18,7 @@
 
 #include "FormFactorFullSphere.h"
 #include "SafePointerVector.h"
+#include <memory>
 
 class DistributionLogNormal;
 
@@ -28,22 +29,21 @@ class BA_CORE_API_ FormFactorSphereLogNormalRadius : public IFormFactorBorn
 {
 public:
     FormFactorSphereLogNormalRadius(double mean, double scale_param, size_t n_samples);
-    ~FormFactorSphereLogNormalRadius() final;
 
-    FormFactorSphereLogNormalRadius* clone() const final {
+    FormFactorSphereLogNormalRadius* clone() const override final {
         return new FormFactorSphereLogNormalRadius(m_mean, m_scale_param, m_n_samples); }
-    void accept(ISampleVisitor* visitor) const final { visitor->visit(this); }
+    void accept(ISampleVisitor* visitor) const override final { visitor->visit(this); }
 
-    double getRadialExtension() const final { return m_mean; }
+    double getRadialExtension() const override final { return m_mean; }
 
-    complex_t evaluate_for_q(const cvector_t q) const final;
+    complex_t evaluate_for_q(const cvector_t q) const override final;
 
 private:
     double m_mean;
     double m_scale_param;
     size_t m_n_samples;
 
-    DistributionLogNormal* mp_distribution;
+    std::unique_ptr<DistributionLogNormal> mP_distribution;
 
     SafePointerVector<IFormFactorBorn> m_form_factors;
     std::vector<double> m_probabilities;
diff --git a/Core/SoftParticle/FormFactorSphereUniformRadius.h b/Core/SoftParticle/FormFactorSphereUniformRadius.h
index 0a4dd96ec1f..49adb5ee876 100644
--- a/Core/SoftParticle/FormFactorSphereUniformRadius.h
+++ b/Core/SoftParticle/FormFactorSphereUniformRadius.h
@@ -26,13 +26,13 @@ class BA_CORE_API_ FormFactorSphereUniformRadius : public IFormFactorBorn
 public:
     FormFactorSphereUniformRadius(double mean, double full_width);
 
-    FormFactorSphereUniformRadius* clone() const final {
+    FormFactorSphereUniformRadius* clone() const override final {
         return new FormFactorSphereUniformRadius(m_mean, m_full_width); }
-    void accept(ISampleVisitor* visitor) const final { visitor->visit(this); }
+    void accept(ISampleVisitor* visitor) const override final { visitor->visit(this); }
 
-    double getRadialExtension() const final { return m_mean; }
+    double getRadialExtension() const override final { return m_mean; }
 
-    complex_t evaluate_for_q(const cvector_t q) const final;
+    complex_t evaluate_for_q(const cvector_t q) const override final;
 
 private:
     bool checkParameters() const;
diff --git a/auto/Wrap/libBornAgainCore.py b/auto/Wrap/libBornAgainCore.py
index d6c008796f3..56c5be5700e 100644
--- a/auto/Wrap/libBornAgainCore.py
+++ b/auto/Wrap/libBornAgainCore.py
@@ -10798,18 +10798,6 @@ class FormFactorPolyhedron(IFormFactorBorn):
         raise AttributeError("No constructor defined - class is abstract")
     __repr__ = _swig_repr
 
-    def onChange(self):
-        """
-        onChange(FormFactorPolyhedron self)
-
-        virtual void FormFactorPolyhedron::onChange()=0
-
-        Action to be taken in inherited class when a parameter has changed. 
-
-        """
-        return _libBornAgainCore.FormFactorPolyhedron_onChange(self)
-
-
     def evaluate_for_q(self, q):
         """
         evaluate_for_q(FormFactorPolyhedron self, cvector_t q) -> complex_t
@@ -11297,8 +11285,6 @@ class FormFactorCone(IFormFactorBorn):
             self.this.append(this)
         except Exception:
             self.this = this
-    __swig_destroy__ = _libBornAgainCore.delete_FormFactorCone
-    __del__ = lambda self: None
 
     def clone(self):
         """
@@ -11377,6 +11363,8 @@ class FormFactorCone(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorCone_evaluate_for_q(self, q)
 
+    __swig_destroy__ = _libBornAgainCore.delete_FormFactorCone
+    __del__ = lambda self: None
 FormFactorCone_swigregister = _libBornAgainCore.FormFactorCone_swigregister
 FormFactorCone_swigregister(FormFactorCone)
 
@@ -11728,8 +11716,6 @@ class FormFactorCylinder(IFormFactorBorn):
             self.this.append(this)
         except Exception:
             self.this = this
-    __swig_destroy__ = _libBornAgainCore.delete_FormFactorCylinder
-    __del__ = lambda self: None
 
     def clone(self):
         """
@@ -11798,6 +11784,8 @@ class FormFactorCylinder(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorCylinder_evaluate_for_q(self, q)
 
+    __swig_destroy__ = _libBornAgainCore.delete_FormFactorCylinder
+    __del__ = lambda self: None
 FormFactorCylinder_swigregister = _libBornAgainCore.FormFactorCylinder_swigregister
 FormFactorCylinder_swigregister(FormFactorCylinder)
 
@@ -12899,8 +12887,6 @@ class FormFactorLongRipple1Gauss(IFormFactorBorn):
             self.this.append(this)
         except Exception:
             self.this = this
-    __swig_destroy__ = _libBornAgainCore.delete_FormFactorLongRipple1Gauss
-    __del__ = lambda self: None
 
     def clone(self):
         """
@@ -12979,6 +12965,8 @@ class FormFactorLongRipple1Gauss(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorLongRipple1Gauss_evaluate_for_q(self, q)
 
+    __swig_destroy__ = _libBornAgainCore.delete_FormFactorLongRipple1Gauss
+    __del__ = lambda self: None
 FormFactorLongRipple1Gauss_swigregister = _libBornAgainCore.FormFactorLongRipple1Gauss_swigregister
 FormFactorLongRipple1Gauss_swigregister(FormFactorLongRipple1Gauss)
 
@@ -13028,8 +13016,6 @@ class FormFactorLongRipple1Lorentz(IFormFactorBorn):
             self.this.append(this)
         except Exception:
             self.this = this
-    __swig_destroy__ = _libBornAgainCore.delete_FormFactorLongRipple1Lorentz
-    __del__ = lambda self: None
 
     def clone(self):
         """
@@ -13108,6 +13094,8 @@ class FormFactorLongRipple1Lorentz(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorLongRipple1Lorentz_evaluate_for_q(self, q)
 
+    __swig_destroy__ = _libBornAgainCore.delete_FormFactorLongRipple1Lorentz
+    __del__ = lambda self: None
 FormFactorLongRipple1Lorentz_swigregister = _libBornAgainCore.FormFactorLongRipple1Lorentz_swigregister
 FormFactorLongRipple1Lorentz_swigregister(FormFactorLongRipple1Lorentz)
 
@@ -13160,8 +13148,6 @@ class FormFactorLongRipple2Gauss(IFormFactorBorn):
             self.this.append(this)
         except Exception:
             self.this = this
-    __swig_destroy__ = _libBornAgainCore.delete_FormFactorLongRipple2Gauss
-    __del__ = lambda self: None
 
     def clone(self):
         """
@@ -13250,6 +13236,8 @@ class FormFactorLongRipple2Gauss(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorLongRipple2Gauss_evaluate_for_q(self, q)
 
+    __swig_destroy__ = _libBornAgainCore.delete_FormFactorLongRipple2Gauss
+    __del__ = lambda self: None
 FormFactorLongRipple2Gauss_swigregister = _libBornAgainCore.FormFactorLongRipple2Gauss_swigregister
 FormFactorLongRipple2Gauss_swigregister(FormFactorLongRipple2Gauss)
 
@@ -13300,8 +13288,6 @@ class FormFactorLongRipple2Lorentz(IFormFactorBorn):
             self.this.append(this)
         except Exception:
             self.this = this
-    __swig_destroy__ = _libBornAgainCore.delete_FormFactorLongRipple2Lorentz
-    __del__ = lambda self: None
 
     def clone(self):
         """
@@ -13390,6 +13376,8 @@ class FormFactorLongRipple2Lorentz(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorLongRipple2Lorentz_evaluate_for_q(self, q)
 
+    __swig_destroy__ = _libBornAgainCore.delete_FormFactorLongRipple2Lorentz
+    __del__ = lambda self: None
 FormFactorLongRipple2Lorentz_swigregister = _libBornAgainCore.FormFactorLongRipple2Lorentz_swigregister
 FormFactorLongRipple2Lorentz_swigregister(FormFactorLongRipple2Lorentz)
 
@@ -13790,8 +13778,6 @@ class FormFactorRipple1(IFormFactorBorn):
             self.this.append(this)
         except Exception:
             self.this = this
-    __swig_destroy__ = _libBornAgainCore.delete_FormFactorRipple1
-    __del__ = lambda self: None
 
     def clone(self):
         """
@@ -13870,6 +13856,8 @@ class FormFactorRipple1(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorRipple1_evaluate_for_q(self, q)
 
+    __swig_destroy__ = _libBornAgainCore.delete_FormFactorRipple1
+    __del__ = lambda self: None
 FormFactorRipple1_swigregister = _libBornAgainCore.FormFactorRipple1_swigregister
 FormFactorRipple1_swigregister(FormFactorRipple1)
 
@@ -13922,8 +13910,6 @@ class FormFactorRipple2(IFormFactorBorn):
             self.this.append(this)
         except Exception:
             self.this = this
-    __swig_destroy__ = _libBornAgainCore.delete_FormFactorRipple2
-    __del__ = lambda self: None
 
     def clone(self):
         """
@@ -14012,6 +13998,8 @@ class FormFactorRipple2(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorRipple2_evaluate_for_q(self, q)
 
+    __swig_destroy__ = _libBornAgainCore.delete_FormFactorRipple2
+    __del__ = lambda self: None
 FormFactorRipple2_swigregister = _libBornAgainCore.FormFactorRipple2_swigregister
 FormFactorRipple2_swigregister(FormFactorRipple2)
 
@@ -14047,8 +14035,6 @@ class FormFactorSphereGaussianRadius(IFormFactorBorn):
             self.this.append(this)
         except Exception:
             self.this = this
-    __swig_destroy__ = _libBornAgainCore.delete_FormFactorSphereGaussianRadius
-    __del__ = lambda self: None
 
     def clone(self):
         """
@@ -14097,6 +14083,8 @@ class FormFactorSphereGaussianRadius(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorSphereGaussianRadius_evaluate_for_q(self, q)
 
+    __swig_destroy__ = _libBornAgainCore.delete_FormFactorSphereGaussianRadius
+    __del__ = lambda self: None
 FormFactorSphereGaussianRadius_swigregister = _libBornAgainCore.FormFactorSphereGaussianRadius_swigregister
 FormFactorSphereGaussianRadius_swigregister(FormFactorSphereGaussianRadius)
 
@@ -14132,8 +14120,6 @@ class FormFactorSphereLogNormalRadius(IFormFactorBorn):
             self.this.append(this)
         except Exception:
             self.this = this
-    __swig_destroy__ = _libBornAgainCore.delete_FormFactorSphereLogNormalRadius
-    __del__ = lambda self: None
 
     def clone(self):
         """
@@ -14182,6 +14168,8 @@ class FormFactorSphereLogNormalRadius(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorSphereLogNormalRadius_evaluate_for_q(self, q)
 
+    __swig_destroy__ = _libBornAgainCore.delete_FormFactorSphereLogNormalRadius
+    __del__ = lambda self: None
 FormFactorSphereLogNormalRadius_swigregister = _libBornAgainCore.FormFactorSphereLogNormalRadius_swigregister
 FormFactorSphereLogNormalRadius_swigregister(FormFactorSphereLogNormalRadius)
 
@@ -14580,8 +14568,6 @@ class FormFactorTruncatedSphere(IFormFactorBorn):
             self.this.append(this)
         except Exception:
             self.this = this
-    __swig_destroy__ = _libBornAgainCore.delete_FormFactorTruncatedSphere
-    __del__ = lambda self: None
 
     def clone(self):
         """
@@ -14638,6 +14624,20 @@ class FormFactorTruncatedSphere(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorTruncatedSphere_getRadialExtension(self)
 
+
+    def evaluate_for_q(self, q):
+        """
+        evaluate_for_q(FormFactorTruncatedSphere self, cvector_t q) -> complex_t
+
+        virtual complex_t IFormFactorBorn::evaluate_for_q(const cvector_t q) const =0
+
+        Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. 
+
+        """
+        return _libBornAgainCore.FormFactorTruncatedSphere_evaluate_for_q(self, q)
+
+    __swig_destroy__ = _libBornAgainCore.delete_FormFactorTruncatedSphere
+    __del__ = lambda self: None
 FormFactorTruncatedSphere_swigregister = _libBornAgainCore.FormFactorTruncatedSphere_swigregister
 FormFactorTruncatedSphere_swigregister(FormFactorTruncatedSphere)
 
@@ -14673,8 +14673,6 @@ class FormFactorTruncatedSpheroid(IFormFactorBorn):
             self.this.append(this)
         except Exception:
             self.this = this
-    __swig_destroy__ = _libBornAgainCore.delete_FormFactorTruncatedSpheroid
-    __del__ = lambda self: None
 
     def clone(self):
         """
@@ -14753,6 +14751,8 @@ class FormFactorTruncatedSpheroid(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorTruncatedSpheroid_evaluate_for_q(self, q)
 
+    __swig_destroy__ = _libBornAgainCore.delete_FormFactorTruncatedSpheroid
+    __del__ = lambda self: None
 FormFactorTruncatedSpheroid_swigregister = _libBornAgainCore.FormFactorTruncatedSpheroid_swigregister
 FormFactorTruncatedSpheroid_swigregister(FormFactorTruncatedSpheroid)
 
diff --git a/auto/Wrap/libBornAgainCore_wrap.cpp b/auto/Wrap/libBornAgainCore_wrap.cpp
index 540bf2fae8c..a02fad4ebee 100644
--- a/auto/Wrap/libBornAgainCore_wrap.cpp
+++ b/auto/Wrap/libBornAgainCore_wrap.cpp
@@ -59786,27 +59786,6 @@ SWIGINTERN PyObject *PolyhedralFace_swigregister(PyObject *SWIGUNUSEDPARM(self),
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_FormFactorPolyhedron_onChange(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  FormFactorPolyhedron *arg1 = (FormFactorPolyhedron *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorPolyhedron_onChange",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorPolyhedron, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorPolyhedron_onChange" "', argument " "1"" of type '" "FormFactorPolyhedron *""'"); 
-  }
-  arg1 = reinterpret_cast< FormFactorPolyhedron * >(argp1);
-  (arg1)->onChange();
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
 SWIGINTERN PyObject *_wrap_FormFactorPolyhedron_evaluate_for_q(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   FormFactorPolyhedron *arg1 = (FormFactorPolyhedron *) 0 ;
@@ -60726,27 +60705,6 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_FormFactorCone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  FormFactorCone *arg1 = (FormFactorCone *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_FormFactorCone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorCone, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorCone" "', argument " "1"" of type '" "FormFactorCone *""'"); 
-  }
-  arg1 = reinterpret_cast< FormFactorCone * >(argp1);
-  delete arg1;
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
 SWIGINTERN PyObject *_wrap_FormFactorCone_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   FormFactorCone *arg1 = (FormFactorCone *) 0 ;
@@ -60926,6 +60884,27 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_delete_FormFactorCone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FormFactorCone *arg1 = (FormFactorCone *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_FormFactorCone",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorCone, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorCone" "', argument " "1"" of type '" "FormFactorCone *""'"); 
+  }
+  arg1 = reinterpret_cast< FormFactorCone * >(argp1);
+  delete arg1;
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *FormFactorCone_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
@@ -61574,27 +61553,6 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_FormFactorCylinder(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  FormFactorCylinder *arg1 = (FormFactorCylinder *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_FormFactorCylinder",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorCylinder, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorCylinder" "', argument " "1"" of type '" "FormFactorCylinder *""'"); 
-  }
-  arg1 = reinterpret_cast< FormFactorCylinder * >(argp1);
-  delete arg1;
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
 SWIGINTERN PyObject *_wrap_FormFactorCylinder_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   FormFactorCylinder *arg1 = (FormFactorCylinder *) 0 ;
@@ -61752,6 +61710,27 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_delete_FormFactorCylinder(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FormFactorCylinder *arg1 = (FormFactorCylinder *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_FormFactorCylinder",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorCylinder, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorCylinder" "', argument " "1"" of type '" "FormFactorCylinder *""'"); 
+  }
+  arg1 = reinterpret_cast< FormFactorCylinder * >(argp1);
+  delete arg1;
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *FormFactorCylinder_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
@@ -63969,27 +63948,6 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_FormFactorLongRipple1Gauss(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  FormFactorLongRipple1Gauss *arg1 = (FormFactorLongRipple1Gauss *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_FormFactorLongRipple1Gauss",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorLongRipple1Gauss, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorLongRipple1Gauss" "', argument " "1"" of type '" "FormFactorLongRipple1Gauss *""'"); 
-  }
-  arg1 = reinterpret_cast< FormFactorLongRipple1Gauss * >(argp1);
-  delete arg1;
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
 SWIGINTERN PyObject *_wrap_FormFactorLongRipple1Gauss_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   FormFactorLongRipple1Gauss *arg1 = (FormFactorLongRipple1Gauss *) 0 ;
@@ -64169,6 +64127,27 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_delete_FormFactorLongRipple1Gauss(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FormFactorLongRipple1Gauss *arg1 = (FormFactorLongRipple1Gauss *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_FormFactorLongRipple1Gauss",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorLongRipple1Gauss, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorLongRipple1Gauss" "', argument " "1"" of type '" "FormFactorLongRipple1Gauss *""'"); 
+  }
+  arg1 = reinterpret_cast< FormFactorLongRipple1Gauss * >(argp1);
+  delete arg1;
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *FormFactorLongRipple1Gauss_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
@@ -64216,27 +64195,6 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_FormFactorLongRipple1Lorentz(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  FormFactorLongRipple1Lorentz *arg1 = (FormFactorLongRipple1Lorentz *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_FormFactorLongRipple1Lorentz",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorLongRipple1Lorentz, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorLongRipple1Lorentz" "', argument " "1"" of type '" "FormFactorLongRipple1Lorentz *""'"); 
-  }
-  arg1 = reinterpret_cast< FormFactorLongRipple1Lorentz * >(argp1);
-  delete arg1;
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
 SWIGINTERN PyObject *_wrap_FormFactorLongRipple1Lorentz_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   FormFactorLongRipple1Lorentz *arg1 = (FormFactorLongRipple1Lorentz *) 0 ;
@@ -64416,6 +64374,27 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_delete_FormFactorLongRipple1Lorentz(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FormFactorLongRipple1Lorentz *arg1 = (FormFactorLongRipple1Lorentz *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_FormFactorLongRipple1Lorentz",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorLongRipple1Lorentz, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorLongRipple1Lorentz" "', argument " "1"" of type '" "FormFactorLongRipple1Lorentz *""'"); 
+  }
+  arg1 = reinterpret_cast< FormFactorLongRipple1Lorentz * >(argp1);
+  delete arg1;
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *FormFactorLongRipple1Lorentz_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
@@ -64472,27 +64451,6 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_FormFactorLongRipple2Gauss(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  FormFactorLongRipple2Gauss *arg1 = (FormFactorLongRipple2Gauss *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_FormFactorLongRipple2Gauss",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorLongRipple2Gauss, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorLongRipple2Gauss" "', argument " "1"" of type '" "FormFactorLongRipple2Gauss *""'"); 
-  }
-  arg1 = reinterpret_cast< FormFactorLongRipple2Gauss * >(argp1);
-  delete arg1;
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
 SWIGINTERN PyObject *_wrap_FormFactorLongRipple2Gauss_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   FormFactorLongRipple2Gauss *arg1 = (FormFactorLongRipple2Gauss *) 0 ;
@@ -64694,6 +64652,27 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_delete_FormFactorLongRipple2Gauss(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FormFactorLongRipple2Gauss *arg1 = (FormFactorLongRipple2Gauss *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_FormFactorLongRipple2Gauss",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorLongRipple2Gauss, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorLongRipple2Gauss" "', argument " "1"" of type '" "FormFactorLongRipple2Gauss *""'"); 
+  }
+  arg1 = reinterpret_cast< FormFactorLongRipple2Gauss * >(argp1);
+  delete arg1;
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *FormFactorLongRipple2Gauss_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
@@ -64750,27 +64729,6 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_FormFactorLongRipple2Lorentz(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  FormFactorLongRipple2Lorentz *arg1 = (FormFactorLongRipple2Lorentz *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_FormFactorLongRipple2Lorentz",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorLongRipple2Lorentz, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorLongRipple2Lorentz" "', argument " "1"" of type '" "FormFactorLongRipple2Lorentz *""'"); 
-  }
-  arg1 = reinterpret_cast< FormFactorLongRipple2Lorentz * >(argp1);
-  delete arg1;
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
 SWIGINTERN PyObject *_wrap_FormFactorLongRipple2Lorentz_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   FormFactorLongRipple2Lorentz *arg1 = (FormFactorLongRipple2Lorentz *) 0 ;
@@ -64972,6 +64930,27 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_delete_FormFactorLongRipple2Lorentz(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FormFactorLongRipple2Lorentz *arg1 = (FormFactorLongRipple2Lorentz *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_FormFactorLongRipple2Lorentz",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorLongRipple2Lorentz, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorLongRipple2Lorentz" "', argument " "1"" of type '" "FormFactorLongRipple2Lorentz *""'"); 
+  }
+  arg1 = reinterpret_cast< FormFactorLongRipple2Lorentz * >(argp1);
+  delete arg1;
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *FormFactorLongRipple2Lorentz_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
@@ -65757,27 +65736,6 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_FormFactorRipple1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  FormFactorRipple1 *arg1 = (FormFactorRipple1 *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_FormFactorRipple1",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorRipple1, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorRipple1" "', argument " "1"" of type '" "FormFactorRipple1 *""'"); 
-  }
-  arg1 = reinterpret_cast< FormFactorRipple1 * >(argp1);
-  delete arg1;
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
 SWIGINTERN PyObject *_wrap_FormFactorRipple1_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   FormFactorRipple1 *arg1 = (FormFactorRipple1 *) 0 ;
@@ -65957,6 +65915,27 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_delete_FormFactorRipple1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FormFactorRipple1 *arg1 = (FormFactorRipple1 *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_FormFactorRipple1",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorRipple1, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorRipple1" "', argument " "1"" of type '" "FormFactorRipple1 *""'"); 
+  }
+  arg1 = reinterpret_cast< FormFactorRipple1 * >(argp1);
+  delete arg1;
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *FormFactorRipple1_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
@@ -66013,27 +65992,6 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_FormFactorRipple2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  FormFactorRipple2 *arg1 = (FormFactorRipple2 *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_FormFactorRipple2",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorRipple2, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorRipple2" "', argument " "1"" of type '" "FormFactorRipple2 *""'"); 
-  }
-  arg1 = reinterpret_cast< FormFactorRipple2 * >(argp1);
-  delete arg1;
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
 SWIGINTERN PyObject *_wrap_FormFactorRipple2_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   FormFactorRipple2 *arg1 = (FormFactorRipple2 *) 0 ;
@@ -66235,6 +66193,27 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_delete_FormFactorRipple2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FormFactorRipple2 *arg1 = (FormFactorRipple2 *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_FormFactorRipple2",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorRipple2, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorRipple2" "', argument " "1"" of type '" "FormFactorRipple2 *""'"); 
+  }
+  arg1 = reinterpret_cast< FormFactorRipple2 * >(argp1);
+  delete arg1;
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *FormFactorRipple2_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
@@ -66273,27 +66252,6 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_FormFactorSphereGaussianRadius(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  FormFactorSphereGaussianRadius *arg1 = (FormFactorSphereGaussianRadius *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_FormFactorSphereGaussianRadius",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorSphereGaussianRadius, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorSphereGaussianRadius" "', argument " "1"" of type '" "FormFactorSphereGaussianRadius *""'"); 
-  }
-  arg1 = reinterpret_cast< FormFactorSphereGaussianRadius * >(argp1);
-  delete arg1;
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
 SWIGINTERN PyObject *_wrap_FormFactorSphereGaussianRadius_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   FormFactorSphereGaussianRadius *arg1 = (FormFactorSphereGaussianRadius *) 0 ;
@@ -66407,6 +66365,27 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_delete_FormFactorSphereGaussianRadius(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FormFactorSphereGaussianRadius *arg1 = (FormFactorSphereGaussianRadius *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_FormFactorSphereGaussianRadius",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorSphereGaussianRadius, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorSphereGaussianRadius" "', argument " "1"" of type '" "FormFactorSphereGaussianRadius *""'"); 
+  }
+  arg1 = reinterpret_cast< FormFactorSphereGaussianRadius * >(argp1);
+  delete arg1;
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *FormFactorSphereGaussianRadius_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
@@ -66454,27 +66433,6 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_FormFactorSphereLogNormalRadius(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  FormFactorSphereLogNormalRadius *arg1 = (FormFactorSphereLogNormalRadius *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_FormFactorSphereLogNormalRadius",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorSphereLogNormalRadius, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorSphereLogNormalRadius" "', argument " "1"" of type '" "FormFactorSphereLogNormalRadius *""'"); 
-  }
-  arg1 = reinterpret_cast< FormFactorSphereLogNormalRadius * >(argp1);
-  delete arg1;
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
 SWIGINTERN PyObject *_wrap_FormFactorSphereLogNormalRadius_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   FormFactorSphereLogNormalRadius *arg1 = (FormFactorSphereLogNormalRadius *) 0 ;
@@ -66588,6 +66546,27 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_delete_FormFactorSphereLogNormalRadius(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FormFactorSphereLogNormalRadius *arg1 = (FormFactorSphereLogNormalRadius *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_FormFactorSphereLogNormalRadius",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorSphereLogNormalRadius, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorSphereLogNormalRadius" "', argument " "1"" of type '" "FormFactorSphereLogNormalRadius *""'"); 
+  }
+  arg1 = reinterpret_cast< FormFactorSphereLogNormalRadius * >(argp1);
+  delete arg1;
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *FormFactorSphereLogNormalRadius_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
@@ -67293,27 +67272,6 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_FormFactorTruncatedSphere(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  FormFactorTruncatedSphere *arg1 = (FormFactorTruncatedSphere *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_FormFactorTruncatedSphere",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorTruncatedSphere, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorTruncatedSphere" "', argument " "1"" of type '" "FormFactorTruncatedSphere *""'"); 
-  }
-  arg1 = reinterpret_cast< FormFactorTruncatedSphere * >(argp1);
-  delete arg1;
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
 SWIGINTERN PyObject *_wrap_FormFactorTruncatedSphere_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   FormFactorTruncatedSphere *arg1 = (FormFactorTruncatedSphere *) 0 ;
@@ -67432,6 +67390,66 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_FormFactorTruncatedSphere_evaluate_for_q(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FormFactorTruncatedSphere *arg1 = (FormFactorTruncatedSphere *) 0 ;
+  cvector_t arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  complex_t result;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorTruncatedSphere_evaluate_for_q",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorTruncatedSphere, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorTruncatedSphere_evaluate_for_q" "', argument " "1"" of type '" "FormFactorTruncatedSphere const *""'"); 
+  }
+  arg1 = reinterpret_cast< FormFactorTruncatedSphere * >(argp1);
+  {
+    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorTruncatedSphere_evaluate_for_q" "', argument " "2"" of type '" "cvector_t const""'"); 
+    }  
+    if (!argp2) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FormFactorTruncatedSphere_evaluate_for_q" "', argument " "2"" of type '" "cvector_t const""'");
+    } else {
+      cvector_t * temp = reinterpret_cast< cvector_t * >(argp2);
+      arg2 = *temp;
+      if (SWIG_IsNewObj(res2)) delete temp;
+    }
+  }
+  result = ((FormFactorTruncatedSphere const *)arg1)->evaluate_for_q(arg2);
+  resultobj = SWIG_From_std_complex_Sl_double_Sg_(static_cast< std::complex<double> >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_FormFactorTruncatedSphere(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FormFactorTruncatedSphere *arg1 = (FormFactorTruncatedSphere *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_FormFactorTruncatedSphere",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorTruncatedSphere, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorTruncatedSphere" "', argument " "1"" of type '" "FormFactorTruncatedSphere *""'"); 
+  }
+  arg1 = reinterpret_cast< FormFactorTruncatedSphere * >(argp1);
+  delete arg1;
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *FormFactorTruncatedSphere_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
@@ -67479,27 +67497,6 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_FormFactorTruncatedSpheroid(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  FormFactorTruncatedSpheroid *arg1 = (FormFactorTruncatedSpheroid *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_FormFactorTruncatedSpheroid",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorTruncatedSpheroid, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorTruncatedSpheroid" "', argument " "1"" of type '" "FormFactorTruncatedSpheroid *""'"); 
-  }
-  arg1 = reinterpret_cast< FormFactorTruncatedSpheroid * >(argp1);
-  delete arg1;
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
 SWIGINTERN PyObject *_wrap_FormFactorTruncatedSpheroid_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   FormFactorTruncatedSpheroid *arg1 = (FormFactorTruncatedSpheroid *) 0 ;
@@ -67679,6 +67676,27 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_delete_FormFactorTruncatedSpheroid(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FormFactorTruncatedSpheroid *arg1 = (FormFactorTruncatedSpheroid *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_FormFactorTruncatedSpheroid",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorTruncatedSpheroid, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorTruncatedSpheroid" "', argument " "1"" of type '" "FormFactorTruncatedSpheroid *""'"); 
+  }
+  arg1 = reinterpret_cast< FormFactorTruncatedSpheroid * >(argp1);
+  delete arg1;
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *FormFactorTruncatedSpheroid_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
@@ -105171,14 +105189,6 @@ static PyMethodDef SwigMethods[] = {
 		""},
 	 { (char *)"delete_PolyhedralFace", _wrap_delete_PolyhedralFace, METH_VARARGS, (char *)"delete_PolyhedralFace(PolyhedralFace self)"},
 	 { (char *)"PolyhedralFace_swigregister", PolyhedralFace_swigregister, METH_VARARGS, NULL},
-	 { (char *)"FormFactorPolyhedron_onChange", _wrap_FormFactorPolyhedron_onChange, METH_VARARGS, (char *)"\n"
-		"FormFactorPolyhedron_onChange(FormFactorPolyhedron self)\n"
-		"\n"
-		"virtual void FormFactorPolyhedron::onChange()=0\n"
-		"\n"
-		"Action to be taken in inherited class when a parameter has changed. \n"
-		"\n"
-		""},
 	 { (char *)"FormFactorPolyhedron_evaluate_for_q", _wrap_FormFactorPolyhedron_evaluate_for_q, METH_VARARGS, (char *)"\n"
 		"FormFactorPolyhedron_evaluate_for_q(FormFactorPolyhedron self, cvector_t q) -> complex_t\n"
 		"\n"
@@ -105430,12 +105440,6 @@ static PyMethodDef SwigMethods[] = {
 		"angle in radians between base and lateral surface \n"
 		"\n"
 		""},
-	 { (char *)"delete_FormFactorCone", _wrap_delete_FormFactorCone, METH_VARARGS, (char *)"\n"
-		"delete_FormFactorCone(FormFactorCone self)\n"
-		"\n"
-		"virtual FormFactorCone::~FormFactorCone()\n"
-		"\n"
-		""},
 	 { (char *)"FormFactorCone_clone", _wrap_FormFactorCone_clone, METH_VARARGS, (char *)"\n"
 		"FormFactorCone_clone(FormFactorCone self) -> FormFactorCone\n"
 		"\n"
@@ -105486,6 +105490,12 @@ static PyMethodDef SwigMethods[] = {
 		"Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. \n"
 		"\n"
 		""},
+	 { (char *)"delete_FormFactorCone", _wrap_delete_FormFactorCone, METH_VARARGS, (char *)"\n"
+		"delete_FormFactorCone(FormFactorCone self)\n"
+		"\n"
+		"virtual FormFactorCone::~FormFactorCone()\n"
+		"\n"
+		""},
 	 { (char *)"FormFactorCone_swigregister", FormFactorCone_swigregister, METH_VARARGS, NULL},
 	 { (char *)"new_FormFactorCone6", _wrap_new_FormFactorCone6, METH_VARARGS, (char *)"\n"
 		"new_FormFactorCone6(double base_edge, double height, double alpha) -> FormFactorCone6\n"
@@ -105663,12 +105673,6 @@ static PyMethodDef SwigMethods[] = {
 		"FormFactorCylinder::FormFactorCylinder(double radius, double height)\n"
 		"\n"
 		""},
-	 { (char *)"delete_FormFactorCylinder", _wrap_delete_FormFactorCylinder, METH_VARARGS, (char *)"\n"
-		"delete_FormFactorCylinder(FormFactorCylinder self)\n"
-		"\n"
-		"virtual FormFactorCylinder::~FormFactorCylinder()\n"
-		"\n"
-		""},
 	 { (char *)"FormFactorCylinder_clone", _wrap_FormFactorCylinder_clone, METH_VARARGS, (char *)"\n"
 		"FormFactorCylinder_clone(FormFactorCylinder self) -> FormFactorCylinder\n"
 		"\n"
@@ -105713,6 +105717,12 @@ static PyMethodDef SwigMethods[] = {
 		"Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. \n"
 		"\n"
 		""},
+	 { (char *)"delete_FormFactorCylinder", _wrap_delete_FormFactorCylinder, METH_VARARGS, (char *)"\n"
+		"delete_FormFactorCylinder(FormFactorCylinder self)\n"
+		"\n"
+		"virtual FormFactorCylinder::~FormFactorCylinder()\n"
+		"\n"
+		""},
 	 { (char *)"FormFactorCylinder_swigregister", FormFactorCylinder_swigregister, METH_VARARGS, NULL},
 	 { (char *)"new_FormFactorDecoratorDebyeWaller", _wrap_new_FormFactorDecoratorDebyeWaller, METH_VARARGS, (char *)"\n"
 		"FormFactorDecoratorDebyeWaller(IFormFactor form_factor, double dw_h_factor, double dw_r_factor)\n"
@@ -106285,12 +106295,6 @@ static PyMethodDef SwigMethods[] = {
 		"of cosine cross section \n"
 		"\n"
 		""},
-	 { (char *)"delete_FormFactorLongRipple1Gauss", _wrap_delete_FormFactorLongRipple1Gauss, METH_VARARGS, (char *)"\n"
-		"delete_FormFactorLongRipple1Gauss(FormFactorLongRipple1Gauss self)\n"
-		"\n"
-		"virtual FormFactorLongRipple1Gauss::~FormFactorLongRipple1Gauss()\n"
-		"\n"
-		""},
 	 { (char *)"FormFactorLongRipple1Gauss_clone", _wrap_FormFactorLongRipple1Gauss_clone, METH_VARARGS, (char *)"\n"
 		"FormFactorLongRipple1Gauss_clone(FormFactorLongRipple1Gauss self) -> FormFactorLongRipple1Gauss\n"
 		"\n"
@@ -106341,6 +106345,12 @@ static PyMethodDef SwigMethods[] = {
 		"Complex formfactor. \n"
 		"\n"
 		""},
+	 { (char *)"delete_FormFactorLongRipple1Gauss", _wrap_delete_FormFactorLongRipple1Gauss, METH_VARARGS, (char *)"\n"
+		"delete_FormFactorLongRipple1Gauss(FormFactorLongRipple1Gauss self)\n"
+		"\n"
+		"virtual FormFactorLongRipple1Gauss::~FormFactorLongRipple1Gauss()\n"
+		"\n"
+		""},
 	 { (char *)"FormFactorLongRipple1Gauss_swigregister", FormFactorLongRipple1Gauss_swigregister, METH_VARARGS, NULL},
 	 { (char *)"new_FormFactorLongRipple1Lorentz", _wrap_new_FormFactorLongRipple1Lorentz, METH_VARARGS, (char *)"\n"
 		"new_FormFactorLongRipple1Lorentz(double length, double width, double height) -> FormFactorLongRipple1Lorentz\n"
@@ -106362,12 +106372,6 @@ static PyMethodDef SwigMethods[] = {
 		"of cosine cross section \n"
 		"\n"
 		""},
-	 { (char *)"delete_FormFactorLongRipple1Lorentz", _wrap_delete_FormFactorLongRipple1Lorentz, METH_VARARGS, (char *)"\n"
-		"delete_FormFactorLongRipple1Lorentz(FormFactorLongRipple1Lorentz self)\n"
-		"\n"
-		"virtual FormFactorLongRipple1Lorentz::~FormFactorLongRipple1Lorentz()\n"
-		"\n"
-		""},
 	 { (char *)"FormFactorLongRipple1Lorentz_clone", _wrap_FormFactorLongRipple1Lorentz_clone, METH_VARARGS, (char *)"\n"
 		"FormFactorLongRipple1Lorentz_clone(FormFactorLongRipple1Lorentz self) -> FormFactorLongRipple1Lorentz\n"
 		"\n"
@@ -106418,6 +106422,12 @@ static PyMethodDef SwigMethods[] = {
 		"Complex formfactor. \n"
 		"\n"
 		""},
+	 { (char *)"delete_FormFactorLongRipple1Lorentz", _wrap_delete_FormFactorLongRipple1Lorentz, METH_VARARGS, (char *)"\n"
+		"delete_FormFactorLongRipple1Lorentz(FormFactorLongRipple1Lorentz self)\n"
+		"\n"
+		"virtual FormFactorLongRipple1Lorentz::~FormFactorLongRipple1Lorentz()\n"
+		"\n"
+		""},
 	 { (char *)"FormFactorLongRipple1Lorentz_swigregister", FormFactorLongRipple1Lorentz_swigregister, METH_VARARGS, NULL},
 	 { (char *)"new_FormFactorLongRipple2Gauss", _wrap_new_FormFactorLongRipple2Gauss, METH_VARARGS, (char *)"\n"
 		"new_FormFactorLongRipple2Gauss(double length, double width, double height, double asymmetry) -> FormFactorLongRipple2Gauss\n"
@@ -106442,12 +106452,6 @@ static PyMethodDef SwigMethods[] = {
 		"length of triangular cross section \n"
 		"\n"
 		""},
-	 { (char *)"delete_FormFactorLongRipple2Gauss", _wrap_delete_FormFactorLongRipple2Gauss, METH_VARARGS, (char *)"\n"
-		"delete_FormFactorLongRipple2Gauss(FormFactorLongRipple2Gauss self)\n"
-		"\n"
-		"virtual FormFactorLongRipple2Gauss::~FormFactorLongRipple2Gauss()\n"
-		"\n"
-		""},
 	 { (char *)"FormFactorLongRipple2Gauss_clone", _wrap_FormFactorLongRipple2Gauss_clone, METH_VARARGS, (char *)"\n"
 		"FormFactorLongRipple2Gauss_clone(FormFactorLongRipple2Gauss self) -> FormFactorLongRipple2Gauss\n"
 		"\n"
@@ -106504,6 +106508,12 @@ static PyMethodDef SwigMethods[] = {
 		"Complex formfactor. \n"
 		"\n"
 		""},
+	 { (char *)"delete_FormFactorLongRipple2Gauss", _wrap_delete_FormFactorLongRipple2Gauss, METH_VARARGS, (char *)"\n"
+		"delete_FormFactorLongRipple2Gauss(FormFactorLongRipple2Gauss self)\n"
+		"\n"
+		"virtual FormFactorLongRipple2Gauss::~FormFactorLongRipple2Gauss()\n"
+		"\n"
+		""},
 	 { (char *)"FormFactorLongRipple2Gauss_swigregister", FormFactorLongRipple2Gauss_swigregister, METH_VARARGS, NULL},
 	 { (char *)"new_FormFactorLongRipple2Lorentz", _wrap_new_FormFactorLongRipple2Lorentz, METH_VARARGS, (char *)"\n"
 		"new_FormFactorLongRipple2Lorentz(double length, double width, double height, double asymmetry) -> FormFactorLongRipple2Lorentz\n"
@@ -106526,12 +106536,6 @@ static PyMethodDef SwigMethods[] = {
 		"length of triangular cross section \n"
 		"\n"
 		""},
-	 { (char *)"delete_FormFactorLongRipple2Lorentz", _wrap_delete_FormFactorLongRipple2Lorentz, METH_VARARGS, (char *)"\n"
-		"delete_FormFactorLongRipple2Lorentz(FormFactorLongRipple2Lorentz self)\n"
-		"\n"
-		"virtual FormFactorLongRipple2Lorentz::~FormFactorLongRipple2Lorentz()\n"
-		"\n"
-		""},
 	 { (char *)"FormFactorLongRipple2Lorentz_clone", _wrap_FormFactorLongRipple2Lorentz_clone, METH_VARARGS, (char *)"\n"
 		"FormFactorLongRipple2Lorentz_clone(FormFactorLongRipple2Lorentz self) -> FormFactorLongRipple2Lorentz\n"
 		"\n"
@@ -106588,6 +106592,12 @@ static PyMethodDef SwigMethods[] = {
 		"Complex formfactor. \n"
 		"\n"
 		""},
+	 { (char *)"delete_FormFactorLongRipple2Lorentz", _wrap_delete_FormFactorLongRipple2Lorentz, METH_VARARGS, (char *)"\n"
+		"delete_FormFactorLongRipple2Lorentz(FormFactorLongRipple2Lorentz self)\n"
+		"\n"
+		"virtual FormFactorLongRipple2Lorentz::~FormFactorLongRipple2Lorentz()\n"
+		"\n"
+		""},
 	 { (char *)"FormFactorLongRipple2Lorentz_swigregister", FormFactorLongRipple2Lorentz_swigregister, METH_VARARGS, NULL},
 	 { (char *)"new_FormFactorLorentz", _wrap_new_FormFactorLorentz, METH_VARARGS, (char *)"\n"
 		"FormFactorLorentz(double volume)\n"
@@ -106776,12 +106786,6 @@ static PyMethodDef SwigMethods[] = {
 		"of cosine cross section \n"
 		"\n"
 		""},
-	 { (char *)"delete_FormFactorRipple1", _wrap_delete_FormFactorRipple1, METH_VARARGS, (char *)"\n"
-		"delete_FormFactorRipple1(FormFactorRipple1 self)\n"
-		"\n"
-		"virtual FormFactorRipple1::~FormFactorRipple1()\n"
-		"\n"
-		""},
 	 { (char *)"FormFactorRipple1_clone", _wrap_FormFactorRipple1_clone, METH_VARARGS, (char *)"\n"
 		"FormFactorRipple1_clone(FormFactorRipple1 self) -> FormFactorRipple1\n"
 		"\n"
@@ -106832,6 +106836,12 @@ static PyMethodDef SwigMethods[] = {
 		"Complex formfactor. \n"
 		"\n"
 		""},
+	 { (char *)"delete_FormFactorRipple1", _wrap_delete_FormFactorRipple1, METH_VARARGS, (char *)"\n"
+		"delete_FormFactorRipple1(FormFactorRipple1 self)\n"
+		"\n"
+		"virtual FormFactorRipple1::~FormFactorRipple1()\n"
+		"\n"
+		""},
 	 { (char *)"FormFactorRipple1_swigregister", FormFactorRipple1_swigregister, METH_VARARGS, NULL},
 	 { (char *)"new_FormFactorRipple2", _wrap_new_FormFactorRipple2, METH_VARARGS, (char *)"\n"
 		"new_FormFactorRipple2(double length, double width, double height, double asymmetry) -> FormFactorRipple2\n"
@@ -106856,12 +106866,6 @@ static PyMethodDef SwigMethods[] = {
 		"length of triangular cross section \n"
 		"\n"
 		""},
-	 { (char *)"delete_FormFactorRipple2", _wrap_delete_FormFactorRipple2, METH_VARARGS, (char *)"\n"
-		"delete_FormFactorRipple2(FormFactorRipple2 self)\n"
-		"\n"
-		"virtual FormFactorRipple2::~FormFactorRipple2()\n"
-		"\n"
-		""},
 	 { (char *)"FormFactorRipple2_clone", _wrap_FormFactorRipple2_clone, METH_VARARGS, (char *)"\n"
 		"FormFactorRipple2_clone(FormFactorRipple2 self) -> FormFactorRipple2\n"
 		"\n"
@@ -106918,6 +106922,12 @@ static PyMethodDef SwigMethods[] = {
 		"Complex formfactor. \n"
 		"\n"
 		""},
+	 { (char *)"delete_FormFactorRipple2", _wrap_delete_FormFactorRipple2, METH_VARARGS, (char *)"\n"
+		"delete_FormFactorRipple2(FormFactorRipple2 self)\n"
+		"\n"
+		"virtual FormFactorRipple2::~FormFactorRipple2()\n"
+		"\n"
+		""},
 	 { (char *)"FormFactorRipple2_swigregister", FormFactorRipple2_swigregister, METH_VARARGS, NULL},
 	 { (char *)"new_FormFactorSphereGaussianRadius", _wrap_new_FormFactorSphereGaussianRadius, METH_VARARGS, (char *)"\n"
 		"new_FormFactorSphereGaussianRadius(double mean, double sigma) -> FormFactorSphereGaussianRadius\n"
@@ -106925,12 +106935,6 @@ static PyMethodDef SwigMethods[] = {
 		"FormFactorSphereGaussianRadius::FormFactorSphereGaussianRadius(double mean, double sigma)\n"
 		"\n"
 		""},
-	 { (char *)"delete_FormFactorSphereGaussianRadius", _wrap_delete_FormFactorSphereGaussianRadius, METH_VARARGS, (char *)"\n"
-		"delete_FormFactorSphereGaussianRadius(FormFactorSphereGaussianRadius self)\n"
-		"\n"
-		"FormFactorSphereGaussianRadius::~FormFactorSphereGaussianRadius()\n"
-		"\n"
-		""},
 	 { (char *)"FormFactorSphereGaussianRadius_clone", _wrap_FormFactorSphereGaussianRadius_clone, METH_VARARGS, (char *)"\n"
 		"FormFactorSphereGaussianRadius_clone(FormFactorSphereGaussianRadius self) -> FormFactorSphereGaussianRadius\n"
 		"\n"
@@ -106963,6 +106967,12 @@ static PyMethodDef SwigMethods[] = {
 		"Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. \n"
 		"\n"
 		""},
+	 { (char *)"delete_FormFactorSphereGaussianRadius", _wrap_delete_FormFactorSphereGaussianRadius, METH_VARARGS, (char *)"\n"
+		"delete_FormFactorSphereGaussianRadius(FormFactorSphereGaussianRadius self)\n"
+		"\n"
+		"FormFactorSphereGaussianRadius::~FormFactorSphereGaussianRadius()\n"
+		"\n"
+		""},
 	 { (char *)"FormFactorSphereGaussianRadius_swigregister", FormFactorSphereGaussianRadius_swigregister, METH_VARARGS, NULL},
 	 { (char *)"new_FormFactorSphereLogNormalRadius", _wrap_new_FormFactorSphereLogNormalRadius, METH_VARARGS, (char *)"\n"
 		"new_FormFactorSphereLogNormalRadius(double mean, double scale_param, size_t n_samples) -> FormFactorSphereLogNormalRadius\n"
@@ -106970,12 +106980,6 @@ static PyMethodDef SwigMethods[] = {
 		"FormFactorSphereLogNormalRadius::FormFactorSphereLogNormalRadius(double mean, double scale_param, size_t n_samples)\n"
 		"\n"
 		""},
-	 { (char *)"delete_FormFactorSphereLogNormalRadius", _wrap_delete_FormFactorSphereLogNormalRadius, METH_VARARGS, (char *)"\n"
-		"delete_FormFactorSphereLogNormalRadius(FormFactorSphereLogNormalRadius self)\n"
-		"\n"
-		"FormFactorSphereLogNormalRadius::~FormFactorSphereLogNormalRadius() final\n"
-		"\n"
-		""},
 	 { (char *)"FormFactorSphereLogNormalRadius_clone", _wrap_FormFactorSphereLogNormalRadius_clone, METH_VARARGS, (char *)"\n"
 		"FormFactorSphereLogNormalRadius_clone(FormFactorSphereLogNormalRadius self) -> FormFactorSphereLogNormalRadius\n"
 		"\n"
@@ -107008,6 +107012,12 @@ static PyMethodDef SwigMethods[] = {
 		"Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. \n"
 		"\n"
 		""},
+	 { (char *)"delete_FormFactorSphereLogNormalRadius", _wrap_delete_FormFactorSphereLogNormalRadius, METH_VARARGS, (char *)"\n"
+		"delete_FormFactorSphereLogNormalRadius(FormFactorSphereLogNormalRadius self)\n"
+		"\n"
+		"FormFactorSphereLogNormalRadius::~FormFactorSphereLogNormalRadius() final\n"
+		"\n"
+		""},
 	 { (char *)"FormFactorSphereLogNormalRadius_swigregister", FormFactorSphereLogNormalRadius_swigregister, METH_VARARGS, NULL},
 	 { (char *)"new_FormFactorSphereUniformRadius", _wrap_new_FormFactorSphereUniformRadius, METH_VARARGS, (char *)"\n"
 		"new_FormFactorSphereUniformRadius(double mean, double full_width) -> FormFactorSphereUniformRadius\n"
@@ -107194,12 +107204,6 @@ static PyMethodDef SwigMethods[] = {
 		"FormFactorTruncatedSphere::FormFactorTruncatedSphere(double radius, double height)\n"
 		"\n"
 		""},
-	 { (char *)"delete_FormFactorTruncatedSphere", _wrap_delete_FormFactorTruncatedSphere, METH_VARARGS, (char *)"\n"
-		"delete_FormFactorTruncatedSphere(FormFactorTruncatedSphere self)\n"
-		"\n"
-		"FormFactorTruncatedSphere::~FormFactorTruncatedSphere()\n"
-		"\n"
-		""},
 	 { (char *)"FormFactorTruncatedSphere_clone", _wrap_FormFactorTruncatedSphere_clone, METH_VARARGS, (char *)"\n"
 		"FormFactorTruncatedSphere_clone(FormFactorTruncatedSphere self) -> FormFactorTruncatedSphere\n"
 		"\n"
@@ -107236,6 +107240,20 @@ static PyMethodDef SwigMethods[] = {
 		"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
 		"\n"
 		""},
+	 { (char *)"FormFactorTruncatedSphere_evaluate_for_q", _wrap_FormFactorTruncatedSphere_evaluate_for_q, METH_VARARGS, (char *)"\n"
+		"FormFactorTruncatedSphere_evaluate_for_q(FormFactorTruncatedSphere self, cvector_t q) -> complex_t\n"
+		"\n"
+		"virtual complex_t IFormFactorBorn::evaluate_for_q(const cvector_t q) const =0\n"
+		"\n"
+		"Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. \n"
+		"\n"
+		""},
+	 { (char *)"delete_FormFactorTruncatedSphere", _wrap_delete_FormFactorTruncatedSphere, METH_VARARGS, (char *)"\n"
+		"delete_FormFactorTruncatedSphere(FormFactorTruncatedSphere self)\n"
+		"\n"
+		"FormFactorTruncatedSphere::~FormFactorTruncatedSphere()\n"
+		"\n"
+		""},
 	 { (char *)"FormFactorTruncatedSphere_swigregister", FormFactorTruncatedSphere_swigregister, METH_VARARGS, NULL},
 	 { (char *)"new_FormFactorTruncatedSpheroid", _wrap_new_FormFactorTruncatedSpheroid, METH_VARARGS, (char *)"\n"
 		"new_FormFactorTruncatedSpheroid(double radius, double height, double height_flattening) -> FormFactorTruncatedSpheroid\n"
@@ -107243,12 +107261,6 @@ static PyMethodDef SwigMethods[] = {
 		"FormFactorTruncatedSpheroid::FormFactorTruncatedSpheroid(double radius, double height, double height_flattening)\n"
 		"\n"
 		""},
-	 { (char *)"delete_FormFactorTruncatedSpheroid", _wrap_delete_FormFactorTruncatedSpheroid, METH_VARARGS, (char *)"\n"
-		"delete_FormFactorTruncatedSpheroid(FormFactorTruncatedSpheroid self)\n"
-		"\n"
-		"virtual FormFactorTruncatedSpheroid::~FormFactorTruncatedSpheroid()\n"
-		"\n"
-		""},
 	 { (char *)"FormFactorTruncatedSpheroid_clone", _wrap_FormFactorTruncatedSpheroid_clone, METH_VARARGS, (char *)"\n"
 		"FormFactorTruncatedSpheroid_clone(FormFactorTruncatedSpheroid self) -> FormFactorTruncatedSpheroid\n"
 		"\n"
@@ -107299,6 +107311,12 @@ static PyMethodDef SwigMethods[] = {
 		"Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. \n"
 		"\n"
 		""},
+	 { (char *)"delete_FormFactorTruncatedSpheroid", _wrap_delete_FormFactorTruncatedSpheroid, METH_VARARGS, (char *)"\n"
+		"delete_FormFactorTruncatedSpheroid(FormFactorTruncatedSpheroid self)\n"
+		"\n"
+		"virtual FormFactorTruncatedSpheroid::~FormFactorTruncatedSpheroid()\n"
+		"\n"
+		""},
 	 { (char *)"FormFactorTruncatedSpheroid_swigregister", FormFactorTruncatedSpheroid_swigregister, METH_VARARGS, NULL},
 	 { (char *)"new_FormFactorWeighted", _wrap_new_FormFactorWeighted, METH_VARARGS, (char *)"\n"
 		"new_FormFactorWeighted() -> FormFactorWeighted\n"
-- 
GitLab