m_ambience -> m_vacuum

1e230886 · Wuttke, Joachim · 36ede645 · 1e230886 · 1e230886 · 1e230886
Commit 1e230886 authored 4 years ago by Wuttke, Joachim
--- 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);


--- 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()

--- 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()

--- 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()

--- 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)


--- 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)

--- 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)


--- 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)

--- 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)

--- 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()

--- 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)

--- 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()

--- 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()

--- 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)


--- 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)


--- 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)


--- 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 = \

--- 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)

--- 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)

--- 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)