From e76c53a42056691a37a98d59eb505b7c06e5f6df Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Fri, 17 Dec 2021 14:14:20 +0100
Subject: [PATCH] mv IBornFF

---
 GUI/Model/Sample/MesoCrystalItem.cpp                 |  2 +-
 Resample/Particle/ReParticle.cpp                     |  2 +-
 Sample/HardParticle/FormFactorCone.h                 |  2 +-
 Sample/HardParticle/FormFactorCylinder.h             |  2 +-
 Sample/HardParticle/FormFactorEllipsoidalCylinder.h  |  2 +-
 Sample/HardParticle/FormFactorFullSphere.h           |  2 +-
 Sample/HardParticle/FormFactorFullSpheroid.h         |  2 +-
 Sample/HardParticle/FormFactorHemiEllipsoid.h        |  2 +-
 Sample/HardParticle/FormFactorLongBoxGauss.h         |  2 +-
 Sample/HardParticle/FormFactorLongBoxLorentz.h       |  2 +-
 Sample/HardParticle/FormFactorTruncatedSphere.h      |  2 +-
 Sample/HardParticle/FormFactorTruncatedSpheroid.h    |  2 +-
 Sample/HardParticle/IFormFactorPolyhedron.h          |  2 +-
 Sample/HardParticle/IFormFactorPrism.h               |  2 +-
 Sample/HardParticle/IProfileRipple.h                 |  2 +-
 Sample/{Scattering => Particle}/IBornFF.cpp          |  4 ++--
 Sample/{Scattering => Particle}/IBornFF.h            |  8 ++++----
 Sample/Particle/MesoCrystal.cpp                      |  2 +-
 Sample/Particle/Particle.h                           |  2 +-
 Sample/SoftParticle/FormFactorGauss.h                |  2 +-
 Sample/SoftParticle/FormFactorSphereGaussianRadius.h |  2 +-
 .../SoftParticle/FormFactorSphereLogNormalRadius.h   |  2 +-
 Wrap/Swig/libBornAgainSample.i                       |  2 +-
 auto/Wrap/doxygenSample.i                            | 12 ++++++------
 24 files changed, 33 insertions(+), 33 deletions(-)
 rename Sample/{Scattering => Particle}/IBornFF.cpp (97%)
 rename Sample/{Scattering => Particle}/IBornFF.h (94%)

diff --git a/GUI/Model/Sample/MesoCrystalItem.cpp b/GUI/Model/Sample/MesoCrystalItem.cpp
index 822bd2ee868..42644df778a 100644
--- a/GUI/Model/Sample/MesoCrystalItem.cpp
+++ b/GUI/Model/Sample/MesoCrystalItem.cpp
@@ -24,7 +24,7 @@
 #include "Sample/Particle/MesoCrystal.h"
 #include "Sample/Particle/Particle.h"
 #include "Sample/Particle/ParticleCoreShell.h"
-#include "Sample/Scattering/IBornFF.h"
+#include "Sample/Particle/IBornFF.h"
 
 namespace {
 
diff --git a/Resample/Particle/ReParticle.cpp b/Resample/Particle/ReParticle.cpp
index 2e58363b24d..9e206b75c33 100644
--- a/Resample/Particle/ReParticle.cpp
+++ b/Resample/Particle/ReParticle.cpp
@@ -17,7 +17,7 @@
 #include "Base/Vector/WavevectorInfo.h" // debug
 #include "Sample/Material/Material.h"
 #include "Sample/Material/MaterialFactoryFuncs.h"
-#include "Sample/Scattering/IBornFF.h"
+#include "Sample/Particle/IBornFF.h"
 #include "Sample/Scattering/Rotations.h"
 
 ReParticle::ReParticle(IBornFF* ff, const Material* material, const Material* ambient_material,
diff --git a/Sample/HardParticle/FormFactorCone.h b/Sample/HardParticle/FormFactorCone.h
index c274aec3f22..db498cd7d1b 100644
--- a/Sample/HardParticle/FormFactorCone.h
+++ b/Sample/HardParticle/FormFactorCone.h
@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORCONE_H
 #define BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORCONE_H
 
-#include "Sample/Scattering/IBornFF.h"
+#include "Sample/Particle/IBornFF.h"
 
 //! A conical frustum (cone truncated parallel to the base) with circular base.
 //! @ingroup hardParticle
diff --git a/Sample/HardParticle/FormFactorCylinder.h b/Sample/HardParticle/FormFactorCylinder.h
index bcbbbd2e4cf..e2018dd75ac 100644
--- a/Sample/HardParticle/FormFactorCylinder.h
+++ b/Sample/HardParticle/FormFactorCylinder.h
@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORCYLINDER_H
 #define BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORCYLINDER_H
 
-#include "Sample/Scattering/IBornFF.h"
+#include "Sample/Particle/IBornFF.h"
 
 //! A circular cylinder.
 //! @ingroup hardParticle
diff --git a/Sample/HardParticle/FormFactorEllipsoidalCylinder.h b/Sample/HardParticle/FormFactorEllipsoidalCylinder.h
index 07ed9afbdb9..a6053fddcbd 100644
--- a/Sample/HardParticle/FormFactorEllipsoidalCylinder.h
+++ b/Sample/HardParticle/FormFactorEllipsoidalCylinder.h
@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORELLIPSOIDALCYLINDER_H
 #define BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORELLIPSOIDALCYLINDER_H
 
-#include "Sample/Scattering/IBornFF.h"
+#include "Sample/Particle/IBornFF.h"
 
 //! A cylinder with elliptical base.
 //! @ingroup hardParticle
diff --git a/Sample/HardParticle/FormFactorFullSphere.h b/Sample/HardParticle/FormFactorFullSphere.h
index dab4c87d962..896b20d26f0 100644
--- a/Sample/HardParticle/FormFactorFullSphere.h
+++ b/Sample/HardParticle/FormFactorFullSphere.h
@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORFULLSPHERE_H
 #define BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORFULLSPHERE_H
 
-#include "Sample/Scattering/IBornFF.h"
+#include "Sample/Particle/IBornFF.h"
 
 //! A full sphere.
 //! @ingroup hardParticle
diff --git a/Sample/HardParticle/FormFactorFullSpheroid.h b/Sample/HardParticle/FormFactorFullSpheroid.h
index b39ecdee12e..d0469173067 100644
--- a/Sample/HardParticle/FormFactorFullSpheroid.h
+++ b/Sample/HardParticle/FormFactorFullSpheroid.h
@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORFULLSPHEROID_H
 #define BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORFULLSPHEROID_H
 
-#include "Sample/Scattering/IBornFF.h"
+#include "Sample/Particle/IBornFF.h"
 
 //! A full spheroid (an ellipsoid with two equal axes, hence with circular cross section)
 //! @ingroup hardParticle
diff --git a/Sample/HardParticle/FormFactorHemiEllipsoid.h b/Sample/HardParticle/FormFactorHemiEllipsoid.h
index c37a33f3891..872b904b75d 100644
--- a/Sample/HardParticle/FormFactorHemiEllipsoid.h
+++ b/Sample/HardParticle/FormFactorHemiEllipsoid.h
@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORHEMIELLIPSOID_H
 #define BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORHEMIELLIPSOID_H
 
-#include "Sample/Scattering/IBornFF.h"
+#include "Sample/Particle/IBornFF.h"
 
 //! An hemi ellipsoid,
 //!   obtained by truncating a full ellipsoid in the middle plane spanned by two principal axes.
diff --git a/Sample/HardParticle/FormFactorLongBoxGauss.h b/Sample/HardParticle/FormFactorLongBoxGauss.h
index 955a193068d..d9507244c64 100644
--- a/Sample/HardParticle/FormFactorLongBoxGauss.h
+++ b/Sample/HardParticle/FormFactorLongBoxGauss.h
@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORLONGBOXGAUSS_H
 #define BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORLONGBOXGAUSS_H
 
-#include "Sample/Scattering/IBornFF.h"
+#include "Sample/Particle/IBornFF.h"
 
 //! The form factor for a long rectangular box.
 //! @ingroup legacyGrating
diff --git a/Sample/HardParticle/FormFactorLongBoxLorentz.h b/Sample/HardParticle/FormFactorLongBoxLorentz.h
index 37c82a172fb..7e270b917cc 100644
--- a/Sample/HardParticle/FormFactorLongBoxLorentz.h
+++ b/Sample/HardParticle/FormFactorLongBoxLorentz.h
@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORLONGBOXLORENTZ_H
 #define BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORLONGBOXLORENTZ_H
 
-#include "Sample/Scattering/IBornFF.h"
+#include "Sample/Particle/IBornFF.h"
 
 //! The form factor for a long rectangular box.
 //! @ingroup legacyGrating
diff --git a/Sample/HardParticle/FormFactorTruncatedSphere.h b/Sample/HardParticle/FormFactorTruncatedSphere.h
index 536cf76d375..f0998a20919 100644
--- a/Sample/HardParticle/FormFactorTruncatedSphere.h
+++ b/Sample/HardParticle/FormFactorTruncatedSphere.h
@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORTRUNCATEDSPHERE_H
 #define BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORTRUNCATEDSPHERE_H
 
-#include "Sample/Scattering/IBornFF.h"
+#include "Sample/Particle/IBornFF.h"
 
 //! A truncated Sphere.
 //! @ingroup hardParticle
diff --git a/Sample/HardParticle/FormFactorTruncatedSpheroid.h b/Sample/HardParticle/FormFactorTruncatedSpheroid.h
index 23858012443..7a19fb99b1e 100644
--- a/Sample/HardParticle/FormFactorTruncatedSpheroid.h
+++ b/Sample/HardParticle/FormFactorTruncatedSpheroid.h
@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORTRUNCATEDSPHEROID_H
 #define BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORTRUNCATEDSPHEROID_H
 
-#include "Sample/Scattering/IBornFF.h"
+#include "Sample/Particle/IBornFF.h"
 
 //! A truncated spheroid.
 //! An ellipsoid with two equal axis, truncated by a plane perpendicular to the third axis.
diff --git a/Sample/HardParticle/IFormFactorPolyhedron.h b/Sample/HardParticle/IFormFactorPolyhedron.h
index 3ab3e01ef52..cb3cc4f6005 100644
--- a/Sample/HardParticle/IFormFactorPolyhedron.h
+++ b/Sample/HardParticle/IFormFactorPolyhedron.h
@@ -16,7 +16,7 @@
 #ifndef BORNAGAIN_SAMPLE_HARDPARTICLE_IFORMFACTORPOLYHEDRON_H
 #define BORNAGAIN_SAMPLE_HARDPARTICLE_IFORMFACTORPOLYHEDRON_H
 
-#include "Sample/Scattering/IBornFF.h"
+#include "Sample/Particle/IBornFF.h"
 #include "Sample/ff/PolyhedralTopology.h"
 #include <memory>
 
diff --git a/Sample/HardParticle/IFormFactorPrism.h b/Sample/HardParticle/IFormFactorPrism.h
index 330fe2cc8a9..9e8cc7e8727 100644
--- a/Sample/HardParticle/IFormFactorPrism.h
+++ b/Sample/HardParticle/IFormFactorPrism.h
@@ -16,7 +16,7 @@
 #ifndef BORNAGAIN_SAMPLE_HARDPARTICLE_IFORMFACTORPRISM_H
 #define BORNAGAIN_SAMPLE_HARDPARTICLE_IFORMFACTORPRISM_H
 
-#include "Sample/Scattering/IBornFF.h"
+#include "Sample/Particle/IBornFF.h"
 #include <memory>
 
 namespace ff {
diff --git a/Sample/HardParticle/IProfileRipple.h b/Sample/HardParticle/IProfileRipple.h
index f480ed09f0c..429d2b4f52f 100644
--- a/Sample/HardParticle/IProfileRipple.h
+++ b/Sample/HardParticle/IProfileRipple.h
@@ -16,7 +16,7 @@
 #ifndef BORNAGAIN_SAMPLE_HARDPARTICLE_IPROFILERIPPLE_H
 #define BORNAGAIN_SAMPLE_HARDPARTICLE_IPROFILERIPPLE_H
 
-#include "Sample/Scattering/IBornFF.h"
+#include "Sample/Particle/IBornFF.h"
 
 //! Base class for form factors with a cosine ripple profile in the yz plane.
 
diff --git a/Sample/Scattering/IBornFF.cpp b/Sample/Particle/IBornFF.cpp
similarity index 97%
rename from Sample/Scattering/IBornFF.cpp
rename to Sample/Particle/IBornFF.cpp
index 629d033cd2c..00f2b4470d9 100644
--- a/Sample/Scattering/IBornFF.cpp
+++ b/Sample/Particle/IBornFF.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/Scattering/IBornFF.cpp
+//! @file      Sample/Particle/IBornFF.cpp
 //! @brief     Implements interface class IBornFF.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "Sample/Scattering/IBornFF.h"
+#include "Sample/Particle/IBornFF.h"
 #include "Base/Util/Algorithms.h"
 #include "Base/Util/PyFmt.h"
 #include "Base/Util/StringUtils.h"
diff --git a/Sample/Scattering/IBornFF.h b/Sample/Particle/IBornFF.h
similarity index 94%
rename from Sample/Scattering/IBornFF.h
rename to Sample/Particle/IBornFF.h
index dd06b6e04a8..29ce8cd5b03 100644
--- a/Sample/Scattering/IBornFF.h
+++ b/Sample/Particle/IBornFF.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/Scattering/IBornFF.h
+//! @file      Sample/Particle/IBornFF.h
 //! @brief     Defines interface IDecoratableBorn.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -13,8 +13,8 @@
 //  ************************************************************************************************
 
 #ifndef USER_API
-#ifndef BORNAGAIN_SAMPLE_SCATTERING_IBORNFF_H
-#define BORNAGAIN_SAMPLE_SCATTERING_IBORNFF_H
+#ifndef BORNAGAIN_SAMPLE_PARTICLE_IBORNFF_H
+#define BORNAGAIN_SAMPLE_PARTICLE_IBORNFF_H
 
 #include "Sample/Scattering/ISampleNode.h"
 #include <Eigen/Core>
@@ -85,5 +85,5 @@ protected:
     NodeMeta m_nodeMeta; //!< stored for python code generation
 };
 
-#endif // BORNAGAIN_SAMPLE_SCATTERING_IBORNFF_H
+#endif // BORNAGAIN_SAMPLE_PARTICLE_IBORNFF_H
 #endif // USER_API
diff --git a/Sample/Particle/MesoCrystal.cpp b/Sample/Particle/MesoCrystal.cpp
index cf93321ceeb..ff27ce9cd44 100644
--- a/Sample/Particle/MesoCrystal.cpp
+++ b/Sample/Particle/MesoCrystal.cpp
@@ -15,7 +15,7 @@
 #include "Sample/Particle/MesoCrystal.h"
 #include "Base/Util/Assert.h"
 #include "Sample/Particle/Crystal.h"
-#include "Sample/Scattering/IBornFF.h"
+#include "Sample/Particle/IBornFF.h"
 #include "Sample/Scattering/Rotations.h"
 
 MesoCrystal::MesoCrystal(Crystal* crystal, IBornFF* formfactor)
diff --git a/Sample/Particle/Particle.h b/Sample/Particle/Particle.h
index d991f55a101..474ccd97754 100644
--- a/Sample/Particle/Particle.h
+++ b/Sample/Particle/Particle.h
@@ -17,7 +17,7 @@
 
 #include "Sample/Material/Material.h"
 #include "Sample/Particle/IParticle.h"
-#include "Sample/Scattering/IBornFF.h"
+#include "Sample/Particle/IBornFF.h"
 
 //! A particle with a form factor and refractive index.
 //! @ingroup samples
diff --git a/Sample/SoftParticle/FormFactorGauss.h b/Sample/SoftParticle/FormFactorGauss.h
index 186a0d7070a..f544d39cb30 100644
--- a/Sample/SoftParticle/FormFactorGauss.h
+++ b/Sample/SoftParticle/FormFactorGauss.h
@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_SAMPLE_SOFTPARTICLE_FORMFACTORGAUSS_H
 #define BORNAGAIN_SAMPLE_SOFTPARTICLE_FORMFACTORGAUSS_H
 
-#include "Sample/Scattering/IBornFF.h"
+#include "Sample/Particle/IBornFF.h"
 
 //! The form factor of a Gaussian sphere.
 //! @ingroup softParticle
diff --git a/Sample/SoftParticle/FormFactorSphereGaussianRadius.h b/Sample/SoftParticle/FormFactorSphereGaussianRadius.h
index 5c138df9ca3..d8392fe706f 100644
--- a/Sample/SoftParticle/FormFactorSphereGaussianRadius.h
+++ b/Sample/SoftParticle/FormFactorSphereGaussianRadius.h
@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_SAMPLE_SOFTPARTICLE_FORMFACTORSPHEREGAUSSIANRADIUS_H
 #define BORNAGAIN_SAMPLE_SOFTPARTICLE_FORMFACTORSPHEREGAUSSIANRADIUS_H
 
-#include "Sample/Scattering/IBornFF.h"
+#include "Sample/Particle/IBornFF.h"
 #include <memory>
 
 //! A sphere with gaussian radius distribution.
diff --git a/Sample/SoftParticle/FormFactorSphereLogNormalRadius.h b/Sample/SoftParticle/FormFactorSphereLogNormalRadius.h
index 318219cdbda..dac3bde4325 100644
--- a/Sample/SoftParticle/FormFactorSphereLogNormalRadius.h
+++ b/Sample/SoftParticle/FormFactorSphereLogNormalRadius.h
@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_SAMPLE_SOFTPARTICLE_FORMFACTORSPHERELOGNORMALRADIUS_H
 #define BORNAGAIN_SAMPLE_SOFTPARTICLE_FORMFACTORSPHERELOGNORMALRADIUS_H
 
-#include "Sample/Scattering/IBornFF.h"
+#include "Sample/Particle/IBornFF.h"
 #include <memory>
 
 //! A sphere with log normal radius distribution.
diff --git a/Wrap/Swig/libBornAgainSample.i b/Wrap/Swig/libBornAgainSample.i
index f14c80be9e7..e5ec1920031 100644
--- a/Wrap/Swig/libBornAgainSample.i
+++ b/Wrap/Swig/libBornAgainSample.i
@@ -117,7 +117,7 @@
 %include "Sample/Material/MaterialFactoryFuncs.h"
 
 %include "Sample/Scattering/ISampleNode.h"
-%include "Sample/Scattering/IBornFF.h"
+%include "Sample/Particle/IBornFF.h"
 %include "Sample/Scattering/Rotations.h"
 
 %include "Sample/Particle/Crystal.h"
diff --git a/auto/Wrap/doxygenSample.i b/auto/Wrap/doxygenSample.i
index dbc80124e01..129336f9c16 100644
--- a/auto/Wrap/doxygenSample.i
+++ b/auto/Wrap/doxygenSample.i
@@ -5675,6 +5675,12 @@ magnetization (in A/m)
 // File: Crystal_8h.xml
 
 
+// File: IBornFF_8cpp.xml
+
+
+// File: IBornFF_8h.xml
+
+
 // File: IParticle_8cpp.xml
 
 
@@ -5705,12 +5711,6 @@ magnetization (in A/m)
 // File: ParticleCoreShell_8h.xml
 
 
-// File: IBornFF_8cpp.xml
-
-
-// File: IBornFF_8h.xml
-
-
 // File: ISampleNode_8cpp.xml
 
 
-- 
GitLab