diff --git a/Core/Computation/ParticleLayoutComputation.cpp b/Core/Computation/ParticleLayoutComputation.cpp index 806f378fa926625243e4a69771efb63d5d58a1a0..5e689de97feec83a681b38db502157f943515574 100644 --- a/Core/Computation/ParticleLayoutComputation.cpp +++ b/Core/Computation/ParticleLayoutComputation.cpp @@ -70,8 +70,7 @@ void ParticleLayoutComputation::compute(SimulationElement& elem) const if (n_layers > 1 && alpha_f < 0) return; // zero for transmission with multilayers (n>1) # TODO: support transmission GISAS - elem.addIntensity(m_interference_function_strategy->evaluate(elem) - * m_layout.surfaceDensity()); + elem.addIntensity(m_interference_function_strategy->evaluate(elem) * m_layout.surfaceDensity()); } void ParticleLayoutComputation::mergeRegionMap( diff --git a/Sample/Interference/FormFactorPrecompute.cpp b/Sample/Interference/FormFactorPrecompute.cpp index 90e6149b6d96e22192c58b7a0269a952f7610327..dbe2a0f6e77c0c8ba93381aac7b5acb6a027303d 100644 --- a/Sample/Interference/FormFactorPrecompute.cpp +++ b/Sample/Interference/FormFactorPrecompute.cpp @@ -17,7 +17,7 @@ std::vector<complex_t> FormFactorPrecompute::scalar(const SimulationElement& sim_element, - const std::vector<FormFactorCoherentSum>& ff_wrappers) + const std::vector<FormFactorCoherentSum>& ff_wrappers) { std::vector<complex_t> result; for (auto& ffw : ff_wrappers) { @@ -28,7 +28,7 @@ FormFactorPrecompute::scalar(const SimulationElement& sim_element, FormFactorPrecompute::matrixFFVector_t FormFactorPrecompute::polarized(const SimulationElement& sim_element, - const std::vector<FormFactorCoherentSum>& ff_wrappers) + const std::vector<FormFactorCoherentSum>& ff_wrappers) { FormFactorPrecompute::matrixFFVector_t result; for (auto& ffw : ff_wrappers) { diff --git a/Sample/Interference/FormFactorPrecompute.h b/Sample/Interference/FormFactorPrecompute.h index 6632f8ce3699516543b152c2eb9f72a0faa71adf..f8ef50be63734c2e75bf76d54b553414b1a55e6c 100644 --- a/Sample/Interference/FormFactorPrecompute.h +++ b/Sample/Interference/FormFactorPrecompute.h @@ -26,12 +26,10 @@ namespace FormFactorPrecompute { using matrixFFVector_t = std::vector<Eigen::Matrix2cd, Eigen::aligned_allocator<Eigen::Matrix2cd>>; -std::vector<complex_t> -scalar(const SimulationElement& sim_element, - const std::vector<FormFactorCoherentSum>& ff_wrappers); -matrixFFVector_t -polarized(const SimulationElement& sim_element, - const std::vector<FormFactorCoherentSum>& ff_wrappers); +std::vector<complex_t> scalar(const SimulationElement& sim_element, + const std::vector<FormFactorCoherentSum>& ff_wrappers); +matrixFFVector_t polarized(const SimulationElement& sim_element, + const std::vector<FormFactorCoherentSum>& ff_wrappers); } // namespace FormFactorPrecompute diff --git a/Sample/Interference/SSCAHelper.cpp b/Sample/Interference/SSCAHelper.cpp index f26921e9ee9a2f9fe1ad56c2dab511476dd7bc52..4961df4e69679574f58199e074ec4c7388376b0e 100644 --- a/Sample/Interference/SSCAHelper.cpp +++ b/Sample/Interference/SSCAHelper.cpp @@ -68,10 +68,9 @@ SSCAHelper::getMeanFormfactorNorm(double qp, const std::vector<complex_t>& preco return ff_orig * ff_conj; } -void SSCAHelper::getMeanFormfactors( - double qp, Eigen::Matrix2cd& ff_orig, Eigen::Matrix2cd& ff_conj, - const FormFactorPrecompute::matrixFFVector_t& precomputed_ff, - const std::vector<FormFactorCoherentSum>& ff_wrappers) const +void SSCAHelper::getMeanFormfactors(double qp, Eigen::Matrix2cd& ff_orig, Eigen::Matrix2cd& ff_conj, + const FormFactorPrecompute::matrixFFVector_t& precomputed_ff, + const std::vector<FormFactorCoherentSum>& ff_wrappers) const { ff_orig = Eigen::Matrix2cd::Zero(); ff_conj = Eigen::Matrix2cd::Zero(); diff --git a/Sample/Interference/SSCAHelper.h b/Sample/Interference/SSCAHelper.h index fcf75c4ca031b62d4ba739dc35a2688eb2531f01..eaff366a9dbf23818020c6a690deb3db99965d2a 100644 --- a/Sample/Interference/SSCAHelper.h +++ b/Sample/Interference/SSCAHelper.h @@ -15,8 +15,8 @@ #ifndef BORNAGAIN_SAMPLE_INTERFERENCE_SSCAHELPER_H #define BORNAGAIN_SAMPLE_INTERFERENCE_SSCAHELPER_H -#include "Sample/Interference/IInterferenceFunctionStrategy.h" #include "Sample/Interference/FormFactorPrecompute.h" +#include "Sample/Interference/IInterferenceFunctionStrategy.h" #include <Eigen/StdVector> class FormFactorCoherentSum;