[io2] code cleanup (include order when using pi) ()

Merging branch 'io2'  into 'r21'.

See merge request !1809

Sample/HardParticle/Cone.cpp

@@ -14,13 +14,13 @@
 
 #include "Sample/HardParticle/Cone.h"
 #include "Base/Math/Bessel.h"
-#include <numbers>
-using std::numbers::pi;
 #include "Base/Math/Functions.h"
 #include "Base/Math/IntegratorGK.h"
 #include "Base/Util/Assert.h"
 #include "Sample/Shapes/DoubleEllipse.h"
 #include <limits>
+#include <numbers>
+using std::numbers::pi;
 
 Cone::Cone(const std::vector<double> P)
     : IFormFactor(P)

Sample/HardParticle/Cylinder.cpp

@@ -14,11 +14,11 @@
 
 #include "Sample/HardParticle/Cylinder.h"
 #include "Base/Math/Bessel.h"
-#include <numbers>
-using std::numbers::pi;
 #include "Base/Math/Functions.h"
 #include "Base/Util/Assert.h"
 #include "Sample/Shapes/DoubleEllipse.h"
+#include <numbers>
+using std::numbers::pi;
 
 Cylinder::Cylinder(const std::vector<double> P)
     : IFormFactor(P)

Sample/HardParticle/EllipsoidalCylinder.cpp

@@ -14,11 +14,11 @@
 
 #include "Sample/HardParticle/EllipsoidalCylinder.h"
 #include "Base/Math/Bessel.h"
-#include <numbers>
-using std::numbers::pi;
 #include "Base/Math/Functions.h"
 #include "Base/Util/Assert.h"
 #include "Sample/Shapes/DoubleEllipse.h"
+#include <numbers>
+using std::numbers::pi;
 
 EllipsoidalCylinder::EllipsoidalCylinder(const std::vector<double> P)
     : IFormFactor(P)

Sample/HardParticle/HemiEllipsoid.cpp

@@ -14,12 +14,12 @@
 
 #include "Sample/HardParticle/HemiEllipsoid.h"
 #include "Base/Math/Bessel.h"
-#include <numbers>
-using std::numbers::pi;
 #include "Base/Math/IntegratorGK.h"
 #include "Base/Util/Assert.h"
 #include "Sample/Shapes/TruncatedEllipsoidNet.h"
 #include <limits>
+#include <numbers>
+using std::numbers::pi;
 
 HemiEllipsoid::HemiEllipsoid(const std::vector<double> P)
     : IFormFactor(P)

Sample/HardParticle/HorizontalCylinder.cpp

@@ -14,12 +14,12 @@
 
 #include "Sample/HardParticle/HorizontalCylinder.h"
 #include "Base/Math/Bessel.h"
-#include <numbers>
-using std::numbers::pi;
 #include "Base/Math/Functions.h"
 #include "Base/Math/IntegratorGK.h"
 #include "Base/Util/Assert.h"
 #include "Sample/Shapes/DoubleEllipse.h"
+#include <numbers>
+using std::numbers::pi;
 
 HorizontalCylinder::HorizontalCylinder(const std::vector<double> P)
     : IFormFactor(P)

Sample/HardParticle/Sphere.cpp

@@ -13,13 +13,13 @@
 //  ************************************************************************************************
 
 #include "Sample/HardParticle/Sphere.h"
-#include <numbers>
-using std::numbers::pi;
 #include "Base/Types/Span.h"
 #include "Base/Util/Assert.h"
 #include "Sample/HardParticle/TruncatedSphere.h"
 #include "Sample/LibFF/SomeFormFactors.h"
 #include "Sample/Scattering/Rotations.h"
+#include <numbers>
+using std::numbers::pi;
 
 Sphere::Sphere(const std::vector<double> P, bool position_at_center)
     : IFormFactor(P)

Sample/HardParticle/Spheroid.cpp

@@ -13,13 +13,13 @@
 //  ************************************************************************************************
 
 #include "Sample/HardParticle/Spheroid.h"
-#include <numbers>
-using std::numbers::pi;
 #include "Base/Math/Functions.h"
 #include "Base/Util/Assert.h"
 #include "Sample/HardParticle/TruncatedSpheroid.h"
 #include "Sample/Shapes/TruncatedEllipsoidNet.h"
 #include <limits>
+#include <numbers>
+using std::numbers::pi;
 
 Spheroid::Spheroid(const std::vector<double> P)
     : IFormFactor(P)

Sample/HardParticle/TruncatedSphere.cpp

@@ -14,12 +14,12 @@
 
 #include "Sample/HardParticle/TruncatedSphere.h"
 #include "Base/Math/Bessel.h"
-#include <numbers>
-using std::numbers::pi;
 #include "Base/Math/IntegratorGK.h"
 #include "Base/Util/Assert.h"
 #include "Sample/Shapes/TruncatedEllipsoidNet.h"
 #include <limits>
+#include <numbers>
+using std::numbers::pi;
 
 TruncatedSphere::TruncatedSphere(const std::vector<double> P)
     : IFormFactor(P)

Sample/HardParticle/TruncatedSpheroid.cpp

@@ -14,12 +14,12 @@
 
 #include "Sample/HardParticle/TruncatedSpheroid.h"
 #include "Base/Math/Bessel.h"
-#include <numbers>
-using std::numbers::pi;
 #include "Base/Math/IntegratorGK.h"
 #include "Base/Util/Assert.h"
 #include "Sample/Shapes/TruncatedEllipsoidNet.h"
 #include <limits>
+#include <numbers>
+using std::numbers::pi;
 
 TruncatedSpheroid::TruncatedSpheroid(const std::vector<double> P)
     : IFormFactor(P)

Sample/SoftParticle/Gauss.cpp

@@ -13,12 +13,12 @@
 //  ************************************************************************************************
 
 #include "Sample/SoftParticle/Gauss.h"
-#include <numbers>
-using std::numbers::pi;
 #include "Base/Util/Assert.h"
 #include "Sample/Shapes/BoxNet.h"
 #include "Sample/Shapes/TruncatedEllipsoidNet.h"
 #include <limits>
+#include <numbers>
+using std::numbers::pi;
 
 GaussSphere::GaussSphere(const std::vector<double> P)
     : IFormFactor(P)