wip

Sample/CMakeLists.txt

@@ -21,8 +21,10 @@ set(${lib}_LIBRARY ${lib} PARENT_SCOPE)
 target_link_libraries(${lib}
     PUBLIC
     ${BornAgainParam_LIBRARY}
+    ${formfactor_LIBRARY}
     )
 target_include_directories(${lib}
     PUBLIC
+    ${formfactor_INCLUDE_DIR}
     ${CMAKE_SOURCE_DIR}
     )

Sample/HardParticle/FormFactorAnisoPyramid.cpp

@@ -16,7 +16,7 @@
 #include "Base/Math/Constants.h"
 #include "Base/Math/Functions.h"
 
-const PolyhedralTopology FormFactorAnisoPyramid::topology = {{{{3, 2, 1, 0}, true},
+const ff::PolyhedralTopology FormFactorAnisoPyramid::topology = {{{{3, 2, 1, 0}, true},
                                                               {{0, 1, 5, 4}, false},
                                                               {{1, 2, 6, 5}, false},
                                                               {{2, 3, 7, 6}, false},

Sample/HardParticle/FormFactorAnisoPyramid.h

@@ -46,7 +46,7 @@ protected:
     void onChange() override;
 
 private:
-    static const PolyhedralTopology topology;
+    static const ff::PolyhedralTopology topology;
 
     const double& m_length;
     const double& m_width;

Sample/HardParticle/FormFactorCantellatedCube.cpp

@@ -14,7 +14,7 @@
 
 #include "Sample/HardParticle/FormFactorCantellatedCube.h"
 
-const PolyhedralTopology FormFactorCantellatedCube::topology = {
+const ff::PolyhedralTopology FormFactorCantellatedCube::topology = {
     {
         /*  0 */ {{0, 1, 2, 3}, true},
         /*  1 */ {{0, 8, 5, 1}, true},

Sample/HardParticle/FormFactorCantellatedCube.h

@@ -41,7 +41,7 @@ protected:
     void onChange() override;
 
 private:
-    static const PolyhedralTopology topology;
+    static const ff::PolyhedralTopology topology;
     const double& m_length;
     const double& m_removed_length;
 };

Sample/HardParticle/FormFactorCone6.cpp

@@ -16,7 +16,7 @@
 #include "Base/Math/Constants.h"
 #include "Base/Math/Functions.h"
 
-const PolyhedralTopology FormFactorCone6::topology = {{{{5, 4, 3, 2, 1, 0}, true},
+const ff::PolyhedralTopology FormFactorCone6::topology = {{{{5, 4, 3, 2, 1, 0}, true},
                                                        {{0, 1, 7, 6}, false},
                                                        {{1, 2, 8, 7}, false},
                                                        {{2, 3, 9, 8}, false},

Sample/HardParticle/FormFactorCone6.h

@@ -45,7 +45,7 @@ protected:
     void onChange() override;
 
 private:
-    static const PolyhedralTopology topology;
+    static const ff::PolyhedralTopology topology;
     const double& m_base_edge;
     const double& m_height;
     const double& m_alpha;

Sample/HardParticle/FormFactorCuboctahedron.cpp

@@ -17,7 +17,7 @@
 #include "Base/Math/Functions.h"
 #include "Sample/HardParticle/FormFactorPyramid.h"
 
-const PolyhedralTopology FormFactorCuboctahedron::topology = {{{{3, 2, 1, 0}, true},
+const ff::PolyhedralTopology FormFactorCuboctahedron::topology = {{{{3, 2, 1, 0}, true},
                                                                {{0, 1, 5, 4}, false},
                                                                {{1, 2, 6, 5}, false},
                                                                {{2, 3, 7, 6}, false},

Sample/HardParticle/FormFactorCuboctahedron.h

@@ -46,7 +46,7 @@ protected:
     void onChange() override;
 
 private:
-    static const PolyhedralTopology topology;
+    static const ff::PolyhedralTopology topology;
 
     const double& m_length;
     const double& m_height;

Sample/HardParticle/FormFactorDodecahedron.cpp

@@ -14,7 +14,7 @@
 
 #include "Sample/HardParticle/FormFactorDodecahedron.h"
 
-const PolyhedralTopology FormFactorDodecahedron::topology = {{// bottom:
+const ff::PolyhedralTopology FormFactorDodecahedron::topology = {{// bottom:
                                                               {{0, 4, 3, 2, 1}, false},
                                                               // lower ring:
                                                               {{0, 5, 12, 9, 4}, false},

Sample/HardParticle/FormFactorDodecahedron.h

@@ -37,7 +37,7 @@ protected:
     void onChange() override;
 
 private:
-    static const PolyhedralTopology topology;
+    static const ff::PolyhedralTopology topology;
     const double& m_edge;
 };
 

Sample/HardParticle/FormFactorIcosahedron.cpp

@@ -14,7 +14,7 @@
 
 #include "Sample/HardParticle/FormFactorIcosahedron.h"
 
-const PolyhedralTopology FormFactorIcosahedron::topology = {{// bottom:
+const ff::PolyhedralTopology FormFactorIcosahedron::topology = {{// bottom:
                                                              {{0, 2, 1}, false},
                                                              // 1st row:
                                                              {{0, 5, 2}, false},

Sample/HardParticle/FormFactorIcosahedron.h

@@ -37,7 +37,7 @@ protected:
     void onChange() override;
 
 private:
-    static const PolyhedralTopology topology;
+    static const ff::PolyhedralTopology topology;
     const double& m_edge;
 };
 

Sample/HardParticle/FormFactorPyramid.cpp

@@ -16,7 +16,7 @@
 #include "Base/Math/Constants.h"
 #include "Base/Math/Functions.h"
 
-const PolyhedralTopology FormFactorPyramid::topology = {{
+const ff::PolyhedralTopology FormFactorPyramid::topology = {{
                                                             {{3, 2, 1, 0}, true}, // TODO -> true
                                                             {{0, 1, 5, 4}, false},
                                                             {{1, 2, 6, 5}, false},

Sample/HardParticle/FormFactorPyramid.h

@@ -45,7 +45,7 @@ protected:
     void onChange() override;
 
 private:
-    static const PolyhedralTopology topology;
+    static const ff::PolyhedralTopology topology;
 
     const double& m_base_edge;
     const double& m_height;

Sample/HardParticle/FormFactorTetrahedron.cpp

@@ -16,7 +16,7 @@
 #include "Base/Math/Constants.h"
 #include "Base/Math/Functions.h"
 
-const PolyhedralTopology FormFactorTetrahedron::topology = {{{{2, 1, 0}, false},
+const ff::PolyhedralTopology FormFactorTetrahedron::topology = {{{{2, 1, 0}, false},
                                                              {{0, 1, 4, 3}, false},
                                                              {{1, 2, 5, 4}, false},
                                                              {{2, 0, 3, 5}, false},

Sample/HardParticle/FormFactorTetrahedron.h

@@ -45,7 +45,7 @@ protected:
     void onChange() override;
 
 private:
-    static const PolyhedralTopology topology;
+    static const ff::PolyhedralTopology topology;
     const double& m_base_edge;
     const double& m_height;
     const double& m_alpha;

Sample/HardParticle/FormFactorTruncatedCube.cpp

@@ -14,7 +14,7 @@
 
 #include "Sample/HardParticle/FormFactorTruncatedCube.h"
 
-const PolyhedralTopology FormFactorTruncatedCube::topology = {
+const ff::PolyhedralTopology FormFactorTruncatedCube::topology = {
     {{{0, 1, 7, 6, 9, 10, 4, 3}, true},
      {{0, 2, 1}, false},
      {{3, 4, 5}, false},

Sample/HardParticle/FormFactorTruncatedCube.h

@@ -41,7 +41,7 @@ protected:
     void onChange() override;
 
 private:
-    static const PolyhedralTopology topology;
+    static const ff::PolyhedralTopology topology;
     const double& m_length;
     const double& m_removed_length;
 };

Sample/HardParticle/IFormFactorPolyhedron.cpp

@@ -17,7 +17,7 @@
 //! "Form factor (Fourier shape transform) of polygon and polyhedron."
 
 #include "Sample/HardParticle/IFormFactorPolyhedron.h"
-#include "Sample/LibFF/Polyhedron.h"
+#include <ff/Polyhedron.h>
 
 // #ifdef ALGORITHM_DIAGNOSTIC // TODO restore
 // void IFormFactorPolyhedron::setLimits(double _q, int _n)
@@ -37,10 +37,10 @@ IFormFactorPolyhedron::~IFormFactorPolyhedron() = default;
 
 //! Called by child classes to set faces and other internal variables.
 
-void IFormFactorPolyhedron::setPolyhedron(const PolyhedralTopology& topology, double z_bottom,
+void IFormFactorPolyhedron::setPolyhedron(const ff::PolyhedralTopology& topology, double z_bottom,
                                           const std::vector<R3>& vertices)
 {
-    pimpl = std::make_unique<Polyhedron>(topology, z_bottom, vertices);
+    pimpl = std::make_unique<ff::Polyhedron>(topology, z_bottom, vertices);
 }
 
 double IFormFactorPolyhedron::bottomZ(const IRotation& rotation) const