diff --git a/Core/Samples/inc/ParticleBuilder.h b/Core/Samples/inc/ParticleBuilder.h index 11ac7dc09f148008338fb022c6de0a1e9d012b88..5d5db5cb1d1b2c8b9ab1d1cb089d3f94c151fced 100644 --- a/Core/Samples/inc/ParticleBuilder.h +++ b/Core/Samples/inc/ParticleBuilder.h @@ -36,7 +36,7 @@ public: //! @param parameter variation type //! @param scale global scale factor for probabilities void setPrototype(const Particle& particle, std::string name, - const IDistribution1D& param, size_t nbr_samples, + const IDistribution1D& distribution, size_t nbr_samples, double sigma_factor=0.0, double scale=1.0); //! plant particles in given decoration diff --git a/Core/Samples/src/ParticleBuilder.cpp b/Core/Samples/src/ParticleBuilder.cpp index f4530febeb1442583195f9247b9f448c65403365..0666af3ebfa47ad13d6dfe0da5d4ba0d86d5f186 100644 --- a/Core/Samples/src/ParticleBuilder.cpp +++ b/Core/Samples/src/ParticleBuilder.cpp @@ -38,14 +38,14 @@ ParticleBuilder::~ParticleBuilder() //! Sets prototype for particle production void ParticleBuilder::setPrototype(const Particle &particle, std::string name, - const IDistribution1D ¶m, size_t nbr_samples, double sigma_factor, + const IDistribution1D &distribution, size_t nbr_samples, double sigma_factor, double scale) { delete mp_prototype; mp_prototype = particle.clone(); m_parameter_name = name; delete mp_distribution; - mp_distribution = param.clone(); + mp_distribution = distribution.clone(); m_nbr_samples = nbr_samples; m_sigma_factor = sigma_factor; m_scale = scale; diff --git a/Core/StandardSamples/IsGISAXS15Builder.cpp b/Core/StandardSamples/IsGISAXS15Builder.cpp index 2925902c32556057f2c6db5ee2c355e1a1a1a0f1..728474bedd42074ea0937ac447e4e4637660a3ac 100644 --- a/Core/StandardSamples/IsGISAXS15Builder.cpp +++ b/Core/StandardSamples/IsGISAXS15Builder.cpp @@ -50,7 +50,7 @@ ISample *IsGISAXS15Builder::buildSample() const DistributionGaussian gauss(5.0*Units::nanometer, 1.25*Units::nanometer); ParticleBuilder particle_builder; particle_builder.setPrototype(particle_prototype, - "/Particle/FormFactorCylinder/radius", gauss, 30, 2.0); + "/Particle/FormFactorCylinder/radius", gauss, 30, 3.0); particle_builder.plantParticles(particle_layout); // Set height of each particle to its radius (H/R fixed) diff --git a/Tests/ReferenceData/BornAgain/isgisaxs15_reference.int.gz b/Tests/ReferenceData/BornAgain/isgisaxs15_reference.int.gz index b3a2882dae5451fcad48fa232ae3b1733ade4954..ee6cf899404b21ff977fdc253f2c2101c55f17d8 100644 Binary files a/Tests/ReferenceData/BornAgain/isgisaxs15_reference.int.gz and b/Tests/ReferenceData/BornAgain/isgisaxs15_reference.int.gz differ