diff --git a/Resample/Coherence/FFSum.cpp b/Resample/Coherence/FFSum.cpp
index 2a8598cb38a59d3bddd22fb281c136d7d9f5f92b..ed559ca2560d16c1b63837dc4dbcbf114596ba21 100644
--- a/Resample/Coherence/FFSum.cpp
+++ b/Resample/Coherence/FFSum.cpp
@@ -14,12 +14,12 @@
#include "Resample/Coherence/FFSum.h"
#include "Base/Utils/Assert.h"
-#include "Resample/FFCompute/ComputeDWBA.h"
-#include "Resample/FFCompute/ComputeDWBAPol.h"
+#include "Resample/DWBA/DWBA_Pol.h"
+#include "Resample/DWBA/DWBA_Scalar.h"
#include "Sample/Scattering/IFormFactor.h"
CoherentFFSum::CoherentFFSum(double abundance,
- const std::vector<std::shared_ptr<const IComputeFF>>& terms)
+ const std::vector<std::shared_ptr<const IDWBA>>& terms)
: m_abundance(abundance), m_terms(terms)
{
}
@@ -28,7 +28,7 @@ complex_t CoherentFFSum::summedFF(const DiffuseElement& ele) const
{
complex_t result = 0.;
for (const auto& term : m_terms) {
- const auto* computer = dynamic_cast<const ComputeDWBA*>(term.get());
+ const auto* computer = dynamic_cast<const DWBA_Scalar*>(term.get());
ASSERT(computer);
result += computer->coherentFF(ele);
}
@@ -39,7 +39,7 @@ Eigen::Matrix2cd CoherentFFSum::summedPolFF(const DiffuseElement& ele) const
{
Eigen::Matrix2cd result = Eigen::Matrix2cd::Zero();
for (const auto& term : m_terms) {
- const auto* computer = dynamic_cast<const ComputeDWBAPol*>(term.get());
+ const auto* computer = dynamic_cast<const DWBA_Pol*>(term.get());
ASSERT(computer);
result += computer->coherentPolFF(ele);
}
diff --git a/Resample/Coherence/FFSum.h b/Resample/Coherence/FFSum.h
index d84cb778bb840c02226acf4cec7ce45bd874a7cf..2725f520620361ac6608ea36666bc752180d28fc 100644
--- a/Resample/Coherence/FFSum.h
+++ b/Resample/Coherence/FFSum.h
@@ -25,14 +25,14 @@
#include <memory>
#include <vector>
-class IComputeFF;
+class IDWBA;
class DiffuseElement;
//! Information about particle form factor and abundance.
class CoherentFFSum {
public:
- CoherentFFSum(double abundance, const std::vector<std::shared_ptr<const IComputeFF>>& terms);
+ CoherentFFSum(double abundance, const std::vector<std::shared_ptr<const IDWBA>>& terms);
complex_t summedFF(const DiffuseElement& ele) const;
Eigen::Matrix2cd summedPolFF(const DiffuseElement& ele) const;
@@ -42,7 +42,7 @@ public:
private:
const double m_abundance;
- const std::vector<std::shared_ptr<const IComputeFF>> m_terms;
+ const std::vector<std::shared_ptr<const IDWBA>> m_terms;
};
#endif // BORNAGAIN_RESAMPLE_COHERENCE_FFSUM_H
diff --git a/Resample/FFCompute/ComputeDWBAPol.cpp b/Resample/DWBA/DWBA_Pol.cpp
similarity index 96%
rename from Resample/FFCompute/ComputeDWBAPol.cpp
rename to Resample/DWBA/DWBA_Pol.cpp
index 4f32e3dfdd785f31ea39e762b0ec4df841501d46..032adc0f47598f578f7ca095f26674eae65975b5 100644
--- a/Resample/FFCompute/ComputeDWBAPol.cpp
+++ b/Resample/DWBA/DWBA_Pol.cpp
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Resample/FFCompute/ComputeDWBAPol.cpp
-//! @brief Defines class ComputeDWBAPol.
+//! @file Resample/DWBA/DWBA_Pol.cpp
+//! @brief Defines class DWBA_Pol.
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "Resample/FFCompute/ComputeDWBAPol.h"
+#include "Resample/DWBA/DWBA_Pol.h"
#include "Base/Vector/WavevectorInfo.h"
#include "Resample/Element/DiffuseElement.h"
#include "Resample/Flux/IFlux.h"
@@ -29,12 +29,12 @@ complex_t VecMatVecProduct(const Eigen::Vector2cd& vec1, const Eigen::Matrix2cd&
} // namespace
-ComputeDWBAPol::ComputeDWBAPol(const IFormFactor& ff, size_t i_layer) : IComputeFF(ff, i_layer) {}
-ComputeDWBAPol::ComputeDWBAPol(const IFormFactor& ff) : IComputeFF(ff) {}
+DWBA_Pol::DWBA_Pol(const IFormFactor& ff, size_t i_layer) : IDWBA(ff, i_layer) {}
+DWBA_Pol::DWBA_Pol(const IFormFactor& ff) : IDWBA(ff) {}
-ComputeDWBAPol::~ComputeDWBAPol() = default;
+DWBA_Pol::~DWBA_Pol() = default;
-Eigen::Matrix2cd ComputeDWBAPol::coherentPolFF(const DiffuseElement& ele) const
+Eigen::Matrix2cd DWBA_Pol::coherentPolFF(const DiffuseElement& ele) const
{
const WavevectorInfo& wavevectors = ele.wavevectorInfo();
diff --git a/Resample/FFCompute/ComputeDWBAPol.h b/Resample/DWBA/DWBA_Pol.h
similarity index 64%
rename from Resample/FFCompute/ComputeDWBAPol.h
rename to Resample/DWBA/DWBA_Pol.h
index 1f0eb425485622e672ebb675988986d59456d0ae..dfb454274f23636b4caa9803fa86c396da6109fa 100644
--- a/Resample/FFCompute/ComputeDWBAPol.h
+++ b/Resample/DWBA/DWBA_Pol.h
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Resample/FFCompute/ComputeDWBAPol.h
-//! @brief Defines class ComputeDWBAPol.
+//! @file Resample/DWBA/DWBA_Pol.h
+//! @brief Defines class DWBA_Pol.
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -17,18 +17,18 @@
#endif
#ifndef USER_API
-#ifndef BORNAGAIN_RESAMPLE_FFCOMPUTE_COMPUTEDWBAPOL_H
-#define BORNAGAIN_RESAMPLE_FFCOMPUTE_COMPUTEDWBAPOL_H
+#ifndef BORNAGAIN_RESAMPLE_DWBA_DWBA_POL_H
+#define BORNAGAIN_RESAMPLE_DWBA_DWBA_POL_H
-#include "Resample/FFCompute/IComputeFF.h"
+#include "Resample/DWBA/IDWBA.h"
//! Provides polarized DWBA computation for given IFormFactor.
-class ComputeDWBAPol : public IComputeFF {
+class DWBA_Pol : public IDWBA {
public:
- ComputeDWBAPol(const IFormFactor& ff, size_t i_layer);
- ComputeDWBAPol(const IFormFactor& ff);
- ~ComputeDWBAPol() override;
+ DWBA_Pol(const IFormFactor& ff, size_t i_layer);
+ DWBA_Pol(const IFormFactor& ff);
+ ~DWBA_Pol() override;
//! Returns the coherent sum of the four DWBA terms for polarized scattering.
Eigen::Matrix2cd coherentPolFF(const DiffuseElement& ele) const;
@@ -36,5 +36,5 @@ public:
friend class TestPolarizedDWBATerm;
};
-#endif // BORNAGAIN_RESAMPLE_FFCOMPUTE_COMPUTEDWBAPOL_H
+#endif // BORNAGAIN_RESAMPLE_DWBA_DWBA_POL_H
#endif // USER_API
diff --git a/Resample/FFCompute/ComputeDWBA.cpp b/Resample/DWBA/DWBA_Scalar.cpp
similarity index 86%
rename from Resample/FFCompute/ComputeDWBA.cpp
rename to Resample/DWBA/DWBA_Scalar.cpp
index e9854e000fd6f68e81bd2c7d7c8809fc8a015539..aaba3fe402e9838add8105a46a6752891964490f 100644
--- a/Resample/FFCompute/ComputeDWBA.cpp
+++ b/Resample/DWBA/DWBA_Scalar.cpp
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Resample/FFCompute/ComputeDWBA.cpp
-//! @brief Implements class ComputeDWBA.
+//! @file Resample/DWBA/DWBA_Scalar.cpp
+//! @brief Implements class DWBA_Scalar.
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -12,18 +12,18 @@
//
// ************************************************************************************************
-#include "Resample/FFCompute/ComputeDWBA.h"
+#include "Resample/DWBA/DWBA_Scalar.h"
#include "Base/Vector/WavevectorInfo.h"
#include "Resample/Element/DiffuseElement.h"
#include "Resample/Flux/IFlux.h"
#include "Sample/Scattering/IFormFactor.h"
-ComputeDWBA::ComputeDWBA(const IFormFactor& ff, size_t i_layer) : IComputeFF(ff, i_layer) {}
-ComputeDWBA::ComputeDWBA(const IFormFactor& ff) : IComputeFF(ff) {}
+DWBA_Scalar::DWBA_Scalar(const IFormFactor& ff, size_t i_layer) : IDWBA(ff, i_layer) {}
+DWBA_Scalar::DWBA_Scalar(const IFormFactor& ff) : IDWBA(ff) {}
-ComputeDWBA::~ComputeDWBA() = default;
+DWBA_Scalar::~DWBA_Scalar() = default;
-complex_t ComputeDWBA::coherentFF(const DiffuseElement& ele) const
+complex_t DWBA_Scalar::coherentFF(const DiffuseElement& ele) const
{
const WavevectorInfo& wavevectors = ele.wavevectorInfo();
diff --git a/Resample/FFCompute/ComputeDWBA.h b/Resample/DWBA/DWBA_Scalar.h
similarity index 66%
rename from Resample/FFCompute/ComputeDWBA.h
rename to Resample/DWBA/DWBA_Scalar.h
index ea800c0c38be20a899bb89944cf04df5e7d4a923..900983e22977cd125ff03df472b541d9d4a47dac 100644
--- a/Resample/FFCompute/ComputeDWBA.h
+++ b/Resample/DWBA/DWBA_Scalar.h
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Resample/FFCompute/ComputeDWBA.h
-//! @brief Defines class ComputeDWBA.
+//! @file Resample/DWBA/DWBA_Scalar.h
+//! @brief Defines class DWBA_Scalar.
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -17,20 +17,20 @@
#endif
#ifndef USER_API
-#ifndef BORNAGAIN_RESAMPLE_FFCOMPUTE_COMPUTEDWBA_H
-#define BORNAGAIN_RESAMPLE_FFCOMPUTE_COMPUTEDWBA_H
+#ifndef BORNAGAIN_RESAMPLE_DWBA_DWBA_SCALAR_H
+#define BORNAGAIN_RESAMPLE_DWBA_DWBA_SCALAR_H
-#include "Resample/FFCompute/IComputeFF.h"
+#include "Resample/DWBA/IDWBA.h"
class IFlux;
//! Provides scalar DWBA computation for given IFormFactor.
-class ComputeDWBA : public IComputeFF {
+class DWBA_Scalar : public IDWBA {
public:
- ComputeDWBA(const IFormFactor& ff, size_t i_layer);
- ComputeDWBA(const IFormFactor& ff);
- ~ComputeDWBA() override;
+ DWBA_Scalar(const IFormFactor& ff, size_t i_layer);
+ DWBA_Scalar(const IFormFactor& ff);
+ ~DWBA_Scalar() override;
//! Returns the coherent sum of the four DWBA terms for scalar scattering.
complex_t coherentFF(const DiffuseElement& ele) const;
@@ -38,5 +38,5 @@ public:
friend class TestPolarizedDWBATerm;
};
-#endif // BORNAGAIN_RESAMPLE_FFCOMPUTE_COMPUTEDWBA_H
+#endif // BORNAGAIN_RESAMPLE_DWBA_DWBA_SCALAR_H
#endif // USER_API
diff --git a/Resample/FFCompute/IComputeFF.cpp b/Resample/DWBA/IDWBA.cpp
similarity index 62%
rename from Resample/FFCompute/IComputeFF.cpp
rename to Resample/DWBA/IDWBA.cpp
index 1ab0350966242f1c57535fc77662162393cbc8fb..ec9f1a976e7a10816a290037c5aeca3423756976 100644
--- a/Resample/FFCompute/IComputeFF.cpp
+++ b/Resample/DWBA/IDWBA.cpp
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Resample/FFCompute/IComputeFF.cpp
-//! @brief Implements class IComputeFF.
+//! @file Resample/DWBA/IDWBA.cpp
+//! @brief Implements class IDWBA.
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -12,21 +12,18 @@
//
// ************************************************************************************************
-#include "Resample/FFCompute/IComputeFF.h"
+#include "Resample/DWBA/IDWBA.h"
#include "Base/Utils/Assert.h"
#include "Sample/Scattering/IFormFactor.h"
-IComputeFF::IComputeFF(const IFormFactor& ff, size_t i_layer) : m_ff(ff.clone()), m_i_layer(i_layer)
-{
-}
+IDWBA::IDWBA(const IFormFactor& ff, size_t i_layer) : m_ff(ff.clone()), m_i_layer(i_layer) {}
-IComputeFF::IComputeFF(const IFormFactor& ff) : m_ff(ff.clone()), m_i_layer()
-{
-}
+IDWBA::IDWBA(const IFormFactor& ff) : m_ff(ff.clone()), m_i_layer() {}
-IComputeFF::~IComputeFF() = default;
+IDWBA::~IDWBA() = default;
-size_t IComputeFF::iLayer() const {
+size_t IDWBA::iLayer() const
+{
ASSERT(m_i_layer.has_value());
return m_i_layer.value();
}
diff --git a/Resample/FFCompute/IComputeFF.h b/Resample/DWBA/IDWBA.h
similarity index 76%
rename from Resample/FFCompute/IComputeFF.h
rename to Resample/DWBA/IDWBA.h
index 5b201e1bc92c3cc848f53905d77410f3990bdda0..0c909e99432740ddb550a8ff356d6237c724083d 100644
--- a/Resample/FFCompute/IComputeFF.h
+++ b/Resample/DWBA/IDWBA.h
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Resample/FFCompute/IComputeFF.h
-//! @brief Defines class IComputeFF.
+//! @file Resample/DWBA/IDWBA.h
+//! @brief Defines class IDWBA.
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -17,8 +17,8 @@
#endif
#ifndef USER_API
-#ifndef BORNAGAIN_RESAMPLE_FFCOMPUTE_ICOMPUTEFF_H
-#define BORNAGAIN_RESAMPLE_FFCOMPUTE_ICOMPUTEFF_H
+#ifndef BORNAGAIN_RESAMPLE_DWBA_IDWBA_H
+#define BORNAGAIN_RESAMPLE_DWBA_IDWBA_H
#include "Base/Types/Complex.h"
#include <Eigen/Core>
@@ -37,20 +37,20 @@ class WavevectorInfo; // used by all children
//! Wraps an IFormFactor, and provides functions evaluate or evaluatePol.
//! Inherited by IComputeScalar and IComputePol.
-class IComputeFF {
+class IDWBA {
public:
- virtual ~IComputeFF();
+ virtual ~IDWBA();
const IFormFactor& ff() const { return *m_ff; }
size_t iLayer() const;
protected:
- IComputeFF(const IFormFactor& ff, size_t i_layer);
- IComputeFF(const IFormFactor& ff);
+ IDWBA(const IFormFactor& ff, size_t i_layer);
+ IDWBA(const IFormFactor& ff);
const std::unique_ptr<const IFormFactor> m_ff;
const std::optional<size_t> m_i_layer;
};
-#endif // BORNAGAIN_RESAMPLE_FFCOMPUTE_ICOMPUTEFF_H
+#endif // BORNAGAIN_RESAMPLE_DWBA_IDWBA_H
#endif // USER_API
diff --git a/Resample/Processed/ProcessedLayout.cpp b/Resample/Processed/ProcessedLayout.cpp
index 4b233a3e22156b0491c0d35084274074623d9765..66bf965b907ee20e9604ae12293b6eec13be3e89 100644
--- a/Resample/Processed/ProcessedLayout.cpp
+++ b/Resample/Processed/ProcessedLayout.cpp
@@ -15,8 +15,8 @@
#include "Resample/Processed/ProcessedLayout.h"
#include "Base/Utils/Assert.h"
#include "Resample/Coherence/FFSum.h"
-#include "Resample/FFCompute/ComputeDWBA.h"
-#include "Resample/FFCompute/ComputeDWBAPol.h"
+#include "Resample/DWBA/DWBA_Pol.h"
+#include "Resample/DWBA/DWBA_Scalar.h"
#include "Resample/Slice/Slice.h"
#include "Resample/Slice/SliceStack.h"
#include "Sample/Aggregate/IInterferenceFunction.h"
@@ -185,7 +185,7 @@ ProcessedLayout::processParticle(const IParticle& particle, const SliceStack& sl
admixtures.end());
}
- std::vector<std::shared_ptr<const IComputeFF>> terms;
+ std::vector<std::shared_ptr<const IDWBA>> terms;
for (size_t i = 0; i < tmp_ff_list.size(); ++i) { // TODO provide slices_ffs.cbegin() etc
const auto& pair = tmp_ff_list.at(i);
const size_t i_layer = pair.second;
@@ -193,17 +193,17 @@ ProcessedLayout::processParticle(const IParticle& particle, const SliceStack& sl
const std::unique_ptr<IFormFactor> ff(pair.first->clone());
ff->setAmbientMaterial(material);
- std::unique_ptr<IComputeFF> computer;
+ std::unique_ptr<IDWBA> computer;
if (m_polarized) {
if (slices.size() > 1)
- computer = std::make_unique<ComputeDWBAPol>(*ff, i_layer);
+ computer = std::make_unique<DWBA_Pol>(*ff, i_layer);
else
- computer = std::make_unique<ComputeDWBAPol>(*ff, i_layer);
+ computer = std::make_unique<DWBA_Pol>(*ff);
} else {
if (slices.size() > 1)
- computer = std::make_unique<ComputeDWBA>(*ff, i_layer);
+ computer = std::make_unique<DWBA_Scalar>(*ff, i_layer);
else
- computer = std::make_unique<ComputeDWBA>(*ff);
+ computer = std::make_unique<DWBA_Scalar>(*ff);
}
terms.emplace_back(computer.release());
}
diff --git a/Tests/UnitTests/Core/Sample/FormFactorCoherentSumTest.cpp b/Tests/UnitTests/Core/Sample/FormFactorCoherentSumTest.cpp
index cc57dc611a93524c69967315bc596c7d7c4ac031..a597c95ce145fb418599787e0a947d9443a21968 100644
--- a/Tests/UnitTests/Core/Sample/FormFactorCoherentSumTest.cpp
+++ b/Tests/UnitTests/Core/Sample/FormFactorCoherentSumTest.cpp
@@ -1,5 +1,5 @@
#include "Resample/Coherence/FFSum.h"
-#include "Resample/FFCompute/ComputeDWBA.h"
+#include "Resample/DWBA/DWBA_Scalar.h"
#include "Sample/HardParticle/FormFactorFullSphere.h"
#include "Tests/GTestWrapper/google_test.h"
@@ -9,7 +9,7 @@ class CoherentFFSumTest : public ::testing::Test {
TEST_F(CoherentFFSumTest, RelAbundance)
{
FormFactorFullSphere ff(5.0);
- std::shared_ptr<const IComputeFF> part(new ComputeDWBA(ff));
+ std::shared_ptr<const IDWBA> part(new DWBA_Scalar(ff));
CoherentFFSum ffw(1.0, {part});
EXPECT_EQ(1.0, ffw.relativeAbundance());
EXPECT_EQ(5.0, ffw.radialExtension());
diff --git a/auto/Wrap/doxygenDevice.i b/auto/Wrap/doxygenDevice.i
index d42fdcb91cc62a92e993523bce5f75776738f0f3..b582d6ee9bc31e4af627b1d81d6e7777c40db63b 100644
--- a/auto/Wrap/doxygenDevice.i
+++ b/auto/Wrap/doxygenDevice.i
@@ -449,7 +449,7 @@ C++ includes: DetectorContext.h
%feature("docstring") DetectorContext::createPixel "std::unique_ptr< IPixel > DetectorContext::createPixel(size_t element_index) const
-Creates pixel for given element index. Element index is sequetial index in a vector of DiffuseElements. Corresponds to sequence of detector bins inside ROI and outside of masked areas.
+Creates pixel for given element index. Element index is sequential index in a vector of DiffuseElements. Corresponds to sequence of detector bins inside ROI and outside of masked areas.
";
%feature("docstring") DetectorContext::detectorIndex "size_t DetectorContext::detectorIndex(size_t element_index) const
diff --git a/auto/Wrap/doxygenResample.i b/auto/Wrap/doxygenResample.i
index 4340a4a019d31aa18023be9466cf5b4ec112dd15..c77caaeac0b0ebfb213ba9925bc5a5c68fcd2bdc 100644
--- a/auto/Wrap/doxygenResample.i
+++ b/auto/Wrap/doxygenResample.i
@@ -9,7 +9,7 @@ Information about particle form factor and abundance.
C++ includes: FFSum.h
";
-%feature("docstring") CoherentFFSum::CoherentFFSum "CoherentFFSum::CoherentFFSum(double abundance, const std::vector< std::shared_ptr< const IComputeFF >> &terms)
+%feature("docstring") CoherentFFSum::CoherentFFSum "CoherentFFSum::CoherentFFSum(double abundance, const std::vector< std::shared_ptr< const IDWBA >> &terms)
";
%feature("docstring") CoherentFFSum::summedFF "complex_t CoherentFFSum::summedFF(const DiffuseElement &ele) const
@@ -25,52 +25,6 @@ C++ includes: FFSum.h
";
-// File: classComputeDWBA.xml
-%feature("docstring") ComputeDWBA "
-
-Provides scalar DWBA computation for given IFormFactor.
-
-C++ includes: ComputeDWBA.h
-";
-
-%feature("docstring") ComputeDWBA::ComputeDWBA "ComputeDWBA::ComputeDWBA(const IFormFactor &ff, size_t i_layer)
-";
-
-%feature("docstring") ComputeDWBA::ComputeDWBA "ComputeDWBA::ComputeDWBA(const IFormFactor &ff)
-";
-
-%feature("docstring") ComputeDWBA::~ComputeDWBA "ComputeDWBA::~ComputeDWBA() override
-";
-
-%feature("docstring") ComputeDWBA::coherentFF "complex_t ComputeDWBA::coherentFF(const DiffuseElement &ele) const
-
-Returns the coherent sum of the four DWBA terms for scalar scattering.
-";
-
-
-// File: classComputeDWBAPol.xml
-%feature("docstring") ComputeDWBAPol "
-
-Provides polarized DWBA computation for given IFormFactor.
-
-C++ includes: ComputeDWBAPol.h
-";
-
-%feature("docstring") ComputeDWBAPol::ComputeDWBAPol "ComputeDWBAPol::ComputeDWBAPol(const IFormFactor &ff, size_t i_layer)
-";
-
-%feature("docstring") ComputeDWBAPol::ComputeDWBAPol "ComputeDWBAPol::ComputeDWBAPol(const IFormFactor &ff)
-";
-
-%feature("docstring") ComputeDWBAPol::~ComputeDWBAPol "ComputeDWBAPol::~ComputeDWBAPol() override
-";
-
-%feature("docstring") ComputeDWBAPol::coherentPolFF "Eigen::Matrix2cd ComputeDWBAPol::coherentPolFF(const DiffuseElement &ele) const
-
-Returns the coherent sum of the four DWBA terms for polarized scattering.
-";
-
-
// File: classDecouplingApproximationStrategy.xml
%feature("docstring") DecouplingApproximationStrategy "
@@ -178,27 +132,73 @@ Tells if simulation element corresponds to a specular peak.
";
+// File: classDWBA__Pol.xml
+%feature("docstring") DWBA_Pol "
+
+Provides polarized DWBA computation for given IFormFactor.
+
+C++ includes: DWBA_Pol.h
+";
+
+%feature("docstring") DWBA_Pol::DWBA_Pol "DWBA_Pol::DWBA_Pol(const IFormFactor &ff, size_t i_layer)
+";
+
+%feature("docstring") DWBA_Pol::DWBA_Pol "DWBA_Pol::DWBA_Pol(const IFormFactor &ff)
+";
+
+%feature("docstring") DWBA_Pol::~DWBA_Pol "DWBA_Pol::~DWBA_Pol() override
+";
+
+%feature("docstring") DWBA_Pol::coherentPolFF "Eigen::Matrix2cd DWBA_Pol::coherentPolFF(const DiffuseElement &ele) const
+
+Returns the coherent sum of the four DWBA terms for polarized scattering.
+";
+
+
+// File: classDWBA__Scalar.xml
+%feature("docstring") DWBA_Scalar "
+
+Provides scalar DWBA computation for given IFormFactor.
+
+C++ includes: DWBA_Scalar.h
+";
+
+%feature("docstring") DWBA_Scalar::DWBA_Scalar "DWBA_Scalar::DWBA_Scalar(const IFormFactor &ff, size_t i_layer)
+";
+
+%feature("docstring") DWBA_Scalar::DWBA_Scalar "DWBA_Scalar::DWBA_Scalar(const IFormFactor &ff)
+";
+
+%feature("docstring") DWBA_Scalar::~DWBA_Scalar "DWBA_Scalar::~DWBA_Scalar() override
+";
+
+%feature("docstring") DWBA_Scalar::coherentFF "complex_t DWBA_Scalar::coherentFF(const DiffuseElement &ele) const
+
+Returns the coherent sum of the four DWBA terms for scalar scattering.
+";
+
+
// File: classFluxes.xml
%feature("docstring") Fluxes "";
-// File: classIComputeFF.xml
-%feature("docstring") IComputeFF "
+// File: classIDWBA.xml
+%feature("docstring") IDWBA "
Abstract base class for form factor evaluations.
Wraps an IFormFactor, and provides functions evaluate or evaluatePol. Inherited by IComputeScalar and IComputePol.
-C++ includes: IComputeFF.h
+C++ includes: IDWBA.h
";
-%feature("docstring") IComputeFF::~IComputeFF "IComputeFF::~IComputeFF()
+%feature("docstring") IDWBA::~IDWBA "IDWBA::~IDWBA()
";
-%feature("docstring") IComputeFF::ff "const IFormFactor& IComputeFF::ff() const
+%feature("docstring") IDWBA::ff "const IFormFactor& IDWBA::ff() const
";
-%feature("docstring") IComputeFF::iLayer "size_t IComputeFF::iLayer() const
+%feature("docstring") IDWBA::iLayer "size_t IDWBA::iLayer() const
";
@@ -842,6 +842,9 @@ C++ includes: SSCAStrategy.h
// File: namespace_0d19.xml
+// File: namespace_0d2.xml
+
+
// File: namespace_0d23.xml
@@ -863,9 +866,6 @@ C++ includes: SSCAStrategy.h
// File: namespace_0d40.xml
-// File: namespace_0d6.xml
-
-
// File: namespaceSampleUtils.xml
@@ -919,28 +919,28 @@ Get default z limits for generating a material profile.
// File: FFSum_8h.xml
-// File: DiffuseElement_8cpp.xml
+// File: DWBA__Pol_8cpp.xml
-// File: DiffuseElement_8h.xml
+// File: DWBA__Pol_8h.xml
-// File: ComputeDWBA_8cpp.xml
+// File: DWBA__Scalar_8cpp.xml
-// File: ComputeDWBA_8h.xml
+// File: DWBA__Scalar_8h.xml
-// File: ComputeDWBAPol_8cpp.xml
+// File: IDWBA_8cpp.xml
-// File: ComputeDWBAPol_8h.xml
+// File: IDWBA_8h.xml
-// File: IComputeFF_8cpp.xml
+// File: DiffuseElement_8cpp.xml
-// File: IComputeFF_8h.xml
+// File: DiffuseElement_8h.xml
// File: IFlux_8h.xml
@@ -1078,10 +1078,10 @@ Get default z limits for generating a material profile.
// File: dir_05914d190eb55651e85671c4f064dae1.xml
-// File: dir_28bc1277e419364b011e46aeb2e8e251.xml
+// File: dir_b80c39a6072510d81953e3a3f9526614.xml
-// File: dir_5e69988b243d40135cf1f8fc1086c5f7.xml
+// File: dir_28bc1277e419364b011e46aeb2e8e251.xml
// File: dir_4ab1bbd9e8de6a7ddc078bbf4801b604.xml