diff --git a/Examples/fit61_Galaxi/sample_builder.py b/Examples/fit61_Galaxi/sample_builder.py
index 6a18bfa9e94e5cfca4ea19be7cd5af1736e2521b..2682dca5326a0b1247576de6fa8c36ae8deee464 100755
--- a/Examples/fit61_Galaxi/sample_builder.py
+++ b/Examples/fit61_Galaxi/sample_builder.py
@@ -44,12 +44,10 @@ class SampleBuilder:
# defining materials
m_vacuum = ba.HomogeneousMaterial("Vacuum", 0, 0)
- m_Si = ba.HomogeneousMaterial("Si", 5.78164736e-6, 1.02294578e-7)
- m_Ag = ba.HomogeneousMaterial("Ag", 2.24749529E-5, 1.61528396E-6)
- m_PTFE = ba.HomogeneousMaterial("PTFE", 5.20508729E-6,
- 1.96944292E-8)
- m_HMDSO = ba.HomogeneousMaterial("HMDSO", 2.0888308E-6,
- 1.32605651E-8)
+ m_Si = ba.HomogeneousMaterial("Si", 5.7816e-6, 1.0229e-7)
+ m_Ag = ba.HomogeneousMaterial("Ag", 2.2475e-5, 1.6152e-6)
+ m_PTFE = ba.HomogeneousMaterial("PTFE", 5.20509e-6, 1.9694e-8)
+ m_HMDSO = ba.HomogeneousMaterial("HMDSO", 2.0888e-6, 1.3261e-8)
# collection of particles with size distribution
nparticles = 20
@@ -69,7 +67,7 @@ class SampleBuilder:
interference = ba.InterferenceFunctionRadialParaCrystal(
self.distance, 1e6*ba.nm)
interference.setKappa(self.kappa)
- interference.setDomainSize(20000)
+ interference.setDomainSize(2e4*nm)
pdf = ba.FTDistribution1DGauss(self.disorder)
interference.setProbabilityDistribution(pdf)
diff --git a/Examples/scatter2d/ConstantBackground.py b/Examples/scatter2d/ConstantBackground.py
index 5ba236c2bf02501fcb31c7d4dd5f503dccd19433..d0e307e557f81df9da93971c61f7c60a15a3ee03 100755
--- a/Examples/scatter2d/ConstantBackground.py
+++ b/Examples/scatter2d/ConstantBackground.py
@@ -41,7 +41,7 @@ def get_sample():
def get_simulation(sample):
- beam = ba.Beam(1000000, 0.1*nm, ba.Direction(0.2*deg, 0))
+ beam = ba.Beam(1e6, 0.1*nm, ba.Direction(0.2*deg, 0))
detector = ba.SphericalDetector(100, 2*deg, 1*deg, 1*deg)
simulation = ba.GISASSimulation(beam, sample, detector)
background = ba.ConstantBackground(1.0e+03)
diff --git a/Examples/scatter2d/MagneticSpheres.py b/Examples/scatter2d/MagneticSpheres.py
index 47270df3829b5f92ba6806396bac22fc3d33e6b4..9b3fdb868c5a82edde88c0f1de333823b51e0be8 100755
--- a/Examples/scatter2d/MagneticSpheres.py
+++ b/Examples/scatter2d/MagneticSpheres.py
@@ -12,7 +12,7 @@ def get_sample():
"""
# Define materials
- magnetic_field = kvector_t(0, 0, 10000000)
+ magnetic_field = kvector_t(0, 0, 1e7)
material_Particle = ba.HomogeneousMaterial("Particle", 2e-05, 4e-07,
magnetic_field)
material_Substrate = ba.HomogeneousMaterial("Substrate", 7e-06,
@@ -47,7 +47,7 @@ def get_sample():
def get_simulation(sample):
- beam = ba.Beam(1e+12, 0.1*nm, ba.Direction(0.5*deg, 0))
+ beam = ba.Beam(1e12, 0.1*nm, ba.Direction(0.5*deg, 0))
beam_polarization = kvector_t(0, 0, 1)
beam.setPolarization(beam_polarization)
detector = ba.SphericalDetector(200, 6*deg, 0, 3*deg)
diff --git a/Examples/scatter2d/RectangularGrating.py b/Examples/scatter2d/RectangularGrating.py
index 93693afebbb3f15812c6f4d521f1f0cc24eba337..68dd1a5c2e640bd527e9e46521fb90c0583a14dc 100755
--- a/Examples/scatter2d/RectangularGrating.py
+++ b/Examples/scatter2d/RectangularGrating.py
@@ -15,14 +15,14 @@ def get_sample(lattice_rotation_angle=0*deg):
lattice_rotation_angle = 0 - beam parallel to grating lines
lattice_rotation_angle = 90*deg - beam perpendicular to grating lines
"""
- # defining materials
+ # Define materials
m_vacuum = ba.HomogeneousMaterial("Vacuum", 0, 0)
- m_si = ba.HomogeneousMaterial("Si", 5.78164736e-6, 1.02294578e-7)
+ m_si = ba.HomogeneousMaterial("Si", 5.7816e-6, 1.0229e-7)
box_length, box_width, box_height = 50*micrometer, 70*nm, 50*nm
lattice_length = 150*nm
- # collection of particles
+ # Define particle layout
interference = ba.InterferenceFunction1DLattice(
lattice_length, 90*deg - lattice_rotation_angle)
@@ -37,7 +37,7 @@ def get_sample(lattice_rotation_angle=0*deg):
ba.RotationZ(lattice_rotation_angle))
particle_layout.setInterferenceFunction(interference)
- # assembling the sample
+ # Define sample
vacuum_layer = ba.Layer(m_vacuum)
vacuum_layer.addLayout(particle_layout)
substrate_layer = ba.Layer(m_si)
@@ -54,7 +54,7 @@ def get_sample(lattice_rotation_angle=0*deg):
def get_simulation(sample):
- beam = ba.Beam(100000000, 0.134*nm, ba.Direction(0.4*deg, 0))
+ beam = ba.Beam(1e8, 0.134*nm, ba.Direction(0.4*deg, 0))
detector = ba.SphericalDetector(200, -0.5*deg, 0.5*deg, 200, 0,
0.6*deg)
simulation = ba.GISASSimulation(beam, sample, detector)
diff --git a/Examples/varia/AccessingSimulationResults.py b/Examples/varia/AccessingSimulationResults.py
index d5ef91e5622d2265619b577e67b077927965fd0f..5ae4b9e66cde9c40544a3c58236624e4cbe91578 100755
--- a/Examples/varia/AccessingSimulationResults.py
+++ b/Examples/varia/AccessingSimulationResults.py
@@ -30,8 +30,7 @@ def get_sample():
# Define particle layouts
layout = ba.ParticleLayout()
- layout.addParticle(particle, 1)
- layout.setWeight(1)
+ layout.addParticle(particle)
layout.setTotalParticleSurfaceDensity(0.01)
# Define layers
diff --git a/Examples/varia/AllFormFactorsAvailable.py b/Examples/varia/AllFormFactorsAvailable.py
index 53d12a0218396f2e77873bad8d09d30f266c3539..fa762cbe53d622fb8290f3b5c34eff6b071e5425 100755
--- a/Examples/varia/AllFormFactorsAvailable.py
+++ b/Examples/varia/AllFormFactorsAvailable.py
@@ -48,7 +48,7 @@ def get_sample(formfactor):
# collection of particles
particle = ba.Particle(m_particle, formfactor)
particle_layout = ba.ParticleLayout()
- particle_layout.addParticle(particle, 1)
+ particle_layout.addParticle(particle)
vacuum_layer = ba.Layer(m_vacuum)
vacuum_layer.addLayout(particle_layout)
diff --git a/Examples/varia/BasicPolarizedReflectometry.py b/Examples/varia/BasicPolarizedReflectometry.py
index db9ea9c179a4aaceed08650f3f73a87f4ff5d665..2f64c1595f8e65a9e32c327eb65e63eb22ffbcfc 100755
--- a/Examples/varia/BasicPolarizedReflectometry.py
+++ b/Examples/varia/BasicPolarizedReflectometry.py
@@ -17,7 +17,7 @@ def get_sample():
# Define materials
material_Ambient = ba.MaterialBySLD("Ambient", 0, 0)
- magnetic_field = kvector_t(0, 100000000, 0)
+ magnetic_field = kvector_t(0, 1e8, 0)
material_Layer = ba.MaterialBySLD("Layer", 0.0001, 1e-08,
magnetic_field)
material_Substrate = ba.MaterialBySLD("Substrate", 7e-05, 2e-06)
diff --git a/Examples/varia/CustomFormFactor.py b/Examples/varia/CustomFormFactor.py
index 2aebb6ee78028672aca23f32fca82c6969ba2a60..2b0b439cbda626fe4b06ed15f3731184b6a82098 100755
--- a/Examples/varia/CustomFormFactor.py
+++ b/Examples/varia/CustomFormFactor.py
@@ -58,7 +58,7 @@ def get_sample():
ff = CustomFormFactor(20*nm, 15*nm)
particle = ba.Particle(m_particle, ff)
particle_layout = ba.ParticleLayout()
- particle_layout.addParticle(particle, 1)
+ particle_layout.addParticle(particle)
vacuum_layer = ba.Layer(m_vacuum)
vacuum_layer.addLayout(particle_layout)
substrate_layer = ba.Layer(m_substrate)
diff --git a/Examples/varia/FindPeaks.py b/Examples/varia/FindPeaks.py
index 88347b523415503684b2bbf74497945a54dee3f5..6f8effff5f06983eff45ce6bdc2304104ec48703 100755
--- a/Examples/varia/FindPeaks.py
+++ b/Examples/varia/FindPeaks.py
@@ -18,7 +18,7 @@ def get_sample(lattice_rotation_angle=0*deg):
"""
# defining materials
m_vacuum = ba.HomogeneousMaterial("Vacuum", 0, 0)
- m_si = ba.HomogeneousMaterial("Si", 5.78164736e-6, 1.02294578e-7)
+ m_si = ba.HomogeneousMaterial("Si", 5.7816e-6, 1.0229e-7)
box_length, box_width, box_height = 50*micrometer, 70*nm, 50*nm
lattice_length = 150*nm
diff --git a/Examples/varia/GratingMC.py b/Examples/varia/GratingMC.py
index ca4b01cb6dc5c04b29a00413f2f09dc83a2d789e..758754f5d5525bafd24b964731286affe43aca34 100755
--- a/Examples/varia/GratingMC.py
+++ b/Examples/varia/GratingMC.py
@@ -18,7 +18,7 @@ def get_sample(lattice_rotation_angle=0*deg):
"""
# defining materials
m_vacuum = ba.HomogeneousMaterial("Vacuum", 0, 0)
- m_si = ba.HomogeneousMaterial("Si", 5.78164736e-6, 1.02294578e-7)
+ m_si = ba.HomogeneousMaterial("Si", 5.7816e-6, 1.0229e-7)
box_length, box_width, box_height = 50*micrometer, 70*nm, 50*nm
lattice_length = 150*nm
diff --git a/Examples/varia/Interference1DLattice.py b/Examples/varia/Interference1DLattice.py
index 1f1fb9a1a4dac4b1736cef1899ab022a226afc66..bb64d51b5828eaf60f936155b3182e96eabe9f5b 100755
--- a/Examples/varia/Interference1DLattice.py
+++ b/Examples/varia/Interference1DLattice.py
@@ -34,9 +34,8 @@ def get_sample():
# Define particle layouts
layout = ba.ParticleLayout()
- layout.addParticle(particle, 1)
+ layout.addParticle(particle)
layout.setInterferenceFunction(iff)
- layout.setWeight(1)
layout.setTotalParticleSurfaceDensity(0.01)
# Define layers
diff --git a/Examples/varia/LargeParticlesFormFactor.py b/Examples/varia/LargeParticlesFormFactor.py
index 7604ec12bd41ae4e06a0c54c605d3863170042ae..7a04c0677fa8bb07877af49e307c33f1fd41c944 100755
--- a/Examples/varia/LargeParticlesFormFactor.py
+++ b/Examples/varia/LargeParticlesFormFactor.py
@@ -17,24 +17,23 @@ default_cylinder_height = 20*nm
def get_sample(cylinder_radius, cylinder_height):
- """
- Returns a sample with cylindrical particles on a substrate.
- """
- # defining materials
+ # Define materials
m_vacuum = ba.HomogeneousMaterial("Vacuum", 0, 0)
m_substrate = ba.HomogeneousMaterial("Substrate", 6e-6, 2e-8)
m_particle = ba.HomogeneousMaterial("Particle", 6e-4, 2e-8)
- # collection of particles
+ # Define particle layout
cylinder_ff = ba.FormFactorCylinder(cylinder_radius, cylinder_height)
cylinder = ba.Particle(m_particle, cylinder_ff)
particle_layout = ba.ParticleLayout()
- particle_layout.addParticle(cylinder, 1)
+ particle_layout.addParticle(cylinder)
+ # Define layers
vacuum_layer = ba.Layer(m_vacuum)
vacuum_layer.addLayout(particle_layout)
substrate_layer = ba.Layer(m_substrate)
+ # Define sample
multi_layer = ba.MultiLayer()
multi_layer.addLayer(vacuum_layer)
multi_layer.addLayer(substrate_layer)
diff --git a/Examples/varia/OffSpecularSimulation.py b/Examples/varia/OffSpecularSimulation.py
index a5b3e7b8178ea1655c940efa71a5d711a77d7f66..5d19cb021a80d176080c1e12b174f8e28f736b49 100755
--- a/Examples/varia/OffSpecularSimulation.py
+++ b/Examples/varia/OffSpecularSimulation.py
@@ -31,14 +31,13 @@ def get_sample():
# Define interference functions
iff = ba.InterferenceFunction1DLattice(100*nm, 0)
- iff_pdf = ba.FTDecayFunction1DCauchy(1000000*nm)
+ iff_pdf = ba.FTDecayFunction1DCauchy(1e6*nm)
iff.setDecayFunction(iff_pdf)
# Define particle layouts
layout = ba.ParticleLayout()
- layout.addParticle(particle, 1)
+ layout.addParticle(particle)
layout.setInterferenceFunction(iff)
- layout.setWeight(1)
layout.setTotalParticleSurfaceDensity(0.01)
# Define layers
diff --git a/Examples/varia/PolarizedNoAnalyzer.py b/Examples/varia/PolarizedNoAnalyzer.py
index ea19f15aad87d00ba808f3a712595127b501ce01..492fd0bca70d76e5597c9240a352ea5109487c10 100755
--- a/Examples/varia/PolarizedNoAnalyzer.py
+++ b/Examples/varia/PolarizedNoAnalyzer.py
@@ -8,7 +8,7 @@ import matplotlib.pyplot as plt
import bornagain as ba
from bornagain import angstrom, deg, nm, nm2, kvector_t
-
+from math import sqrt
def get_sample():
"""
@@ -17,7 +17,8 @@ def get_sample():
# Define materials
material_Ambient = ba.MaterialBySLD("Ambient", 0, 0)
- magnetic_field = kvector_t(50000000, 86602540.3784, 0)
+ h = 1e8
+ magnetic_field = kvector_t(1/2*h, sqrt(3)/2*h, 0)
material_Layer = ba.MaterialBySLD("Layer", 0.0001, 1e-08,
magnetic_field)
material_Substrate = ba.MaterialBySLD("Substrate", 7e-05, 2e-06)
diff --git a/Examples/varia/PolarizedSpinFlip.py b/Examples/varia/PolarizedSpinFlip.py
index 203c91145aa7888e87bfb79900cf1ae740c46114..a9549a30c4bf70f6c802a7ca4d96602a952715e0 100755
--- a/Examples/varia/PolarizedSpinFlip.py
+++ b/Examples/varia/PolarizedSpinFlip.py
@@ -7,7 +7,7 @@ import numpy
import bornagain as ba
from bornagain import angstrom, deg, nm, nm2, kvector_t
import matplotlib.pyplot as plt
-
+from math import sqrt
def get_sample():
"""
@@ -16,7 +16,8 @@ def get_sample():
# Define materials
material_Ambient = ba.MaterialBySLD("Ambient", 0, 0)
- magnetic_field = kvector_t(50000000, 86602540.3784, 0)
+ h = 1e8
+ magnetic_field = kvector_t(1/2*h, sqrt(3)/2*h, 0)
material_Layer = ba.MaterialBySLD("Layer", 0.0001, 1e-08,
magnetic_field)
material_Substrate = ba.MaterialBySLD("Substrate", 7e-05, 2e-06)