diff --git a/Core/StandardSamples/SizeDistributionModelsBuilder.cpp b/Core/StandardSamples/SizeDistributionModelsBuilder.cpp
index 4587fa62e9c54d9295549c857bca5c540fe46584..898c6748df020523d7c0175aec1cf083f6b0318b 100644
--- a/Core/StandardSamples/SizeDistributionModelsBuilder.cpp
+++ b/Core/StandardSamples/SizeDistributionModelsBuilder.cpp
@@ -29,7 +29,7 @@ MultiLayer* SizeDistributionDAModelBuilder::buildSample() const
{
MultiLayer* multi_layer = new MultiLayer();
- Material m_ambience = HomogeneousMaterial("Vacuum", 0.0, 0.0);
+ Material m_vacuum = HomogeneousMaterial("Vacuum", 0.0, 0.0);
Material m_substrate = HomogeneousMaterial("Substrate", 6e-6, 2e-8);
Material m_particle = HomogeneousMaterial("Particle", 6e-4, 2e-8);
@@ -57,7 +57,7 @@ MultiLayer* SizeDistributionDAModelBuilder::buildSample() const
particle_layout.addParticle(cylinder2, 0.2);
particle_layout.setInterferenceFunction(interference);
- Layer vacuum_layer(m_ambience);
+ Layer vacuum_layer(m_vacuum);
vacuum_layer.addLayout(particle_layout);
Layer substrate_layer(m_substrate);
@@ -72,7 +72,7 @@ MultiLayer* SizeDistributionLMAModelBuilder::buildSample() const
{
MultiLayer* multi_layer = new MultiLayer();
- Material m_ambience = HomogeneousMaterial("Vacuum", 0.0, 0.0);
+ Material m_vacuum = HomogeneousMaterial("Vacuum", 0.0, 0.0);
Material m_substrate = HomogeneousMaterial("Substrate", 6e-6, 2e-8);
Material m_particle = HomogeneousMaterial("Particle", 6e-4, 2e-8);
@@ -108,7 +108,7 @@ MultiLayer* SizeDistributionLMAModelBuilder::buildSample() const
particle_layout2.addParticle(cylinder2, 0.2);
particle_layout2.setInterferenceFunction(interference2);
- Layer vacuum_layer(m_ambience);
+ Layer vacuum_layer(m_vacuum);
vacuum_layer.addLayout(particle_layout1);
vacuum_layer.addLayout(particle_layout2);
Layer substrate_layer(m_substrate);
@@ -125,7 +125,7 @@ MultiLayer* SizeDistributionSSCAModelBuilder::buildSample() const
{
MultiLayer* multi_layer = new MultiLayer();
- Material m_ambience = HomogeneousMaterial("Vacuum", 0.0, 0.0);
+ Material m_vacuum = HomogeneousMaterial("Vacuum", 0.0, 0.0);
Material m_substrate = HomogeneousMaterial("Substrate", 6e-6, 2e-8);
Material m_particle = HomogeneousMaterial("Particle", 6e-4, 2e-8);
@@ -154,7 +154,7 @@ MultiLayer* SizeDistributionSSCAModelBuilder::buildSample() const
particle_layout.addParticle(cylinder2, 0.2);
particle_layout.setInterferenceFunction(interference);
- Layer vacuum_layer(m_ambience);
+ Layer vacuum_layer(m_vacuum);
vacuum_layer.addLayout(particle_layout);
Layer substrate_layer(m_substrate);
diff --git a/Doc/FFCatalog/fig/ff2/bornplot.py b/Doc/FFCatalog/fig/ff2/bornplot.py
index c13bc80c884c47ade3ae36090c366055d32609ba..cec0f785a3999aea997eba2a5c32f44a06917140 100644
--- a/Doc/FFCatalog/fig/ff2/bornplot.py
+++ b/Doc/FFCatalog/fig/ff2/bornplot.py
@@ -120,7 +120,7 @@ def get_sample(ff, trafo):
:param trafo: Optional rotation
"""
# defining materials
- m_ambience = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Air", 0.0, 0.0)
m_particle = ba.HomogeneousMaterial("Particle", 1e-5, 0)
# collection of particles
@@ -132,7 +132,7 @@ def get_sample(ff, trafo):
else:
particle_layout.addParticle(particle)
- air_layer = ba.Layer(m_ambience)
+ air_layer = ba.Layer(m_vacuum)
air_layer.addLayout(particle_layout)
multi_layer = ba.MultiLayer()
diff --git a/Examples/python/simulation/ex01_BasicParticles/AllFormFactorsAvailable.py b/Examples/python/simulation/ex01_BasicParticles/AllFormFactorsAvailable.py
index d54c5bd692e5613ff721a73cb3933b6cfa998209..a44ad1ef23904d818da9464e1b31406eeefe49e0 100644
--- a/Examples/python/simulation/ex01_BasicParticles/AllFormFactorsAvailable.py
+++ b/Examples/python/simulation/ex01_BasicParticles/AllFormFactorsAvailable.py
@@ -41,7 +41,7 @@ def get_sample(formfactor):
Returns a one-layer sample that contains particles with given form factor.
"""
# defining materials
- m_ambience = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Air", 0.0, 0.0)
m_particle = ba.HomogeneousMaterial("Particle", 6e-4, 2e-8)
# collection of particles
@@ -49,7 +49,7 @@ def get_sample(formfactor):
particle_layout = ba.ParticleLayout()
particle_layout.addParticle(particle, 1.0)
- air_layer = ba.Layer(m_ambience)
+ air_layer = ba.Layer(m_vacuum)
air_layer.addLayout(particle_layout)
multi_layer = ba.MultiLayer()
diff --git a/Examples/python/simulation/ex01_BasicParticles/CylindersInBA.py b/Examples/python/simulation/ex01_BasicParticles/CylindersInBA.py
index c68006c4e2a733e5dd207cd231983417c3c4c12c..4b41edb292918579cb34cca6dcf84b28aae90489 100644
--- a/Examples/python/simulation/ex01_BasicParticles/CylindersInBA.py
+++ b/Examples/python/simulation/ex01_BasicParticles/CylindersInBA.py
@@ -11,7 +11,7 @@ def get_sample():
implying a simulation in plain Born approximation.
"""
# defining materials
- m_ambience = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Air", 0.0, 0.0)
m_particle = ba.HomogeneousMaterial("Particle", 6e-4, 2e-8)
# collection of particles
@@ -20,7 +20,7 @@ def get_sample():
particle_layout = ba.ParticleLayout()
particle_layout.addParticle(cylinder, 1.0)
- air_layer = ba.Layer(m_ambience)
+ air_layer = ba.Layer(m_vacuum)
air_layer.addLayout(particle_layout)
multi_layer = ba.MultiLayer()
diff --git a/Examples/python/simulation/ex01_BasicParticles/CylindersInDWBA.py b/Examples/python/simulation/ex01_BasicParticles/CylindersInDWBA.py
index ba8678ec828c4a449d6c0f98f825ad5c7b4b4b90..7a5e0dd88886c583cb010f8ef8d84406d78b11cf 100644
--- a/Examples/python/simulation/ex01_BasicParticles/CylindersInDWBA.py
+++ b/Examples/python/simulation/ex01_BasicParticles/CylindersInDWBA.py
@@ -10,7 +10,7 @@ def get_sample():
Returns a sample with cylinders on a substrate.
"""
# defining materials
- m_ambience = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Air", 0.0, 0.0)
m_substrate = ba.HomogeneousMaterial("Substrate", 6e-6, 2e-8)
m_particle = ba.HomogeneousMaterial("Particle", 6e-4, 2e-8)
@@ -20,7 +20,7 @@ def get_sample():
particle_layout = ba.ParticleLayout()
particle_layout.addParticle(cylinder, 1.0)
- air_layer = ba.Layer(m_ambience)
+ air_layer = ba.Layer(m_vacuum)
air_layer.addLayout(particle_layout)
substrate_layer = ba.Layer(m_substrate)
diff --git a/Examples/python/simulation/ex01_BasicParticles/CylindersWithSizeDistribution.py b/Examples/python/simulation/ex01_BasicParticles/CylindersWithSizeDistribution.py
index fd7454710d2e457086752417467d38916293cbe2..3d2bfe6a6df60519c833663debe902de9038ff48 100644
--- a/Examples/python/simulation/ex01_BasicParticles/CylindersWithSizeDistribution.py
+++ b/Examples/python/simulation/ex01_BasicParticles/CylindersWithSizeDistribution.py
@@ -10,7 +10,7 @@ def get_sample():
Return a sample with cylinders on a substrate.
The cylinders have a Gaussian size distribution.
"""
- m_ambience = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Air", 0.0, 0.0)
m_particle = ba.HomogeneousMaterial("Particle", 6e-4, 2e-8)
# cylindrical particle
@@ -37,7 +37,7 @@ def get_sample():
particle_layout = ba.ParticleLayout()
particle_layout.addParticle(part_coll)
- air_layer = ba.Layer(m_ambience)
+ air_layer = ba.Layer(m_vacuum)
air_layer.addLayout(particle_layout)
multi_layer = ba.MultiLayer()
multi_layer.addLayer(air_layer)
diff --git a/Examples/python/simulation/ex01_BasicParticles/RotatedPyramids.py b/Examples/python/simulation/ex01_BasicParticles/RotatedPyramids.py
index 8facd731dc90bf64a8410705838bdce22589d943..3c01393d701973b84759e08aa3b16431841ab010 100644
--- a/Examples/python/simulation/ex01_BasicParticles/RotatedPyramids.py
+++ b/Examples/python/simulation/ex01_BasicParticles/RotatedPyramids.py
@@ -10,7 +10,7 @@ def get_sample():
Returns a sample with rotated pyramids on top of a substrate.
"""
# defining materials
- m_ambience = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Air", 0.0, 0.0)
m_substrate = ba.HomogeneousMaterial("Substrate", 6e-6, 2e-8)
m_particle = ba.HomogeneousMaterial("Particle", 6e-4, 2e-8)
@@ -22,7 +22,7 @@ def get_sample():
particle_layout.addParticle(
pyramid, 1.0, ba.kvector_t(0.0, 0.0, 0.0), transform)
- air_layer = ba.Layer(m_ambience)
+ air_layer = ba.Layer(m_vacuum)
air_layer.addLayout(particle_layout)
substrate_layer = ba.Layer(m_substrate)
diff --git a/Examples/python/simulation/ex02_LayeredStructures/BuriedParticles.py b/Examples/python/simulation/ex02_LayeredStructures/BuriedParticles.py
index 9f90247add5585462ed312708cc4cbc526e23011..796297eaadb7cd79a93eb7a866f2e86c65d8ac8a 100644
--- a/Examples/python/simulation/ex02_LayeredStructures/BuriedParticles.py
+++ b/Examples/python/simulation/ex02_LayeredStructures/BuriedParticles.py
@@ -10,7 +10,7 @@ def get_sample():
Returns a sample with spherical particles in an layer between air and substrate.
"""
# defining materials
- m_ambience = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Air", 0.0, 0.0)
m_interm_layer = ba.HomogeneousMaterial("IntermLayer", 3.45e-6, 5.24e-9)
m_substrate = ba.HomogeneousMaterial("Substrate", 7.43e-6, 1.72e-7)
m_particle = ba.HomogeneousMaterial("Particle", 0.0, 0.0)
@@ -23,7 +23,7 @@ def get_sample():
particle_layout.addParticle(sphere, 1.0)
# assembling the sample
- air_layer = ba.Layer(m_ambience)
+ air_layer = ba.Layer(m_vacuum)
intermediate_layer = ba.Layer(m_interm_layer, 30.*nm)
intermediate_layer.addLayout(particle_layout)
substrate_layer = ba.Layer(m_substrate, 0)
diff --git a/Examples/python/simulation/ex02_LayeredStructures/CorrelatedRoughness.py b/Examples/python/simulation/ex02_LayeredStructures/CorrelatedRoughness.py
index 7e7cdeb83f2be965ff589a2a397bd4eba5d13529..36b80dd24b5049dc341b228802847522244cc64a 100644
--- a/Examples/python/simulation/ex02_LayeredStructures/CorrelatedRoughness.py
+++ b/Examples/python/simulation/ex02_LayeredStructures/CorrelatedRoughness.py
@@ -10,13 +10,13 @@ def get_sample():
Returns a sample with two layers on a substrate, with correlated roughnesses.
"""
# defining materials
- m_ambience = ba.HomogeneousMaterial("ambience", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("ambience", 0.0, 0.0)
m_part_a = ba.HomogeneousMaterial("PartA", 5e-6, 0.0)
m_part_b = ba.HomogeneousMaterial("PartB", 10e-6, 0.0)
m_substrate = ba.HomogeneousMaterial("substrate", 15e-6, 0.0)
# defining layers
- l_ambience = ba.Layer(m_ambience)
+ l_ambience = ba.Layer(m_vacuum)
l_part_a = ba.Layer(m_part_a, 2.5*nm)
l_part_b = ba.Layer(m_part_b, 5.0*nm)
l_substrate = ba.Layer(m_substrate)
diff --git a/Examples/python/simulation/ex03_InterferenceFunctions/ApproximationDA.py b/Examples/python/simulation/ex03_InterferenceFunctions/ApproximationDA.py
index 6c38ada842f7e734b199443ec85767b9202180d9..4d2ec8eec6e0222814bafa8d00c8936d7fd31db2 100644
--- a/Examples/python/simulation/ex03_InterferenceFunctions/ApproximationDA.py
+++ b/Examples/python/simulation/ex03_InterferenceFunctions/ApproximationDA.py
@@ -10,7 +10,7 @@ def get_sample():
Returns a sample with cylinders of two different sizes on a substrate.
The cylinder positions are modelled in Decoupling Approximation.
"""
- m_ambience = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Air", 0.0, 0.0)
m_substrate = ba.HomogeneousMaterial("Substrate", 6e-6, 2e-8)
m_particle = ba.HomogeneousMaterial("Particle", 6e-4, 2e-8)
@@ -38,7 +38,7 @@ def get_sample():
particle_layout.addParticle(cylinder2, 0.2)
particle_layout.setInterferenceFunction(interference)
- air_layer = ba.Layer(m_ambience)
+ air_layer = ba.Layer(m_vacuum)
air_layer.addLayout(particle_layout)
substrate_layer = ba.Layer(m_substrate)
multi_layer = ba.MultiLayer()
diff --git a/Examples/python/simulation/ex03_InterferenceFunctions/ApproximationLMA.py b/Examples/python/simulation/ex03_InterferenceFunctions/ApproximationLMA.py
index 2fc89c131162476975a0ae45d55f2e5c2f3c75ed..71e697489585b0aa275fd65a6c96256ed8aa4587 100644
--- a/Examples/python/simulation/ex03_InterferenceFunctions/ApproximationLMA.py
+++ b/Examples/python/simulation/ex03_InterferenceFunctions/ApproximationLMA.py
@@ -10,7 +10,7 @@ def get_sample():
Returns a sample with cylinders of two different sizes on a substrate.
The cylinder positions are modelled in Local Monodisperse Approximation.
"""
- m_ambience = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Air", 0.0, 0.0)
m_substrate = ba.HomogeneousMaterial("Substrate", 6e-6, 2e-8)
m_particle = ba.HomogeneousMaterial("Particle", 6e-4, 2e-8)
@@ -46,7 +46,7 @@ def get_sample():
particle_layout2.addParticle(cylinder2, 0.2)
particle_layout2.setInterferenceFunction(interference2)
- air_layer = ba.Layer(m_ambience)
+ air_layer = ba.Layer(m_vacuum)
air_layer.addLayout(particle_layout1)
air_layer.addLayout(particle_layout2)
substrate_layer = ba.Layer(m_substrate)
diff --git a/Examples/python/simulation/ex03_InterferenceFunctions/ApproximationSSCA.py b/Examples/python/simulation/ex03_InterferenceFunctions/ApproximationSSCA.py
index cbd381ccb1a2c177aa68f28530b0b73cb52890c2..9d5c8c4e2fe6bb5778b95111fc92bbf5e5e1b02b 100644
--- a/Examples/python/simulation/ex03_InterferenceFunctions/ApproximationSSCA.py
+++ b/Examples/python/simulation/ex03_InterferenceFunctions/ApproximationSSCA.py
@@ -10,7 +10,7 @@ def get_sample():
Returns a sample with cylinders of two different sizes on a substrate.
The cylinder positions are modelled in Size-Spacing Coupling Approximation.
"""
- m_ambience = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Air", 0.0, 0.0)
m_substrate = ba.HomogeneousMaterial("Substrate", 6e-6, 2e-8)
m_particle = ba.HomogeneousMaterial("Particle", 6e-4, 2e-8)
@@ -38,7 +38,7 @@ def get_sample():
particle_layout.addParticle(cylinder2, 0.2)
particle_layout.setInterferenceFunction(interference)
- air_layer = ba.Layer(m_ambience)
+ air_layer = ba.Layer(m_vacuum)
air_layer.addLayout(particle_layout)
substrate_layer = ba.Layer(m_substrate)
multi_layer = ba.MultiLayer()
diff --git a/Examples/python/simulation/ex03_InterferenceFunctions/CosineRipplesAtRectLattice.py b/Examples/python/simulation/ex03_InterferenceFunctions/CosineRipplesAtRectLattice.py
index ff05c1ca28831215e91e7e0d4211a40adc75bab3..db526931aad5ecec671a29ab306321a84d12fccf 100644
--- a/Examples/python/simulation/ex03_InterferenceFunctions/CosineRipplesAtRectLattice.py
+++ b/Examples/python/simulation/ex03_InterferenceFunctions/CosineRipplesAtRectLattice.py
@@ -12,7 +12,7 @@ def get_sample():
The structure is modelled as a 2D Lattice.
"""
# defining materials
- m_ambience = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Air", 0.0, 0.0)
m_substrate = ba.HomogeneousMaterial("Substrate", 6e-6, 2e-8)
m_particle = ba.HomogeneousMaterial("Particle", 6e-4, 2e-8)
@@ -30,7 +30,7 @@ def get_sample():
particle_layout.setInterferenceFunction(interference)
# assemble the sample
- air_layer = ba.Layer(m_ambience)
+ air_layer = ba.Layer(m_vacuum)
air_layer.addLayout(particle_layout)
substrate_layer = ba.Layer(m_substrate)
multi_layer = ba.MultiLayer()
diff --git a/Examples/python/simulation/ex03_InterferenceFunctions/Interference1DLattice.py b/Examples/python/simulation/ex03_InterferenceFunctions/Interference1DLattice.py
index e474b55b7e8b346f883734eb2d051edb5a80efc1..eab09e82131f84a164e3826e3690d6fa16c608b0 100644
--- a/Examples/python/simulation/ex03_InterferenceFunctions/Interference1DLattice.py
+++ b/Examples/python/simulation/ex03_InterferenceFunctions/Interference1DLattice.py
@@ -13,7 +13,7 @@ def get_sample(lattice_rotation_angle=45*deg):
modelled by very long boxes forming a 1D lattice with Cauchy correlations.
"""
# defining materials
- m_ambience = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Air", 0.0, 0.0)
m_substrate = ba.HomogeneousMaterial("Substrate", 6e-6, 2e-8)
m_particle = ba.HomogeneousMaterial("Particle", 6e-4, 2e-8)
@@ -35,7 +35,7 @@ def get_sample(lattice_rotation_angle=45*deg):
particle_layout.setInterferenceFunction(interference)
# assembling the sample
- air_layer = ba.Layer(m_ambience)
+ air_layer = ba.Layer(m_vacuum)
air_layer.addLayout(particle_layout)
substrate_layer = ba.Layer(m_substrate)
diff --git a/Examples/python/simulation/ex03_InterferenceFunctions/Interference1DRadialParaCrystal.py b/Examples/python/simulation/ex03_InterferenceFunctions/Interference1DRadialParaCrystal.py
index 90455f3e7db875bc912496140ced67656292c212..48fe0837d169dfdde951e1e02a1a9de5462c822d 100644
--- a/Examples/python/simulation/ex03_InterferenceFunctions/Interference1DRadialParaCrystal.py
+++ b/Examples/python/simulation/ex03_InterferenceFunctions/Interference1DRadialParaCrystal.py
@@ -13,7 +13,7 @@ def get_sample():
Returns a sample with cylinders on a substrate that form a radial paracrystal.
"""
# defining materials
- m_ambience = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Air", 0.0, 0.0)
m_substrate = ba.HomogeneousMaterial("Substrate", 6e-6, 2e-8)
m_particle = ba.HomogeneousMaterial("Particle", 6e-4, 2e-8)
@@ -31,7 +31,7 @@ def get_sample():
particle_layout.setInterferenceFunction(interference)
# assembling the sample
- air_layer = ba.Layer(m_ambience)
+ air_layer = ba.Layer(m_vacuum)
air_layer.addLayout(particle_layout)
substrate_layer = ba.Layer(m_substrate)
diff --git a/Examples/python/simulation/ex03_InterferenceFunctions/Interference2DCenteredSquareLattice.py b/Examples/python/simulation/ex03_InterferenceFunctions/Interference2DCenteredSquareLattice.py
index 427a67573bf99cabc9d8a83cd194f8665b862b9e..9256bf2da28f5d079f4646040ea602c7160bb169 100644
--- a/Examples/python/simulation/ex03_InterferenceFunctions/Interference2DCenteredSquareLattice.py
+++ b/Examples/python/simulation/ex03_InterferenceFunctions/Interference2DCenteredSquareLattice.py
@@ -12,7 +12,7 @@ def get_sample():
forming a 2D centered square lattice
"""
# defining materials
- m_ambience = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Air", 0.0, 0.0)
m_substrate = ba.HomogeneousMaterial("Substrate", 6e-6, 2e-8)
m_particle = ba.HomogeneousMaterial("Particle", 6e-4, 2e-8)
@@ -33,7 +33,7 @@ def get_sample():
particle_layout.setInterferenceFunction(interference)
# assembling the sample
- air_layer = ba.Layer(m_ambience)
+ air_layer = ba.Layer(m_vacuum)
air_layer.addLayout(particle_layout)
substrate_layer = ba.Layer(m_substrate)
diff --git a/Examples/python/simulation/ex03_InterferenceFunctions/Interference2DLatticeSumOfRotated.py b/Examples/python/simulation/ex03_InterferenceFunctions/Interference2DLatticeSumOfRotated.py
index 4cb60bcb50fcc8d149fd727856852323046d7945..009a0d1d586e3799480dfadba984a415bff67b71 100644
--- a/Examples/python/simulation/ex03_InterferenceFunctions/Interference2DLatticeSumOfRotated.py
+++ b/Examples/python/simulation/ex03_InterferenceFunctions/Interference2DLatticeSumOfRotated.py
@@ -9,11 +9,11 @@ def get_sample():
Returns a sample with cylinders on a substrate,
forming a 2D lattice with different disorder rotated lattice
"""
- m_ambience = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Air", 0.0, 0.0)
m_substrate = ba.HomogeneousMaterial("Substrate", 6e-6, 2e-8)
m_particle = ba.HomogeneousMaterial("Particle", 6e-4, 2e-8)
- air_layer = ba.Layer(m_ambience)
+ air_layer = ba.Layer(m_vacuum)
substrate_layer = ba.Layer(m_substrate)
p_interference_function = \
diff --git a/Examples/python/simulation/ex03_InterferenceFunctions/Interference2DParaCrystal.py b/Examples/python/simulation/ex03_InterferenceFunctions/Interference2DParaCrystal.py
index af3921d3a9083a395413adc302a1f39a5caf2c43..cd3a756505ad58f9b3083a5c58a2d290d81d09e9 100644
--- a/Examples/python/simulation/ex03_InterferenceFunctions/Interference2DParaCrystal.py
+++ b/Examples/python/simulation/ex03_InterferenceFunctions/Interference2DParaCrystal.py
@@ -9,7 +9,7 @@ def get_sample():
"""
Returns a sample with cylinders on a substrate, forming a 2D paracrystal
"""
- m_ambience = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Air", 0.0, 0.0)
m_substrate = ba.HomogeneousMaterial("Substrate", 6e-6, 2e-8)
m_particle = ba.HomogeneousMaterial("Particle", 6e-4, 2e-8)
@@ -27,7 +27,7 @@ def get_sample():
particle_layout.setInterferenceFunction(interference)
# assembling the sample
- air_layer = ba.Layer(m_ambience)
+ air_layer = ba.Layer(m_vacuum)
air_layer.addLayout(particle_layout)
substrate_layer = ba.Layer(m_substrate)
diff --git a/Examples/python/simulation/ex03_InterferenceFunctions/Interference2DRotatedSquareLattice.py b/Examples/python/simulation/ex03_InterferenceFunctions/Interference2DRotatedSquareLattice.py
index b631a3ec9455ff7a0d13a8b037dc52e27a6093f6..2e782fd6cdcaaa8b0e4b35b4e5d48f39ac115267 100644
--- a/Examples/python/simulation/ex03_InterferenceFunctions/Interference2DRotatedSquareLattice.py
+++ b/Examples/python/simulation/ex03_InterferenceFunctions/Interference2DRotatedSquareLattice.py
@@ -11,7 +11,7 @@ def get_sample():
Returns a sample with cylinders on a substrate, forming a rotated 2D lattice
"""
# defining materials
- m_ambience = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Air", 0.0, 0.0)
m_substrate = ba.HomogeneousMaterial("Substrate", 6e-6, 2e-8)
m_particle = ba.HomogeneousMaterial("Particle", 6e-4, 2e-8)
@@ -29,7 +29,7 @@ def get_sample():
particle_layout.setInterferenceFunction(interference)
# assembling the sample
- air_layer = ba.Layer(m_ambience)
+ air_layer = ba.Layer(m_vacuum)
air_layer.addLayout(particle_layout)
substrate_layer = ba.Layer(m_substrate)
diff --git a/Examples/python/simulation/ex03_InterferenceFunctions/Interference2DSquareFiniteLattice.py b/Examples/python/simulation/ex03_InterferenceFunctions/Interference2DSquareFiniteLattice.py
index 4474406eafffaa115c913035dacae9bc94e27d8b..9c1f77b72e637655583de91c3491df2394e111de 100644
--- a/Examples/python/simulation/ex03_InterferenceFunctions/Interference2DSquareFiniteLattice.py
+++ b/Examples/python/simulation/ex03_InterferenceFunctions/Interference2DSquareFiniteLattice.py
@@ -11,7 +11,7 @@ def get_sample():
Returns a sample with cylinders on a substrate, forming a 2D square lattice.
"""
# defining materials
- m_ambience = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Air", 0.0, 0.0)
m_substrate = ba.HomogeneousMaterial("Substrate", 6e-6, 2e-8)
m_particle = ba.HomogeneousMaterial("Particle", 6e-4, 2e-8)
@@ -27,7 +27,7 @@ def get_sample():
particle_layout.setInterferenceFunction(interference)
# assembling the sample
- air_layer = ba.Layer(m_ambience)
+ air_layer = ba.Layer(m_vacuum)
air_layer.addLayout(particle_layout)
substrate_layer = ba.Layer(m_substrate)
diff --git a/Examples/python/simulation/ex03_InterferenceFunctions/Interference2DSquareLattice.py b/Examples/python/simulation/ex03_InterferenceFunctions/Interference2DSquareLattice.py
index 5c5eca3481ceccb580be04ee8d396ec0e4cc0c76..e33a162141e1e19af81f3b9981c09422c46d37f2 100644
--- a/Examples/python/simulation/ex03_InterferenceFunctions/Interference2DSquareLattice.py
+++ b/Examples/python/simulation/ex03_InterferenceFunctions/Interference2DSquareLattice.py
@@ -11,7 +11,7 @@ def get_sample():
Returns a sample with cylinders on a substrate, forming a 2D square lattice.
"""
# defining materials
- m_ambience = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Air", 0.0, 0.0)
m_substrate = ba.HomogeneousMaterial("Substrate", 6e-6, 2e-8)
m_particle = ba.HomogeneousMaterial("Particle", 6e-4, 2e-8)
@@ -28,7 +28,7 @@ def get_sample():
particle_layout.setInterferenceFunction(interference)
# assembling the sample
- air_layer = ba.Layer(m_ambience)
+ air_layer = ba.Layer(m_vacuum)
air_layer.addLayout(particle_layout)
substrate_layer = ba.Layer(m_substrate)
diff --git a/Examples/python/simulation/ex03_InterferenceFunctions/RectangularGrating.py b/Examples/python/simulation/ex03_InterferenceFunctions/RectangularGrating.py
index debde9cc1a6c84ba5d1a072772ee411152972183..542ceff7d53cda0a3364a5e80fbd0dafa3fe6e46 100644
--- a/Examples/python/simulation/ex03_InterferenceFunctions/RectangularGrating.py
+++ b/Examples/python/simulation/ex03_InterferenceFunctions/RectangularGrating.py
@@ -14,7 +14,7 @@ def get_sample(lattice_rotation_angle=0.0*deg):
lattice_rotation_angle = 90*deg - beam perpendicular to grating lines
"""
# defining materials
- m_ambience = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Air", 0.0, 0.0)
m_si = ba.HomogeneousMaterial("Si", 5.78164736e-6, 1.02294578e-7)
box_length, box_width, box_height = 50*micrometer, 70*nm, 50*nm
@@ -36,7 +36,7 @@ def get_sample(lattice_rotation_angle=0.0*deg):
particle_layout.setInterferenceFunction(interference)
# assembling the sample
- air_layer = ba.Layer(m_ambience)
+ air_layer = ba.Layer(m_vacuum)
air_layer.addLayout(particle_layout)
substrate_layer = ba.Layer(m_si)
diff --git a/Examples/python/simulation/ex03_InterferenceFunctions/TriangularRipple.py b/Examples/python/simulation/ex03_InterferenceFunctions/TriangularRipple.py
index 9bb91dc7bb10a3c48b42d109694372c19442f9c7..48e97b2a9a5383d6ad4db5946ff82469fa6afd29 100644
--- a/Examples/python/simulation/ex03_InterferenceFunctions/TriangularRipple.py
+++ b/Examples/python/simulation/ex03_InterferenceFunctions/TriangularRipple.py
@@ -12,7 +12,7 @@ def get_sample():
forming a 1D Paracrystal.
"""
# defining materials
- m_ambience = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Air", 0.0, 0.0)
m_substrate = ba.HomogeneousMaterial("Substrate", 6e-6, 2e-8)
m_particle = ba.HomogeneousMaterial("Particle", 6e-4, 2e-8)
@@ -31,7 +31,7 @@ def get_sample():
particle_layout.setInterferenceFunction(interference)
# air layer with particles and substrate form multi layer
- air_layer = ba.Layer(m_ambience)
+ air_layer = ba.Layer(m_vacuum)
air_layer.addLayout(particle_layout)
substrate_layer = ba.Layer(m_substrate, 0)
multi_layer = ba.MultiLayer()
diff --git a/Examples/python/simulation/ex04_ComplexShapes/CustomFormFactor.py b/Examples/python/simulation/ex04_ComplexShapes/CustomFormFactor.py
index 4ba1343ef2ff5741ebcbbb58a463c69eb98fd5ea..71b2c25bb3660f52d2a1d1ba729eb94590723fac 100644
--- a/Examples/python/simulation/ex04_ComplexShapes/CustomFormFactor.py
+++ b/Examples/python/simulation/ex04_ComplexShapes/CustomFormFactor.py
@@ -49,7 +49,7 @@ def get_sample():
Returns a sample with particles, having a custom form factor, on a substrate.
"""
# defining materials
- m_ambience = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Air", 0.0, 0.0)
m_substrate = ba.HomogeneousMaterial("Substrate", 6e-6, 2e-8)
m_particle = ba.HomogeneousMaterial("Particle", 6e-4, 2e-8)
@@ -58,7 +58,7 @@ def get_sample():
particle = ba.Particle(m_particle, ff)
particle_layout = ba.ParticleLayout()
particle_layout.addParticle(particle, 1.0)
- air_layer = ba.Layer(m_ambience)
+ air_layer = ba.Layer(m_vacuum)
air_layer.addLayout(particle_layout)
substrate_layer = ba.Layer(m_substrate)
diff --git a/Examples/python/simulation/ex04_ComplexShapes/LargeParticlesFormFactor.py b/Examples/python/simulation/ex04_ComplexShapes/LargeParticlesFormFactor.py
index 5915af6ffc2fc4bc25cd97327f5c8679ffb48871..61a190d14c152e762d97dc499b9e485b74e7029b 100644
--- a/Examples/python/simulation/ex04_ComplexShapes/LargeParticlesFormFactor.py
+++ b/Examples/python/simulation/ex04_ComplexShapes/LargeParticlesFormFactor.py
@@ -19,7 +19,7 @@ def get_sample(cylinder_radius, cylinder_height):
Returns a sample with cylindrical particles on a substrate.
"""
# defining materials
- m_ambience = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Air", 0.0, 0.0)
m_substrate = ba.HomogeneousMaterial("Substrate", 6e-6, 2e-8)
m_particle = ba.HomogeneousMaterial("Particle", 6e-4, 2e-8)
@@ -29,7 +29,7 @@ def get_sample(cylinder_radius, cylinder_height):
particle_layout = ba.ParticleLayout()
particle_layout.addParticle(cylinder, 1.0)
- air_layer = ba.Layer(m_ambience)
+ air_layer = ba.Layer(m_vacuum)
air_layer.addLayout(particle_layout)
substrate_layer = ba.Layer(m_substrate)
diff --git a/Examples/python/simulation/ex04_ComplexShapes/MesoCrystal.py b/Examples/python/simulation/ex04_ComplexShapes/MesoCrystal.py
index b4c885ead66744abcebfb8293a6115cdc6d7401e..d317f86fc40bdc773c68635f29ed301ba00e588b 100644
--- a/Examples/python/simulation/ex04_ComplexShapes/MesoCrystal.py
+++ b/Examples/python/simulation/ex04_ComplexShapes/MesoCrystal.py
@@ -10,7 +10,7 @@ def get_sample():
Returns a sample with a cylindrically shaped mesocrystal on a substrate.
"""
# defining materials
- m_ambience = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Air", 0.0, 0.0)
m_substrate = ba.HomogeneousMaterial("Substrate", 6e-6, 2e-8)
m_particle = ba.HomogeneousMaterial("Particle", 6e-4, 2e-8)
@@ -34,7 +34,7 @@ def get_sample():
particle_layout = ba.ParticleLayout()
particle_layout.addParticle(meso)
- air_layer = ba.Layer(m_ambience)
+ air_layer = ba.Layer(m_vacuum)
air_layer.addLayout(particle_layout)
substrate_layer = ba.Layer(m_substrate)
diff --git a/Examples/python/simulation/ex05_BeamAndDetector/BeamDivergence.py b/Examples/python/simulation/ex05_BeamAndDetector/BeamDivergence.py
index e2b1fd3d006c1ab52b36567e18e910907ce689d6..ad471fa380cc9a0addf2a776568a71c887211d32 100644
--- a/Examples/python/simulation/ex05_BeamAndDetector/BeamDivergence.py
+++ b/Examples/python/simulation/ex05_BeamAndDetector/BeamDivergence.py
@@ -10,7 +10,7 @@ def get_sample():
Returns a sample with uncorrelated cylinders on a substrate.
"""
# defining materials
- m_ambience = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Air", 0.0, 0.0)
m_substrate = ba.HomogeneousMaterial("Substrate", 6e-6, 2e-8)
m_particle = ba.HomogeneousMaterial("Particle", 6e-4, 2e-8)
@@ -21,7 +21,7 @@ def get_sample():
particle_layout.addParticle(cylinder, 1.0)
# assembling the sample
- air_layer = ba.Layer(m_ambience)
+ air_layer = ba.Layer(m_vacuum)
air_layer.addLayout(particle_layout)
substrate_layer = ba.Layer(m_substrate)
diff --git a/Examples/python/simulation/ex05_BeamAndDetector/ConstantBackground.py b/Examples/python/simulation/ex05_BeamAndDetector/ConstantBackground.py
index faff207c3784568a0cf4a9fb0f536b19654094bb..e42fb4e1ed115d1e7d2ef1f98601f4ce27acbf71 100644
--- a/Examples/python/simulation/ex05_BeamAndDetector/ConstantBackground.py
+++ b/Examples/python/simulation/ex05_BeamAndDetector/ConstantBackground.py
@@ -10,7 +10,7 @@ def get_sample():
Returns a sample with uncorrelated cylinders on a substrate.
"""
# defining materials
- m_ambience = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Air", 0.0, 0.0)
m_substrate = ba.HomogeneousMaterial("Substrate", 6e-6, 2e-8)
m_particle = ba.HomogeneousMaterial("Particle", 6e-4, 2e-8)
@@ -21,7 +21,7 @@ def get_sample():
particle_layout.addParticle(cylinder, 1.0)
# assembling the sample
- air_layer = ba.Layer(m_ambience)
+ air_layer = ba.Layer(m_vacuum)
air_layer.addLayout(particle_layout)
substrate_layer = ba.Layer(m_substrate)
diff --git a/Examples/python/simulation/ex05_BeamAndDetector/DetectorResolutionFunction.py b/Examples/python/simulation/ex05_BeamAndDetector/DetectorResolutionFunction.py
index f2450a668e5de8345c9da5ba39637e0c670458eb..5add5e87a41c74637efcfc003f368c74926dbdaa 100644
--- a/Examples/python/simulation/ex05_BeamAndDetector/DetectorResolutionFunction.py
+++ b/Examples/python/simulation/ex05_BeamAndDetector/DetectorResolutionFunction.py
@@ -10,7 +10,7 @@ def get_sample():
Returns a sample with uncorrelated cylinders on a substrate.
"""
# defining materials
- m_ambience = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Air", 0.0, 0.0)
m_substrate = ba.HomogeneousMaterial("Substrate", 6e-6, 2e-8)
m_particle = ba.HomogeneousMaterial("Particle", 6e-4, 2e-8)
@@ -21,7 +21,7 @@ def get_sample():
particle_layout.addParticle(cylinder, 1.0)
# assembling the sample
- air_layer = ba.Layer(m_ambience)
+ air_layer = ba.Layer(m_vacuum)
air_layer.addLayout(particle_layout)
substrate_layer = ba.Layer(m_substrate)
diff --git a/Examples/python/simulation/ex05_BeamAndDetector/OffSpecularSimulation.py b/Examples/python/simulation/ex05_BeamAndDetector/OffSpecularSimulation.py
index 1e072166a73b7c52094b12160c539cf2217e4c49..36d2323b42aba69c3e118640c384b1438e2e0431 100644
--- a/Examples/python/simulation/ex05_BeamAndDetector/OffSpecularSimulation.py
+++ b/Examples/python/simulation/ex05_BeamAndDetector/OffSpecularSimulation.py
@@ -15,7 +15,7 @@ def get_sample():
modelled by infinitely long boxes forming a 1D lattice.
"""
# defining materials
- m_ambience = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Air", 0.0, 0.0)
m_substrate = ba.HomogeneousMaterial("Substrate", 6e-6, 2e-8)
m_particle = ba.HomogeneousMaterial("Particle", 6e-4, 2e-8)
@@ -35,7 +35,7 @@ def get_sample():
particle_layout.setInterferenceFunction(interference)
# assembling the sample
- air_layer = ba.Layer(m_ambience)
+ air_layer = ba.Layer(m_vacuum)
air_layer.addLayout(particle_layout)
substrate_layer = ba.Layer(m_substrate)
diff --git a/Examples/python/simulation/ex05_BeamAndDetector/RectangularDetector.py b/Examples/python/simulation/ex05_BeamAndDetector/RectangularDetector.py
index 3accdae2efd965607effab212b2e4549208d98df..a1cd1e3dff729cd4cebb786ff6cae92c8d7bf829 100644
--- a/Examples/python/simulation/ex05_BeamAndDetector/RectangularDetector.py
+++ b/Examples/python/simulation/ex05_BeamAndDetector/RectangularDetector.py
@@ -18,7 +18,7 @@ def get_sample():
Returns a sample with cylindrical particles on a substrate.
"""
# defining materials
- m_ambience = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Air", 0.0, 0.0)
m_substrate = ba.HomogeneousMaterial("Substrate", 6e-6, 2e-8)
m_particle = ba.HomogeneousMaterial("Particle", 6e-4, 2e-8)
@@ -29,7 +29,7 @@ def get_sample():
particle_layout = ba.ParticleLayout()
particle_layout.addParticle(cylinder, 1.0)
- air_layer = ba.Layer(m_ambience)
+ air_layer = ba.Layer(m_vacuum)
air_layer.addLayout(particle_layout)
substrate_layer = ba.Layer(m_substrate)
diff --git a/Examples/python/simulation/ex07_Miscellaneous/AccessingSimulationResults.py b/Examples/python/simulation/ex07_Miscellaneous/AccessingSimulationResults.py
index ad30bcad4e3ba98ae4db8f0bce6075c4054038a5..e4e5511cba19b56834b59fe090d1de29092c9778 100644
--- a/Examples/python/simulation/ex07_Miscellaneous/AccessingSimulationResults.py
+++ b/Examples/python/simulation/ex07_Miscellaneous/AccessingSimulationResults.py
@@ -15,7 +15,7 @@ def get_sample():
Returns a sample with uncorrelated cylinders on a substrate.
"""
# defining materials
- m_ambience = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Air", 0.0, 0.0)
m_substrate = ba.HomogeneousMaterial("Substrate", 6e-6, 2e-8)
m_particle = ba.HomogeneousMaterial("Particle", 6e-4, 2e-8)
@@ -25,7 +25,7 @@ def get_sample():
particle_layout = ba.ParticleLayout()
particle_layout.addParticle(cylinder, 1.0)
- air_layer = ba.Layer(m_ambience)
+ air_layer = ba.Layer(m_vacuum)
air_layer.addLayout(particle_layout)
substrate_layer = ba.Layer(m_substrate)
diff --git a/Examples/python/simulation/ex07_Miscellaneous/AxesInDifferentUnits.py b/Examples/python/simulation/ex07_Miscellaneous/AxesInDifferentUnits.py
index bdd0f06afc64a64cfc5bd9c7fa7cb6f99350591e..4527ccf199a356b73c7c76d9bd40ef8fb34405a5 100644
--- a/Examples/python/simulation/ex07_Miscellaneous/AxesInDifferentUnits.py
+++ b/Examples/python/simulation/ex07_Miscellaneous/AxesInDifferentUnits.py
@@ -13,7 +13,7 @@ def get_sample():
Returns a sample with uncorrelated cylinders on a substrate.
"""
# defining materials
- m_ambience = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Air", 0.0, 0.0)
m_substrate = ba.HomogeneousMaterial("Substrate", 6e-6, 2e-8)
m_particle = ba.HomogeneousMaterial("Particle", 6e-4, 2e-8)
@@ -23,7 +23,7 @@ def get_sample():
particle_layout = ba.ParticleLayout()
particle_layout.addParticle(cylinder, 1.0)
- air_layer = ba.Layer(m_ambience)
+ air_layer = ba.Layer(m_vacuum)
air_layer.addLayout(particle_layout)
substrate_layer = ba.Layer(m_substrate)
diff --git a/Examples/python/simulation/ex07_Miscellaneous/CylindersInAverageLayer.py b/Examples/python/simulation/ex07_Miscellaneous/CylindersInAverageLayer.py
index d89e30bea1bfe13d8f29e60204562fbafd9e6169..3890e6650abe3079fe2496321cdac7cd1ab3eba3 100644
--- a/Examples/python/simulation/ex07_Miscellaneous/CylindersInAverageLayer.py
+++ b/Examples/python/simulation/ex07_Miscellaneous/CylindersInAverageLayer.py
@@ -10,7 +10,7 @@ def get_sample(cyl_height=5*nm):
Returns a sample with cylinders on a substrate.
"""
# defining materials
- m_ambience = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Air", 0.0, 0.0)
m_layer = ba.HomogeneousMaterial("Layer", 3e-6, 2e-8)
m_substrate = ba.HomogeneousMaterial("Substrate", 6e-6, 2e-8)
m_particle = ba.HomogeneousMaterial("Particle", 3e-5, 2e-8)
@@ -28,7 +28,7 @@ def get_sample(cyl_height=5*nm):
interference.setDecayFunction(pdf)
particle_layout.setInterferenceFunction(interference)
- air_layer = ba.Layer(m_ambience)
+ air_layer = ba.Layer(m_vacuum)
intermediate_layer = ba.Layer(m_layer, 5*nm)
intermediate_layer.addLayout(particle_layout)
substrate_layer = ba.Layer(m_substrate)
diff --git a/Examples/python/simulation/ex07_Miscellaneous/FindPeaks.py b/Examples/python/simulation/ex07_Miscellaneous/FindPeaks.py
index 8b257e2c1a7b4947bf52170c3fa33ef2c4a2fead..cdbbb9c3f56a89a00a3ae27cccd9c7427e9cb39a 100644
--- a/Examples/python/simulation/ex07_Miscellaneous/FindPeaks.py
+++ b/Examples/python/simulation/ex07_Miscellaneous/FindPeaks.py
@@ -15,7 +15,7 @@ def get_sample(lattice_rotation_angle=0.0*deg):
lattice_rotation_angle = 90*deg - beam perpendicular to grating lines
"""
# defining materials
- m_ambience = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Air", 0.0, 0.0)
m_si = ba.HomogeneousMaterial("Si", 5.78164736e-6, 1.02294578e-7)
box_length, box_width, box_height = 50*micrometer, 70*nm, 50*nm
@@ -37,7 +37,7 @@ def get_sample(lattice_rotation_angle=0.0*deg):
particle_layout.setInterferenceFunction(interference)
# assembling the sample
- air_layer = ba.Layer(m_ambience)
+ air_layer = ba.Layer(m_vacuum)
air_layer.addLayout(particle_layout)
substrate_layer = ba.Layer(m_si)
diff --git a/Examples/python/simulation/ex07_Miscellaneous/HalfSpheresInAverageTopLayer.py b/Examples/python/simulation/ex07_Miscellaneous/HalfSpheresInAverageTopLayer.py
index e71753684912bb17a1ae098a7779be1ef63429b8..c0b16c1546309cddfb3c1f975c25d62188467abd 100644
--- a/Examples/python/simulation/ex07_Miscellaneous/HalfSpheresInAverageTopLayer.py
+++ b/Examples/python/simulation/ex07_Miscellaneous/HalfSpheresInAverageTopLayer.py
@@ -14,7 +14,7 @@ def get_sample():
Returns a sample with cylinders on a substrate.
"""
# defining materials
- m_ambience = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Air", 0.0, 0.0)
m_layer = ba.HomogeneousMaterial("Layer", 3e-6, 2e-8)
m_substrate = ba.HomogeneousMaterial("Substrate", 6e-6, 2e-8)
m_particle = ba.HomogeneousMaterial("Particle", 3e-5, 2e-8)
@@ -31,7 +31,7 @@ def get_sample():
interference.setDecayFunction(pdf)
particle_layout.setInterferenceFunction(interference)
- air_layer = ba.Layer(m_ambience)
+ air_layer = ba.Layer(m_vacuum)
air_layer.addLayout(particle_layout)
air_layer.setNumberOfSlices(n_slices)
substrate_layer = ba.Layer(m_substrate)
diff --git a/Tests/Functional/Python/PyEmbedded/Tests.cpp b/Tests/Functional/Python/PyEmbedded/Tests.cpp
index ded9191baa794dc9b9fbffd1e141f4b4ac80b208..c66150ce0f6c3df10c58772e8657272e00b93f52 100644
--- a/Tests/Functional/Python/PyEmbedded/Tests.cpp
+++ b/Tests/Functional/Python/PyEmbedded/Tests.cpp
@@ -315,8 +315,8 @@ TEST_F(PyEmbedded, EmbeddedMultiLayer)
buf << "import bornagain as ba \n";
buf << " \n";
buf << "def get_simulation(): \n";
- buf << " m_ambience = ba.HomogeneousMaterial(\"Air\", 0.0, 0.0) \n";
- buf << " air_layer = ba.Layer(m_ambience) \n";
+ buf << " m_vacuum = ba.HomogeneousMaterial(\"Air\", 0.0, 0.0) \n";
+ buf << " air_layer = ba.Layer(m_vacuum) \n";
buf << " multilayer = ba.MultiLayer() \n";
buf << " multilayer.addLayer(air_layer) \n";
buf << " return multilayer \n";
@@ -394,8 +394,8 @@ TEST_F(PyEmbedded, ModuleFunctionsList)
buf << "import bornagain as ba \n";
buf << " \n";
buf << "def get_simulation(): \n";
- buf << " m_ambience = ba.HomogeneousMaterial(\"Air\", 0.0, 0.0) \n";
- buf << " air_layer = ba.Layer(m_ambience) \n";
+ buf << " m_vacuum = ba.HomogeneousMaterial(\"Air\", 0.0, 0.0) \n";
+ buf << " air_layer = ba.Layer(m_vacuum) \n";
buf << " multilayer = ba.MultiLayer() \n";
buf << " multilayer.addLayer(air_layer) \n";
buf << " return multilayer \n";
diff --git a/Tests/Performance/Python/test_performance.py b/Tests/Performance/Python/test_performance.py
index d4dea94d82d9164555dc07854321b0ad4475550c..e3bda9c37fb5c37df11a152d30c61f0222da65ff 100755
--- a/Tests/Performance/Python/test_performance.py
+++ b/Tests/Performance/Python/test_performance.py
@@ -155,7 +155,7 @@ class CustomTest(FactoryTest):
Build and return the sample to calculate custom form factor in Distorted Wave Born Approximation.
"""
# defining materials
- m_ambience = HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = HomogeneousMaterial("Air", 0.0, 0.0)
m_substrate = HomogeneousMaterial("Substrate", 6e-6, 2e-8)
m_particle = HomogeneousMaterial("Particle", 6e-4, 2e-8)
@@ -164,7 +164,7 @@ class CustomTest(FactoryTest):
particle = Particle(m_particle, ff)
particle_layout = ParticleLayout()
particle_layout.addParticle(particle, 1.0)
- air_layer = Layer(m_ambience)
+ air_layer = Layer(m_vacuum)
air_layer.addLayout(particle_layout)
substrate_layer = Layer(m_substrate)