rename -> IntegratorGK (Gauss-Kronrod) to disambiguate from

ROOT::Math::Integrator

Base/Math/Integrator.cpp → Base/Math/IntegratorGK.cpp

@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Base/Math/Integrator.cpp
+//! @file      Base/Math/IntegratorGK.cpp
 //! @brief     Implements classes RealIntegrator, ComplexIntegrator.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "Base/Math/Integrator.h"
+#include "Base/Math/IntegratorGK.h"
 
 RealIntegrator::RealIntegrator()
     : m_gsl_f{m_Cfunction, nullptr}, m_workspace{gsl_integration_workspace_alloc(200)} {}

Base/Math/Integrator.h → Base/Math/IntegratorGK.h

@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Base/Math/Integrator.h
+//! @file      Base/Math/IntegratorGK.h
 //! @brief     Defines classes RealIntegrator, ComplexIntegrator.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_BASE_MATH_INTEGRATOR_H
-#define BORNAGAIN_BASE_MATH_INTEGRATOR_H
+#ifndef BORNAGAIN_BASE_MATH_INTEGRATORGK_H
+#define BORNAGAIN_BASE_MATH_INTEGRATORGK_H
 
 #include "Base/Types/Complex.h"
 #include <functional>
@@ -44,4 +44,4 @@ private:
     RealIntegrator imagPart;
 };
 
-#endif // BORNAGAIN_BASE_MATH_INTEGRATOR_H
+#endif // BORNAGAIN_BASE_MATH_INTEGRATORGK_H

Sample/Aggregate/InterferenceFunction2DLattice.cpp

@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "Sample/Aggregate/InterferenceFunction2DLattice.h"
-#include "Base/Math/Integrator.h"
+#include "Base/Math/IntegratorGK.h"
 #include "Param/Base/RealParameter.h"
 #include <algorithm>
 

Sample/Aggregate/InterferenceFunction2DParaCrystal.cpp

@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "Sample/Aggregate/InterferenceFunction2DParaCrystal.h"
-#include "Base/Math/Integrator.h"
+#include "Base/Math/IntegratorGK.h"
 #include "Param/Base/ParameterPool.h"
 #include "Param/Base/RealParameter.h"
 #include <limits>

Sample/Aggregate/InterferenceFunction2DSuperLattice.cpp

@@ -15,7 +15,7 @@
 #include "Sample/Aggregate/InterferenceFunction2DSuperLattice.h"
 #include "Base/Math/Constants.h"
 #include "Base/Math/Functions.h"
-#include "Base/Math/Integrator.h"
+#include "Base/Math/IntegratorGK.h"
 #include "Param/Base/RealParameter.h"
 #include "Sample/Aggregate/InterferenceFunctionNone.h"
 

Sample/Aggregate/InterferenceFunctionFinite2DLattice.cpp

@@ -15,7 +15,7 @@
 #include "Sample/Aggregate/InterferenceFunctionFinite2DLattice.h"
 #include "Base/Math/Constants.h"
 #include "Base/Math/Functions.h"
-#include "Base/Math/Integrator.h"
+#include "Base/Math/IntegratorGK.h"
 #include "Param/Base/RealParameter.h"
 
 #include <limits>

Sample/Aggregate/InterferenceFunctionHardDisk.cpp

@@ -14,7 +14,7 @@
 
 #include "Sample/Aggregate/InterferenceFunctionHardDisk.h"
 #include "Base/Math/Bessel.h"
-#include "Base/Math/Integrator.h"
+#include "Base/Math/IntegratorGK.h"
 #include "Param/Base/RealParameter.h"
 #include <cmath>
 

Sample/Correlations/FTDistributions2D.cpp

@@ -14,7 +14,7 @@
 
 #include "Sample/Correlations/FTDistributions2D.h"
 #include "Base/Math/Bessel.h"
-#include "Base/Math/Integrator.h"
+#include "Base/Math/IntegratorGK.h"
 #include <limits>
 
 //  ************************************************************************************************

Sample/Correlations/IPeakShape.cpp

@@ -15,7 +15,7 @@
 #include "Sample/Correlations/IPeakShape.h"
 #include "Base/Math/Bessel.h"
 #include "Base/Math/Constants.h"
-#include "Base/Math/Integrator.h"
+#include "Base/Math/IntegratorGK.h"
 #include <limits>
 
 namespace {

Sample/HardParticle/FormFactorCone.cpp

@@ -16,7 +16,7 @@
 #include "Base/Math/Bessel.h"
 #include "Base/Math/Constants.h"
 #include "Base/Math/Functions.h"
-#include "Base/Math/Integrator.h"
+#include "Base/Math/IntegratorGK.h"
 #include "Sample/Shapes/DoubleEllipse.h"
 #include <limits>
 

Sample/HardParticle/FormFactorHemiEllipsoid.cpp

@@ -15,7 +15,7 @@
 #include "Sample/HardParticle/FormFactorHemiEllipsoid.h"
 #include "Base/Math/Bessel.h"
 #include "Base/Math/Constants.h"
-#include "Base/Math/Integrator.h"
+#include "Base/Math/IntegratorGK.h"
 #include "Sample/Shapes/TruncatedEllipsoid.h"
 #include <limits>
 

Sample/HardParticle/FormFactorTruncatedSphere.cpp

@@ -15,7 +15,7 @@
 #include "Sample/HardParticle/FormFactorTruncatedSphere.h"
 #include "Base/Math/Bessel.h"
 #include "Base/Math/Constants.h"
-#include "Base/Math/Integrator.h"
+#include "Base/Math/IntegratorGK.h"
 #include "Sample/Shapes/TruncatedEllipsoid.h"
 #include <limits>
 

Sample/HardParticle/FormFactorTruncatedSpheroid.cpp

@@ -15,7 +15,7 @@
 #include "Sample/HardParticle/FormFactorTruncatedSpheroid.h"
 #include "Base/Math/Bessel.h"
 #include "Base/Math/Constants.h"
-#include "Base/Math/Integrator.h"
+#include "Base/Math/IntegratorGK.h"
 #include "Sample/Shapes/TruncatedEllipsoid.h"
 #include <limits>
 

Sample/HardParticle/Ripples.cpp

@@ -15,7 +15,7 @@
 #include "Sample/HardParticle/Ripples.h"
 #include "Base/Math/Constants.h"
 #include "Base/Math/Functions.h"
-#include "Base/Math/Integrator.h"
+#include "Base/Math/IntegratorGK.h"
 
 complex_t ripples::factor_x_box(complex_t q, double r) {
     return r * Math::sinc(q * r / 2.0);