Skip to content
Snippets Groups Projects
Commit d4931bd1 authored by Van Herck, Walter's avatar Van Herck, Walter
Browse files

Replaced old constructor for InterferenceFunction2DLattice with new one

in several places
parent 2b5d7abe
No related branches found
No related tags found
No related merge requests found
......@@ -36,7 +36,6 @@
#include "Materials.h"
#include "BornAgainNamespace.h"
#include "FunctionalTestRegistry.h"
#include "Lattice2DIFParameters.h"
#include "InterferenceFunction2DLattice.h"
#include "Units.h"
#include "Types.h"
......
......@@ -15,13 +15,6 @@ def get_sample():
m_substrate = HomogeneousMaterial("Substrate", 6e-6, 2e-8)
m_particle = HomogeneousMaterial("Particle", 6e-4, 2e-8)
# lattice parameters
lattice_params = Lattice2DIFParameters()
lattice_params.m_length_1 = 20.0*nanometer
lattice_params.m_length_2 = 20.0*nanometer
lattice_params.m_angle = 90.0*degree
lattice_params.m_xi = 0.0*degree
#collection of particles
sphere_ff = FormFactorTruncatedSphere(5*nanometer, 5*nanometer)
sphere = Particle(m_particle, sphere_ff)
......@@ -29,7 +22,7 @@ def get_sample():
particle_layout.addParticle(sphere, 0.0, 1.0)
# interferences
interference = InterferenceFunction2DLattice(lattice_params)
interference = InterferenceFunction2DLattice.createSquare(20.0*nanometer)
pdf = FTDistribution2DGauss(200.0*nanometer/2.0/M_PI, 75.0*nanometer/2.0/M_PI)
interference.setProbabilityDistribution(pdf)
particle_layout.addInterferenceFunction(interference)
......
......@@ -29,13 +29,7 @@ def get_sample(radius=5*nanometer, lattice_constant=10*nanometer):
particle_layout = ParticleLayout()
particle_layout.addParticle(sphere)
lattice_params = Lattice2DIFParameters()
lattice_params.m_length_1 = lattice_constant
lattice_params.m_length_2 = lattice_constant
lattice_params.m_angle = 2*numpy.pi/3.
lattice_params.m_xi = 0.0*degree
interference = InterferenceFunction2DLattice(lattice_params)
interference = InterferenceFunction2DLattice.createHexagonal(lattice_constant)
pdf = FTDistribution2DCauchy(10*nanometer, 10*nanometer)
interference.setProbabilityDistribution(pdf)
......
......@@ -45,13 +45,7 @@ class MySampleBuilder(ISampleBuilder):
particle_layout = ParticleLayout()
particle_layout.addParticle(sphere)
lattice_params = Lattice2DIFParameters()
lattice_params.m_length_1 = self.lattice_constant.value
lattice_params.m_length_2 = self.lattice_constant.value
lattice_params.m_angle = 2*numpy.pi/3.
lattice_params.m_xi = 0.0*degree
interference = InterferenceFunction2DLattice(lattice_params)
interference = InterferenceFunction2DLattice.createHexagonal(self.lattice_constant.value)
pdf = FTDistribution2DCauchy(10*nanometer, 10*nanometer)
interference.setProbabilityDistribution(pdf)
......
......@@ -60,11 +60,6 @@ def RunSimulation_centered():
mSubstrate = HomogeneousMaterial("Substrate", 6e-6, 2e-8 )
mParticle = HomogeneousMaterial("Particle", 6e-4, 2e-8 )
# collection of particles
lattice_params = Lattice2DIFParameters()
lattice_params.m_length_1 = 10.0*nanometer
lattice_params.m_length_2 = 10.0*nanometer
lattice_params.m_angle = 90.0*degree
lattice_params.m_xi = 0.0*degree
interference = InterferenceFunction2DLattice(10.0*nanometer, 10.0*nanometer, 0.0*degree)
pdf = FTDistribution2DCauchy(300.0*nanometer/2.0/M_PI, 100.0*nanometer/2.0/M_PI)
interference.setProbabilityDistribution(pdf)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment