From 47589ef8074a05065f64cb8de6be982461467405 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (l)" <j.wuttke@fz-juelich.de>
Date: Sun, 27 Sep 2020 19:37:55 +0200
Subject: [PATCH] Rename "Air" -> "Vacuum" almost everywhere
---
CHANGELOG | 2 +
...uilder.cpp => ParticleInVacuumBuilder.cpp} | 14 +-
...AirBuilder.h => ParticleInVacuumBuilder.h} | 10 +-
Core/StandardSamples/SampleBuilderFactory.cpp | 4 +-
Doc/FFCatalog/fig/ff2/bornplot.py | 8 +-
Examples/Demos/FitCylindersPrisms_movie.py | 10 +-
Examples/Demos/simul_demo_cyl_SSCA.py | 10 +-
Examples/Demos/simul_demo_cylsphere.py | 10 +-
Examples/Demos/simul_demo_lattice1.py | 10 +-
Examples/Demos/simul_demo_lattice2.py | 12 +-
Examples/Demos/simul_demo_movie.py | 10 +-
Examples/Demos/simul_demo_movie2.py | 10 +-
Examples/Demos/simul_demo_movie3.py | 10 +-
.../CylindersAndPrisms/CylindersAndPrisms.cpp | 8 +-
.../basic_fitting_tutorial.py | 10 +-
.../ex01_BasicExamples/consecutive_fitting.py | 8 +-
.../ex01_BasicExamples/minimal_fit_example.py | 2 +-
.../ex01_BasicExamples/minimizer_settings.py | 10 +-
.../ex02_AdvancedExamples/find_background.py | 8 +-
.../ex02_AdvancedExamples/fit_along_slices.py | 8 +-
.../ex02_AdvancedExamples/fit_with_masks.py | 8 +-
.../multiple_datasets.py | 8 +-
.../custom_objective_function.py | 8 +-
.../experiment_at_galaxi/sample_builder.py | 8 +-
.../external_minimizer/lmfit_basics.py | 8 +-
.../external_minimizer/lmfit_with_plotting.py | 8 +-
.../specular/FitSpecularBasics.py | 8 +-
.../specular/FitWithUncertainties.py | 8 +-
.../specular/RealLifeReflectometryFitting.py | 6 +-
.../AllFormFactorsAvailable.py | 8 +-
.../ex01_BasicParticles/CylindersAndPrisms.py | 10 +-
.../ex01_BasicParticles/CylindersInBA.py | 10 +-
.../ex01_BasicParticles/CylindersInDWBA.py | 8 +-
.../CylindersWithSizeDistribution.py | 8 +-
.../ex01_BasicParticles/RotatedPyramids.py | 8 +-
...TwoTypesOfCylindersWithSizeDistribution.py | 10 +-
.../ex02_LayeredStructures/BuriedParticles.py | 8 +-
.../ApproximationDA.py | 8 +-
.../ApproximationLMA.py | 10 +-
.../ApproximationSSCA.py | 8 +-
.../CosineRipplesAtRectLattice.py | 8 +-
.../Interference1DLattice.py | 8 +-
.../Interference1DRadialParaCrystal.py | 8 +-
.../Interference2DCenteredSquareLattice.py | 8 +-
.../Interference2DLatticeSumOfRotated.py | 8 +-
.../Interference2DParaCrystal.py | 8 +-
.../Interference2DRotatedSquareLattice.py | 8 +-
.../Interference2DSquareFiniteLattice.py | 8 +-
.../Interference2DSquareLattice.py | 8 +-
.../RectangularGrating.py | 8 +-
.../SpheresAtHexLattice.py | 8 +-
.../TriangularRipple.py | 10 +-
.../ex04_ComplexShapes/BiMaterialCylinders.py | 12 +-
.../CoreShellNanoparticles.py | 8 +-
.../ex04_ComplexShapes/CustomFormFactor.py | 8 +-
.../HexagonalLatticesWithBasis.py | 8 +-
.../LargeParticlesFormFactor.py | 8 +-
.../ex04_ComplexShapes/MesoCrystal.py | 8 +-
.../ParticlesCrossingInterface.py | 12 +-
.../ex05_BeamAndDetector/BeamDivergence.py | 8 +-
.../ConstantBackground.py | 8 +-
.../DetectorResolutionFunction.py | 8 +-
.../OffSpecularSimulation.py | 8 +-
.../RectangularDetector.py | 8 +-
.../BeamAngularDivergence.py | 6 +-
.../ex06_Reflectometry/BeamFullDivergence.py | 6 +-
.../AccessingSimulationResults.py | 8 +-
.../AxesInDifferentUnits.py | 8 +-
.../BoxesWithSpecularPeak.py | 8 +-
.../CylindersInAverageLayer.py | 6 +-
.../ex07_Miscellaneous/FindPeaks.py | 8 +-
.../HalfSpheresInAverageTopLayer.py | 10 +-
.../ex07_Miscellaneous/MagneticSpheres.py | 6 +-
.../SimulationParameters.py | 10 +-
GUI/coregui/Models/ApplicationModels.cpp | 2 +-
.../MaterialEditor/MaterialItemUtils.cpp | 2 +-
.../Functional/Python/PyCore/mesocrystal1.py | 6 +-
.../Functional/Python/PyCore/parameterpool.py | 10 +-
.../Python/PyCore/polmagcylinders1.py | 10 +-
.../Python/PyCore/polmagcylinders2.py | 10 +-
.../Python/PyCore/sliced_composition.py | 12 +-
.../Python/PyCore/sliced_spheres.py | 16 +-
.../Python/PyCore/transform_BoxComposition.py | 8 +-
.../Python/PyCore/transform_CoreShellBox.py | 6 +-
.../Functional/Python/PyCore/transform_box.py | 6 +-
.../Python/PyCore/transform_cube.py | 16 +-
Tests/Functional/Python/PyEmbedded/Tests.cpp | 12 +-
Tests/Functional/Std/StandardTests.h | 2 +-
Tests/Performance/Core/Mesocrystal.cpp | 6 +-
.../Performance/Core/ThreadingComponents.cpp | 2 +-
Tests/Performance/Python/test_performance.py | 8 +-
.../Core/Fresnel/SpecularMagneticOldTest.cpp | 8 +-
.../Core/Fresnel/SpecularMagneticTest.cpp | 6 +-
.../Core/Sample/LayerInterfaceTest.cpp | 8 +-
Tests/UnitTests/Core/Sample/LayerTest.cpp | 16 +-
.../UnitTests/Core/Sample/MultiLayerTest.cpp | 2 +-
.../Core/Sample/ParticleCompositionTest.cpp | 4 +-
.../Core/Sample/ParticleDistributionTest.cpp | 4 +-
Tests/UnitTests/Core/Sample/ParticleTest.cpp | 6 +-
Tests/UnitTests/Core/Sample/RTTest.cpp | 2 +-
Wrap/swig/libBornAgainCore.i | 4 +-
auto/Wrap/libBornAgainCore.py | 184 +++---
auto/Wrap/libBornAgainCore_wrap.cpp | 598 +++++++++---------
103 files changed, 798 insertions(+), 796 deletions(-)
rename Core/StandardSamples/{ParticleInTheAirBuilder.cpp => ParticleInVacuumBuilder.cpp} (80%)
rename Core/StandardSamples/{ParticleInTheAirBuilder.h => ParticleInVacuumBuilder.h} (79%)
diff --git a/CHANGELOG b/CHANGELOG
index 030499c6944..7552f8aaf81 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -10,6 +10,8 @@ BornAgain-1.17.99, work in progress
7) FormFactorSphereLogNormalRadius is now positioned at center, not at bottom
8) Ripple1 and Ripple2 form factors renamed to CosineRipple and SawtoothRipple
9) Support for structural roughness (Tanh + Névot-Croce) in polarized computations
+ > Important changes in examples and tests:
+ 1) Renamed "Air" -> "Vacuum"
> Changes in build configuration:
1) Python2 no longer supported
2) OpenGL can no longer be deselected
diff --git a/Core/StandardSamples/ParticleInTheAirBuilder.cpp b/Core/StandardSamples/ParticleInVacuumBuilder.cpp
similarity index 80%
rename from Core/StandardSamples/ParticleInTheAirBuilder.cpp
rename to Core/StandardSamples/ParticleInVacuumBuilder.cpp
index e02388f8d84..8f518326d3a 100644
--- a/Core/StandardSamples/ParticleInTheAirBuilder.cpp
+++ b/Core/StandardSamples/ParticleInVacuumBuilder.cpp
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file Core/StandardSamples/ParticleInTheAirBuilder.cpp
-//! @brief Implements class ParticleInTheAirBuilder.
+//! @file Core/StandardSamples/ParticleInVacuumBuilder.cpp
+//! @brief Implements class ParticleInVacuumBuilder.
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -12,7 +12,7 @@
//
// ************************************************************************** //
-#include "Core/StandardSamples/ParticleInTheAirBuilder.h"
+#include "Core/StandardSamples/ParticleInVacuumBuilder.h"
#include "Core/Aggregate/ParticleLayout.h"
#include "Core/Basics/Exceptions.h"
#include "Core/Basics/Units.h"
@@ -27,12 +27,12 @@ namespace {
FormFactorComponents ff_components;
}
-ParticleInTheAirBuilder::ParticleInTheAirBuilder()
+ParticleInVacuumBuilder::ParticleInVacuumBuilder()
: m_ff(new FormFactorFullSphere(5.0 * Units::nanometer))
{
}
-MultiLayer* ParticleInTheAirBuilder::buildSample() const
+MultiLayer* ParticleInVacuumBuilder::buildSample() const
{
Material vacuum_material = HomogeneousMaterial("Vacuum", 0.0, 0.0);
Material particle_material = HomogeneousMaterial("Particle", 6e-4, 2e-8);
@@ -48,7 +48,7 @@ MultiLayer* ParticleInTheAirBuilder::buildSample() const
return result;
}
-MultiLayer* ParticleInTheAirBuilder::createSampleByIndex(size_t index)
+MultiLayer* ParticleInVacuumBuilder::createSampleByIndex(size_t index)
{
auto name = ff_components.keys().at(index);
m_ff.reset(ff_components.getItem(name)->clone());
@@ -56,7 +56,7 @@ MultiLayer* ParticleInTheAirBuilder::createSampleByIndex(size_t index)
return buildSample();
}
-size_t ParticleInTheAirBuilder::size()
+size_t ParticleInVacuumBuilder::size()
{
return ff_components.size();
}
diff --git a/Core/StandardSamples/ParticleInTheAirBuilder.h b/Core/StandardSamples/ParticleInVacuumBuilder.h
similarity index 79%
rename from Core/StandardSamples/ParticleInTheAirBuilder.h
rename to Core/StandardSamples/ParticleInVacuumBuilder.h
index 812c9c0cb2b..cdd7b2b4d99 100644
--- a/Core/StandardSamples/ParticleInTheAirBuilder.h
+++ b/Core/StandardSamples/ParticleInVacuumBuilder.h
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file Core/StandardSamples/ParticleInTheAirBuilder.h
-//! @brief Defines class ParticleInTheAirBuilder.
+//! @file Core/StandardSamples/ParticleInVacuumBuilder.h
+//! @brief Defines class ParticleInVacuumBuilder.
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -20,15 +20,15 @@
class IFormFactor;
-//! The ParticleInTheAirBuilder class generates a multilayer with single air layer
+//! The ParticleInVacuumBuilder class generates a multilayer with single vacuum layer
//! populated with particles of certain types.
//! Requires IComponentService which generates form factors, used for bulk form factors testing.
//! @ingroup standard_samples
-class ParticleInTheAirBuilder : public ISampleBuilder
+class ParticleInVacuumBuilder : public ISampleBuilder
{
public:
- ParticleInTheAirBuilder();
+ ParticleInVacuumBuilder();
virtual MultiLayer* buildSample() const;
MultiLayer* createSampleByIndex(size_t index);
diff --git a/Core/StandardSamples/SampleBuilderFactory.cpp b/Core/StandardSamples/SampleBuilderFactory.cpp
index 6a2738f9c2d..715077b5110 100644
--- a/Core/StandardSamples/SampleBuilderFactory.cpp
+++ b/Core/StandardSamples/SampleBuilderFactory.cpp
@@ -33,7 +33,7 @@
#include "Core/StandardSamples/ParaCrystalBuilder.h"
#include "Core/StandardSamples/ParticleCompositionBuilder.h"
#include "Core/StandardSamples/ParticleDistributionsBuilder.h"
-#include "Core/StandardSamples/ParticleInTheAirBuilder.h"
+#include "Core/StandardSamples/ParticleInVacuumBuilder.h"
#include "Core/StandardSamples/PercusYevickBuilder.h"
#include "Core/StandardSamples/PlainMultiLayerBySLDBuilder.h"
#include "Core/StandardSamples/ResonatorBuilder.h"
@@ -158,7 +158,7 @@ SampleBuilderFactory::SampleBuilderFactory()
registerItem("BoxStackCompositionBuilder", create_new<BoxStackCompositionBuilder>);
- registerItem("ParticleInTheAirBuilder", create_new<ParticleInTheAirBuilder>);
+ registerItem("ParticleInVacuumBuilder", create_new<ParticleInVacuumBuilder>);
registerItem("TransformBoxBuilder", create_new<TransformBoxBuilder>);
diff --git a/Doc/FFCatalog/fig/ff2/bornplot.py b/Doc/FFCatalog/fig/ff2/bornplot.py
index cec0f785a39..b5bd7d63d8d 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_vacuum = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Vacuum", 0.0, 0.0)
m_particle = ba.HomogeneousMaterial("Particle", 1e-5, 0)
# collection of particles
@@ -132,11 +132,11 @@ def get_sample(ff, trafo):
else:
particle_layout.addParticle(particle)
- air_layer = ba.Layer(m_vacuum)
- air_layer.addLayout(particle_layout)
+ vacuum_layer = ba.Layer(m_vacuum)
+ vacuum_layer.addLayout(particle_layout)
multi_layer = ba.MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
return multi_layer
diff --git a/Examples/Demos/FitCylindersPrisms_movie.py b/Examples/Demos/FitCylindersPrisms_movie.py
index c194881a705..c099201bb87 100644
--- a/Examples/Demos/FitCylindersPrisms_movie.py
+++ b/Examples/Demos/FitCylindersPrisms_movie.py
@@ -44,7 +44,7 @@ def get_sample(cylinder_height=1.0*nanometer,
substrate without interference.
"""
# defining materials
- m_air = HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = HomogeneousMaterial("Vacuum", 0.0, 0.0)
m_substrate = HomogeneousMaterial("Substrate", 6e-6, 2e-8)
m_particle = HomogeneousMaterial("Particle", 6e-4, 2e-8)
@@ -59,12 +59,12 @@ def get_sample(cylinder_height=1.0*nanometer,
interference = InterferenceFunctionNone()
particle_layout.setInterferenceFunction(interference)
- # air layer with particles and substrate form multi layer
- air_layer = Layer(m_air)
- air_layer.addLayout(particle_layout)
+ # vacuum layer with particles and substrate form multi layer
+ vacuum_layer = Layer(m_vacuum)
+ vacuum_layer.addLayout(particle_layout)
substrate_layer = Layer(m_substrate, 0)
multi_layer = MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
multi_layer.addLayer(substrate_layer)
return multi_layer
diff --git a/Examples/Demos/simul_demo_cyl_SSCA.py b/Examples/Demos/simul_demo_cyl_SSCA.py
index da571fdcd36..e469a40df3d 100644
--- a/Examples/Demos/simul_demo_cyl_SSCA.py
+++ b/Examples/Demos/simul_demo_cyl_SSCA.py
@@ -12,7 +12,7 @@ from bornagain import *
# ----------------------------------
def RunSimulation():
# defining materials
- mAir = HomogeneousMaterial("Air", 0.0, 0.0)
+ mVacuum = HomogeneousMaterial("Vacuum", 0.0, 0.0)
mSubstrate = HomogeneousMaterial("Substrate", 6e-6, 2e-8)
mParticle =HomogeneousMaterial("Particle", 6e-4, 2e-8)
mLayer = HomogeneousMaterial("Layer", 2e-5, 2e-8)
@@ -35,12 +35,12 @@ def RunSimulation():
interference.setKappa(2)
particle_layout.setInterferenceFunction(interference)
- # air layer with particles and substrate form multi layer
- air_layer = Layer(mAir)
- air_layer.addLayout(particle_layout)
+ # vacuum layer with particles and substrate form multi layer
+ vacuum_layer = Layer(mVacuum)
+ vacuum_layer.addLayout(particle_layout)
substrate_layer = Layer(mSubstrate)
multi_layer = MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
roughness = LayerRoughness(10 * nanometer, 3, 20 * nanometer)
multi_layer.addLayerWithTopRoughness(substrate_layer, roughness)
diff --git a/Examples/Demos/simul_demo_cylsphere.py b/Examples/Demos/simul_demo_cylsphere.py
index 402accc3349..1b7f60f258a 100644
--- a/Examples/Demos/simul_demo_cylsphere.py
+++ b/Examples/Demos/simul_demo_cylsphere.py
@@ -12,7 +12,7 @@ from bornagain import *
# ----------------------------------
def RunSimulation():
# defining materials
- mAir = HomogeneousMaterial("Air", 0.0, 0.0)
+ mVacuum = HomogeneousMaterial("Vacuum", 0.0, 0.0)
mSubstrate = HomogeneousMaterial("Substrate", 6e-6, 2e-8)
mParticle = HomogeneousMaterial("Particle", 6e-4, 2e-8)
@@ -29,12 +29,12 @@ def RunSimulation():
interference.setProbabilityDistribution(pdf)
particle_layout.setInterferenceFunction(interference)
- # air layer with particles and substrate form multi layer
- air_layer = Layer(mAir)
- air_layer.addLayout(particle_layout)
+ # vacuum layer with particles and substrate form multi layer
+ vacuum_layer = Layer(mVacuum)
+ vacuum_layer.addLayout(particle_layout)
substrate_layer = Layer(mSubstrate)
multi_layer = MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
multi_layer.addLayer(substrate_layer)
# build and run experiment
diff --git a/Examples/Demos/simul_demo_lattice1.py b/Examples/Demos/simul_demo_lattice1.py
index 092212fd12b..7b433807041 100644
--- a/Examples/Demos/simul_demo_lattice1.py
+++ b/Examples/Demos/simul_demo_lattice1.py
@@ -14,7 +14,7 @@ M_PI = numpy.pi
# ----------------------------------
def RunSimulation():
# defining materials
- mAmbience = HomogeneousMaterial("Air", 0.0, 0.0 )
+ mAmbience = HomogeneousMaterial("Vacuum", 0.0, 0.0 )
mSubstrate = HomogeneousMaterial("Substrate", 6e-6, 2e-8 )
mParticle = HomogeneousMaterial("Particle", 6e-4, 2e-8 )
@@ -32,16 +32,16 @@ def RunSimulation():
interference.setDecayFunction(pdf)
particle_layout.setInterferenceFunction(interference)
- # top air layer
- air_layer = Layer(mAmbience)
- air_layer.addLayout(particle_layout)
+ # top vacuum layer
+ vacuum_layer = Layer(mAmbience)
+ vacuum_layer.addLayout(particle_layout)
# substrate layer
substrate_layer = Layer(mSubstrate, 0)
# multilayer
multi_layer = MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
multi_layer.addLayer(substrate_layer)
# build and run experiment
diff --git a/Examples/Demos/simul_demo_lattice2.py b/Examples/Demos/simul_demo_lattice2.py
index 83ec2511239..67b89d1f7ce 100644
--- a/Examples/Demos/simul_demo_lattice2.py
+++ b/Examples/Demos/simul_demo_lattice2.py
@@ -14,7 +14,7 @@ M_PI = numpy.pi
# ----------------------------------
def RunSimulation():
# defining materials
- mAmbience = HomogeneousMaterial("Air", 0.0, 0.0 )
+ mAmbience = HomogeneousMaterial("Vacuum", 0.0, 0.0 )
mSubstrate = HomogeneousMaterial("Substrate", 6e-6, 2e-8 )
mParticle = HomogeneousMaterial("Particle", 6e-4, 2e-8 )
@@ -38,17 +38,17 @@ def RunSimulation():
particle_layout1.setInterferenceFunction(interference)
particle_layout2.setInterferenceFunction(interference)
- # top air layer
- air_layer = Layer(mAmbience)
- air_layer.addLayout(particle_layout1)
- air_layer.addLayout(particle_layout2)
+ # top vacuum layer
+ vacuum_layer = Layer(mAmbience)
+ vacuum_layer.addLayout(particle_layout1)
+ vacuum_layer.addLayout(particle_layout2)
# substrate layer
substrate_layer = Layer(mSubstrate, 0)
# multilayer
multi_layer = MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
multi_layer.addLayer(substrate_layer)
# build and run experiment
diff --git a/Examples/Demos/simul_demo_movie.py b/Examples/Demos/simul_demo_movie.py
index d07bcbad696..dfb7de2e43d 100644
--- a/Examples/Demos/simul_demo_movie.py
+++ b/Examples/Demos/simul_demo_movie.py
@@ -19,7 +19,7 @@ distance = 5
# ----------------------------------
def RunSimulation():
# defining materials
- mAir = HomogeneousMaterial("Air", 0.0, 0.0)
+ mVacuum = HomogeneousMaterial("Vacuum", 0.0, 0.0)
mSubstrate = HomogeneousMaterial("Substrate", 6e-6, 2e-8)
mParticle = HomogeneousMaterial("Particle", 6e-4, 2e-8)
@@ -35,12 +35,12 @@ def RunSimulation():
interference.setProbabilityDistribution(pdf)
particle_layout.setInterferenceFunction(interference)
- # air layer with particles and substrate form multi layer
- air_layer = Layer(mAir)
- air_layer.addLayout(particle_layout)
+ # vacuum layer with particles and substrate form multi layer
+ vacuum_layer = Layer(mVacuum)
+ vacuum_layer.addLayout(particle_layout)
substrate_layer = Layer(mSubstrate)
multi_layer = MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
multi_layer.addLayer(substrate_layer)
# build and run experiment
diff --git a/Examples/Demos/simul_demo_movie2.py b/Examples/Demos/simul_demo_movie2.py
index 97356790a35..72b73ae6537 100644
--- a/Examples/Demos/simul_demo_movie2.py
+++ b/Examples/Demos/simul_demo_movie2.py
@@ -18,7 +18,7 @@ Ngrowframes = 30
# ----------------------------------
def RunSimulation():
# defining materials
- mAir = HomogeneousMaterial("Air", 0.0, 0.0)
+ mVacuum = HomogeneousMaterial("Vacuum", 0.0, 0.0)
mSubstrate = HomogeneousMaterial("Substrate", 6e-6, 2e-8)
mParticle = HomogeneousMaterial("Particle", 6e-4, 2e-8)
@@ -34,13 +34,13 @@ def RunSimulation():
interference.setProbabilityDistribution(pdf)
particle_layout.setInterferenceFunction(interference)
- # air layer with particles and substrate form multi layer
- air_layer = Layer(mAir)
- air_layer.addLayout(particle_layout)
+ # vacuum layer with particles and substrate form multi layer
+ vacuum_layer = Layer(mVacuum)
+ vacuum_layer.addLayout(particle_layout)
film_layer = Layer(mParticle, layer_thickness)
substrate_layer = Layer(mSubstrate)
multi_layer = MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
multi_layer.addLayer(film_layer)
multi_layer.addLayer(substrate_layer)
diff --git a/Examples/Demos/simul_demo_movie3.py b/Examples/Demos/simul_demo_movie3.py
index cfaa260730d..0037480b61e 100644
--- a/Examples/Demos/simul_demo_movie3.py
+++ b/Examples/Demos/simul_demo_movie3.py
@@ -17,7 +17,7 @@ kappa = 0.
# ----------------------------------
def RunSimulation():
# defining materials
- mAir = HomogeneousMaterial("Air", 0.0, 0.0)
+ mVacuum = HomogeneousMaterial("Vacuum", 0.0, 0.0)
mSubstrate = HomogeneousMaterial("Substrate", 6e-6, 2e-8)
mParticle = HomogeneousMaterial("Particle", 6e-4, 2e-8)
mLayer = HomogeneousMaterial("Layer", 2e-5, 2e-8)
@@ -40,12 +40,12 @@ def RunSimulation():
interference.setKappa(kappa)
particle_layout.setInterferenceFunction(interference)
- # air layer with particles and substrate form multi layer
- air_layer = Layer(mAir)
- air_layer.addLayout(particle_layout)
+ # vacuum layer with particles and substrate form multi layer
+ vacuum_layer = Layer(mVacuum)
+ vacuum_layer.addLayout(particle_layout)
substrate_layer = Layer(mSubstrate)
multi_layer = MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
roughness = LayerRoughness(10 * nanometer, 3, 20 * nanometer)
multi_layer.addLayerWithTopRoughness(substrate_layer, roughness)
diff --git a/Examples/cpp/CylindersAndPrisms/CylindersAndPrisms.cpp b/Examples/cpp/CylindersAndPrisms/CylindersAndPrisms.cpp
index 02c15212ec6..60ad1653d68 100644
--- a/Examples/cpp/CylindersAndPrisms/CylindersAndPrisms.cpp
+++ b/Examples/cpp/CylindersAndPrisms/CylindersAndPrisms.cpp
@@ -29,10 +29,10 @@
int main()
{
// Define the sample
- Material air_material = HomogeneousMaterial("Air", 0., 0.);
+ Material vacuum_material = HomogeneousMaterial("Vacuum", 0., 0.);
Material substrate_material = HomogeneousMaterial("Substrate", 6e-6, 2e-8);
- Layer air_layer(air_material);
+ Layer vacuum_layer(vacuum_material);
Layer substrate_layer(substrate_material);
ParticleLayout particle_layout;
@@ -46,10 +46,10 @@ int main()
FormFactorPrism3(10 * Units::nanometer, 5 * Units::nanometer));
particle_layout.addParticle(prism, 0.5);
- air_layer.addLayout(particle_layout);
+ vacuum_layer.addLayout(particle_layout);
MultiLayer sample;
- sample.addLayer(air_layer);
+ sample.addLayer(vacuum_layer);
sample.addLayer(substrate_layer);
// Define the simulation
diff --git a/Examples/python/fitting/ex01_BasicExamples/basic_fitting_tutorial.py b/Examples/python/fitting/ex01_BasicExamples/basic_fitting_tutorial.py
index 96e5045d95f..14b06998c3c 100644
--- a/Examples/python/fitting/ex01_BasicExamples/basic_fitting_tutorial.py
+++ b/Examples/python/fitting/ex01_BasicExamples/basic_fitting_tutorial.py
@@ -19,7 +19,7 @@ def get_sample(params):
prism_base_edge = params["prism_base_edge"]
# defining materials
- m_air = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Vacuum", 0.0, 0.0)
m_substrate = ba.HomogeneousMaterial("Substrate", 6e-6, 2e-8)
m_particle = ba.HomogeneousMaterial("Particle", 6e-4, 2e-8)
@@ -32,12 +32,12 @@ def get_sample(params):
layout.addParticle(cylinder, 0.5)
layout.addParticle(prism, 0.5)
- # air layer with particles and substrate form multi layer
- air_layer = ba.Layer(m_air)
- air_layer.addLayout(layout)
+ # vacuum layer with particles and substrate form multi layer
+ vacuum_layer = ba.Layer(m_vacuum)
+ vacuum_layer.addLayout(layout)
substrate_layer = ba.Layer(m_substrate, 0)
multi_layer = ba.MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
multi_layer.addLayer(substrate_layer)
return multi_layer
diff --git a/Examples/python/fitting/ex01_BasicExamples/consecutive_fitting.py b/Examples/python/fitting/ex01_BasicExamples/consecutive_fitting.py
index 63f41d7e6b5..56d5dc25bae 100644
--- a/Examples/python/fitting/ex01_BasicExamples/consecutive_fitting.py
+++ b/Examples/python/fitting/ex01_BasicExamples/consecutive_fitting.py
@@ -19,7 +19,7 @@ def get_sample(params):
radius = params["radius"]
height = params["height"]
- m_air = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Vacuum", 0.0, 0.0)
m_substrate = ba.HomogeneousMaterial("Substrate", 6e-6, 2e-8)
m_particle = ba.HomogeneousMaterial("Particle", 6e-4, 2e-8)
@@ -29,12 +29,12 @@ def get_sample(params):
layout = ba.ParticleLayout()
layout.addParticle(cylinder)
- air_layer = ba.Layer(m_air)
- air_layer.addLayout(layout)
+ vacuum_layer = ba.Layer(m_vacuum)
+ vacuum_layer.addLayout(layout)
substrate_layer = ba.Layer(m_substrate, 0)
multi_layer = ba.MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
multi_layer.addLayer(substrate_layer)
return multi_layer
diff --git a/Examples/python/fitting/ex01_BasicExamples/minimal_fit_example.py b/Examples/python/fitting/ex01_BasicExamples/minimal_fit_example.py
index ffea9b27fde..bc71decbb20 100644
--- a/Examples/python/fitting/ex01_BasicExamples/minimal_fit_example.py
+++ b/Examples/python/fitting/ex01_BasicExamples/minimal_fit_example.py
@@ -14,7 +14,7 @@ def get_simulation(params):
sphere = ba.Particle(ba.HomogeneousMaterial("Particle", 6e-4, 2e-8),
ba.FormFactorFullSphere(radius))
- layer = ba.Layer(ba.HomogeneousMaterial("Air", 0.0, 0.0))
+ layer = ba.Layer(ba.HomogeneousMaterial("Vacuum", 0.0, 0.0))
layer.addLayout(ba.ParticleLayout(sphere))
multi_layer = ba.MultiLayer()
multi_layer.addLayer(layer)
diff --git a/Examples/python/fitting/ex01_BasicExamples/minimizer_settings.py b/Examples/python/fitting/ex01_BasicExamples/minimizer_settings.py
index cba3e0038dc..871368b4efc 100644
--- a/Examples/python/fitting/ex01_BasicExamples/minimizer_settings.py
+++ b/Examples/python/fitting/ex01_BasicExamples/minimizer_settings.py
@@ -15,7 +15,7 @@ def get_sample(params):
prism_base_edge = params["prism_base_edge"]
# defining materials
- m_air = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Vacuum", 0.0, 0.0)
m_substrate = ba.HomogeneousMaterial("Substrate", 6e-6, 2e-8)
m_particle = ba.HomogeneousMaterial("Particle", 6e-4, 2e-8)
@@ -30,12 +30,12 @@ def get_sample(params):
interference = ba.InterferenceFunctionNone()
layout.setInterferenceFunction(interference)
- # air layer with particles and substrate form multi layer
- air_layer = ba.Layer(m_air)
- air_layer.addLayout(layout)
+ # vacuum layer with particles and substrate form multi layer
+ vacuum_layer = ba.Layer(m_vacuum)
+ vacuum_layer.addLayout(layout)
substrate_layer = ba.Layer(m_substrate, 0)
multi_layer = ba.MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
multi_layer.addLayer(substrate_layer)
return multi_layer
diff --git a/Examples/python/fitting/ex02_AdvancedExamples/find_background.py b/Examples/python/fitting/ex02_AdvancedExamples/find_background.py
index 21a6e3b554b..7c40fe97c10 100644
--- a/Examples/python/fitting/ex02_AdvancedExamples/find_background.py
+++ b/Examples/python/fitting/ex02_AdvancedExamples/find_background.py
@@ -19,7 +19,7 @@ def get_sample(params):
radius = params["radius"]
height = params["height"]
- m_air = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Vacuum", 0.0, 0.0)
m_substrate = ba.HomogeneousMaterial("Substrate", 6e-6, 2e-8)
m_particle = ba.HomogeneousMaterial("Particle", 6e-4, 2e-8)
@@ -29,12 +29,12 @@ def get_sample(params):
layout = ba.ParticleLayout()
layout.addParticle(cylinder)
- air_layer = ba.Layer(m_air)
- air_layer.addLayout(layout)
+ vacuum_layer = ba.Layer(m_vacuum)
+ vacuum_layer.addLayout(layout)
substrate_layer = ba.Layer(m_substrate, 0)
multi_layer = ba.MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
multi_layer.addLayer(substrate_layer)
return multi_layer
diff --git a/Examples/python/fitting/ex02_AdvancedExamples/fit_along_slices.py b/Examples/python/fitting/ex02_AdvancedExamples/fit_along_slices.py
index c1d64db3f78..5f0954246e9 100644
--- a/Examples/python/fitting/ex02_AdvancedExamples/fit_along_slices.py
+++ b/Examples/python/fitting/ex02_AdvancedExamples/fit_along_slices.py
@@ -17,7 +17,7 @@ def get_sample(params):
radius = params["radius"]
height = params["height"]
- m_air = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Vacuum", 0.0, 0.0)
m_substrate = ba.HomogeneousMaterial("Substrate", 6e-6, 2e-8)
m_particle = ba.HomogeneousMaterial("Particle", 6e-4, 2e-8)
@@ -27,12 +27,12 @@ def get_sample(params):
layout = ba.ParticleLayout()
layout.addParticle(cylinder)
- air_layer = ba.Layer(m_air)
- air_layer.addLayout(layout)
+ vacuum_layer = ba.Layer(m_vacuum)
+ vacuum_layer.addLayout(layout)
substrate_layer = ba.Layer(m_substrate, 0)
multi_layer = ba.MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
multi_layer.addLayer(substrate_layer)
return multi_layer
diff --git a/Examples/python/fitting/ex02_AdvancedExamples/fit_with_masks.py b/Examples/python/fitting/ex02_AdvancedExamples/fit_with_masks.py
index ae0cc0dea9d..2306038950c 100644
--- a/Examples/python/fitting/ex02_AdvancedExamples/fit_with_masks.py
+++ b/Examples/python/fitting/ex02_AdvancedExamples/fit_with_masks.py
@@ -16,7 +16,7 @@ def get_sample(params):
radius = params["radius"]
height = params["height"]
- m_air = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Vacuum", 0.0, 0.0)
m_substrate = ba.HomogeneousMaterial("Substrate", 6e-6, 2e-8)
m_particle = ba.HomogeneousMaterial("Particle", 6e-4, 2e-8)
@@ -26,12 +26,12 @@ def get_sample(params):
layout = ba.ParticleLayout()
layout.addParticle(cylinder)
- air_layer = ba.Layer(m_air)
- air_layer.addLayout(layout)
+ vacuum_layer = ba.Layer(m_vacuum)
+ vacuum_layer.addLayout(layout)
substrate_layer = ba.Layer(m_substrate, 0)
multi_layer = ba.MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
multi_layer.addLayer(substrate_layer)
return multi_layer
diff --git a/Examples/python/fitting/ex02_AdvancedExamples/multiple_datasets.py b/Examples/python/fitting/ex02_AdvancedExamples/multiple_datasets.py
index 2ac100cc72d..ae0cb86e846 100644
--- a/Examples/python/fitting/ex02_AdvancedExamples/multiple_datasets.py
+++ b/Examples/python/fitting/ex02_AdvancedExamples/multiple_datasets.py
@@ -17,7 +17,7 @@ def get_sample(params):
radius_b = params["radius_b"]
height = params["height"]
- m_air = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Vacuum", 0.0, 0.0)
m_substrate = ba.HomogeneousMaterial("Substrate", 6e-6, 2e-8)
m_particle = ba.HomogeneousMaterial("Particle", 6e-4, 2e-8)
@@ -27,12 +27,12 @@ def get_sample(params):
layout = ba.ParticleLayout()
layout.addParticle(particle)
- air_layer = ba.Layer(m_air)
- air_layer.addLayout(layout)
+ vacuum_layer = ba.Layer(m_vacuum)
+ vacuum_layer.addLayout(layout)
substrate_layer = ba.Layer(m_substrate)
multi_layer = ba.MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
multi_layer.addLayer(substrate_layer)
return multi_layer
diff --git a/Examples/python/fitting/ex03_ExtendedExamples/custom_objective_function/custom_objective_function.py b/Examples/python/fitting/ex03_ExtendedExamples/custom_objective_function/custom_objective_function.py
index a5a993609e8..7bf6b538dfd 100644
--- a/Examples/python/fitting/ex03_ExtendedExamples/custom_objective_function/custom_objective_function.py
+++ b/Examples/python/fitting/ex03_ExtendedExamples/custom_objective_function/custom_objective_function.py
@@ -42,7 +42,7 @@ def get_sample(params):
radius = params['radius']
lattice_length = params['length']
- m_air = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Vacuum", 0.0, 0.0)
m_substrate = ba.HomogeneousMaterial("Substrate", 6e-6, 2e-8)
m_particle = ba.HomogeneousMaterial("Particle", 6e-4, 2e-8)
@@ -57,11 +57,11 @@ def get_sample(params):
particle_layout.setInterferenceFunction(interference)
- air_layer = ba.Layer(m_air)
- air_layer.addLayout(particle_layout)
+ vacuum_layer = ba.Layer(m_vacuum)
+ vacuum_layer.addLayout(particle_layout)
substrate_layer = ba.Layer(m_substrate, 0)
multi_layer = ba.MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
multi_layer.addLayer(substrate_layer)
return multi_layer
diff --git a/Examples/python/fitting/ex03_ExtendedExamples/experiment_at_galaxi/sample_builder.py b/Examples/python/fitting/ex03_ExtendedExamples/experiment_at_galaxi/sample_builder.py
index 9a3dfffe63d..dffe9da4479 100644
--- a/Examples/python/fitting/ex03_ExtendedExamples/experiment_at_galaxi/sample_builder.py
+++ b/Examples/python/fitting/ex03_ExtendedExamples/experiment_at_galaxi/sample_builder.py
@@ -1,6 +1,6 @@
"""
3 layers system (substrate, teflon, air).
-Air layer is populated with spheres with size distribution.
+Vacuum layer is populated with spheres with size distribution.
"""
import bornagain as ba
@@ -42,7 +42,7 @@ class SampleBuilder:
"""
# defining materials
- m_air = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Vacuum", 0.0, 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)
@@ -81,7 +81,7 @@ class SampleBuilder:
r_hmdso = ba.LayerRoughness(1.1*ba.nm, 0.3, 5.0*ba.nm)
# layers
- air_layer = ba.Layer(m_air)
+ vacuum_layer = ba.Layer(m_vacuum)
hmdso_layer = ba.Layer(m_HMDSO, self.hmdso_thickness)
hmdso_layer.addLayout(layout)
ptfe_layer = ba.Layer(m_PTFE, self.ptfe_thickness)
@@ -89,7 +89,7 @@ class SampleBuilder:
# assembling multilayer
multi_layer = ba.MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
multi_layer.addLayerWithTopRoughness(hmdso_layer, r_hmdso)
multi_layer.addLayerWithTopRoughness(ptfe_layer, r_ptfe)
multi_layer.addLayer(substrate_layer)
diff --git a/Examples/python/fitting/ex03_ExtendedExamples/external_minimizer/lmfit_basics.py b/Examples/python/fitting/ex03_ExtendedExamples/external_minimizer/lmfit_basics.py
index 296d04e527f..04b310c0d98 100644
--- a/Examples/python/fitting/ex03_ExtendedExamples/external_minimizer/lmfit_basics.py
+++ b/Examples/python/fitting/ex03_ExtendedExamples/external_minimizer/lmfit_basics.py
@@ -16,7 +16,7 @@ def get_sample(params):
radius = params['radius']
lattice_length = params['length']
- m_air = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Vacuum", 0.0, 0.0)
m_substrate = ba.HomogeneousMaterial("Substrate", 6e-6, 2e-8)
m_particle = ba.HomogeneousMaterial("Particle", 6e-4, 2e-8)
@@ -31,11 +31,11 @@ def get_sample(params):
particle_layout.setInterferenceFunction(interference)
- air_layer = ba.Layer(m_air)
- air_layer.addLayout(particle_layout)
+ vacuum_layer = ba.Layer(m_vacuum)
+ vacuum_layer.addLayout(particle_layout)
substrate_layer = ba.Layer(m_substrate, 0)
multi_layer = ba.MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
multi_layer.addLayer(substrate_layer)
return multi_layer
diff --git a/Examples/python/fitting/ex03_ExtendedExamples/external_minimizer/lmfit_with_plotting.py b/Examples/python/fitting/ex03_ExtendedExamples/external_minimizer/lmfit_with_plotting.py
index 5c62c3fc915..fa9b864483a 100644
--- a/Examples/python/fitting/ex03_ExtendedExamples/external_minimizer/lmfit_with_plotting.py
+++ b/Examples/python/fitting/ex03_ExtendedExamples/external_minimizer/lmfit_with_plotting.py
@@ -17,7 +17,7 @@ def get_sample(params):
radius = params['radius']
lattice_length = params['length']
- m_air = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Vacuum", 0.0, 0.0)
m_substrate = ba.HomogeneousMaterial("Substrate", 6e-6, 2e-8)
m_particle = ba.HomogeneousMaterial("Particle", 6e-4, 2e-8)
@@ -32,11 +32,11 @@ def get_sample(params):
particle_layout.setInterferenceFunction(interference)
- air_layer = ba.Layer(m_air)
- air_layer.addLayout(particle_layout)
+ vacuum_layer = ba.Layer(m_vacuum)
+ vacuum_layer.addLayout(particle_layout)
substrate_layer = ba.Layer(m_substrate, 0)
multi_layer = ba.MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
multi_layer.addLayer(substrate_layer)
return multi_layer
diff --git a/Examples/python/fitting/ex03_ExtendedExamples/specular/FitSpecularBasics.py b/Examples/python/fitting/ex03_ExtendedExamples/specular/FitSpecularBasics.py
index 672997875a6..d74b5ef0b15 100644
--- a/Examples/python/fitting/ex03_ExtendedExamples/specular/FitSpecularBasics.py
+++ b/Examples/python/fitting/ex03_ExtendedExamples/specular/FitSpecularBasics.py
@@ -33,18 +33,18 @@ def get_sample(params):
ti_thickness = params["ti_thickness"]
# defining materials
- m_air = ba.MaterialBySLD()
+ m_vacuum = ba.MaterialBySLD()
m_ni = ba.MaterialBySLD("Ni", ni_sld_real, 0.0)
m_ti = ba.MaterialBySLD("Ti", ti_sld_real, 0.0)
m_substrate = ba.MaterialBySLD("SiSubstrate", si_sld_real, 0.0)
- # air layer and substrate form multi layer
- air_layer = ba.Layer(m_air)
+ # vacuum layer and substrate form multi layer
+ vacuum_layer = ba.Layer(m_vacuum)
ni_layer = ba.Layer(m_ni, ni_thickness)
ti_layer = ba.Layer(m_ti, ti_thickness)
substrate_layer = ba.Layer(m_substrate)
multi_layer = ba.MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
for i in range(n_repetitions):
multi_layer.addLayer(ti_layer)
multi_layer.addLayer(ni_layer)
diff --git a/Examples/python/fitting/ex03_ExtendedExamples/specular/FitWithUncertainties.py b/Examples/python/fitting/ex03_ExtendedExamples/specular/FitWithUncertainties.py
index adbb1387623..e0033ae3dd8 100644
--- a/Examples/python/fitting/ex03_ExtendedExamples/specular/FitWithUncertainties.py
+++ b/Examples/python/fitting/ex03_ExtendedExamples/specular/FitWithUncertainties.py
@@ -38,18 +38,18 @@ def get_sample(params):
ti_thickness = params["ti_thickness"]
# defining materials
- m_air = ba.MaterialBySLD()
+ m_vacuum = ba.MaterialBySLD()
m_ni = ba.MaterialBySLD("Ni", ni_sld_real, 0.0)
m_ti = ba.MaterialBySLD("Ti", ti_sld_real, 0.0)
m_substrate = ba.MaterialBySLD("SiSubstrate", si_sld_real, 0.0)
- # air layer and substrate form multi layer
- air_layer = ba.Layer(m_air)
+ # vacuum layer and substrate form multi layer
+ vacuum_layer = ba.Layer(m_vacuum)
ni_layer = ba.Layer(m_ni, ni_thickness)
ti_layer = ba.Layer(m_ti, ti_thickness)
substrate_layer = ba.Layer(m_substrate)
multi_layer = ba.MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
for i in range(n_repetitions):
multi_layer.addLayer(ti_layer)
multi_layer.addLayer(ni_layer)
diff --git a/Examples/python/fitting/ex03_ExtendedExamples/specular/RealLifeReflectometryFitting.py b/Examples/python/fitting/ex03_ExtendedExamples/specular/RealLifeReflectometryFitting.py
index b757256f4cf..9400dfb9af3 100644
--- a/Examples/python/fitting/ex03_ExtendedExamples/specular/RealLifeReflectometryFitting.py
+++ b/Examples/python/fitting/ex03_ExtendedExamples/specular/RealLifeReflectometryFitting.py
@@ -109,7 +109,7 @@ def buildSample(arg_dict):
Creates sample and returns it
"""
# defining materials
- m_air = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Vacuum", 0.0, 0.0)
m_si_o2 = ba.HomogeneousMaterial("SiO2",
8.57040868e-06 * arg_dict["concentration"],
1.11016654e-07 * arg_dict["concentration"])
@@ -119,13 +119,13 @@ def buildSample(arg_dict):
r_si = ba.LayerRoughness(arg_dict["roughness"], 0, 0)
# layers
- air_layer = ba.Layer(m_air)
+ vacuum_layer = ba.Layer(m_vacuum)
oxide_layer = ba.Layer(m_si_o2, arg_dict["thickness"])
substrate_layer = ba.Layer(m_si)
# assembling multilayer
multi_layer = ba.MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
multi_layer.addLayerWithTopRoughness(oxide_layer, r_si)
multi_layer.addLayerWithTopRoughness(substrate_layer, r_si)
diff --git a/Examples/python/simulation/ex01_BasicParticles/AllFormFactorsAvailable.py b/Examples/python/simulation/ex01_BasicParticles/AllFormFactorsAvailable.py
index a44ad1ef239..43a6df116f3 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_vacuum = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Vacuum", 0.0, 0.0)
m_particle = ba.HomogeneousMaterial("Particle", 6e-4, 2e-8)
# collection of particles
@@ -49,11 +49,11 @@ def get_sample(formfactor):
particle_layout = ba.ParticleLayout()
particle_layout.addParticle(particle, 1.0)
- air_layer = ba.Layer(m_vacuum)
- air_layer.addLayout(particle_layout)
+ vacuum_layer = ba.Layer(m_vacuum)
+ vacuum_layer.addLayout(particle_layout)
multi_layer = ba.MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
return multi_layer
diff --git a/Examples/python/simulation/ex01_BasicParticles/CylindersAndPrisms.py b/Examples/python/simulation/ex01_BasicParticles/CylindersAndPrisms.py
index f0c1b7fcb6b..15acb9b6aec 100644
--- a/Examples/python/simulation/ex01_BasicParticles/CylindersAndPrisms.py
+++ b/Examples/python/simulation/ex01_BasicParticles/CylindersAndPrisms.py
@@ -10,7 +10,7 @@ def get_sample():
Returns a sample with uncorrelated cylinders and prisms on a substrate.
"""
# defining materials
- m_air = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Vacuum", 0.0, 0.0)
m_substrate = ba.HomogeneousMaterial("Substrate", 6e-6, 2e-8)
m_particle = ba.HomogeneousMaterial("Particle", 6e-4, 2e-8)
@@ -25,12 +25,12 @@ def get_sample():
interference = ba.InterferenceFunctionNone()
particle_layout.setInterferenceFunction(interference)
- # air layer with particles and substrate form multi layer
- air_layer = ba.Layer(m_air)
- air_layer.addLayout(particle_layout)
+ # vacuum layer with particles and substrate form multi layer
+ vacuum_layer = ba.Layer(m_vacuum)
+ vacuum_layer.addLayout(particle_layout)
substrate_layer = ba.Layer(m_substrate)
multi_layer = ba.MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
multi_layer.addLayer(substrate_layer)
print(multi_layer.treeToString())
return multi_layer
diff --git a/Examples/python/simulation/ex01_BasicParticles/CylindersInBA.py b/Examples/python/simulation/ex01_BasicParticles/CylindersInBA.py
index 4b41edb2929..9c43f4c7d73 100644
--- a/Examples/python/simulation/ex01_BasicParticles/CylindersInBA.py
+++ b/Examples/python/simulation/ex01_BasicParticles/CylindersInBA.py
@@ -7,11 +7,11 @@ from bornagain import deg, angstrom, nm
def get_sample():
"""
- Returns a sample with cylinders in a homogeneous environment ("air"),
+ Returns a sample with cylinders in a homogeneous environment ("Vacuum"),
implying a simulation in plain Born approximation.
"""
# defining materials
- m_vacuum = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Vacuum", 0.0, 0.0)
m_particle = ba.HomogeneousMaterial("Particle", 6e-4, 2e-8)
# collection of particles
@@ -20,11 +20,11 @@ def get_sample():
particle_layout = ba.ParticleLayout()
particle_layout.addParticle(cylinder, 1.0)
- air_layer = ba.Layer(m_vacuum)
- air_layer.addLayout(particle_layout)
+ vacuum_layer = ba.Layer(m_vacuum)
+ vacuum_layer.addLayout(particle_layout)
multi_layer = ba.MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
return multi_layer
diff --git a/Examples/python/simulation/ex01_BasicParticles/CylindersInDWBA.py b/Examples/python/simulation/ex01_BasicParticles/CylindersInDWBA.py
index 7a5e0dd8888..1563aef2afe 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_vacuum = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Vacuum", 0.0, 0.0)
m_substrate = ba.HomogeneousMaterial("Substrate", 6e-6, 2e-8)
m_particle = ba.HomogeneousMaterial("Particle", 6e-4, 2e-8)
@@ -20,12 +20,12 @@ def get_sample():
particle_layout = ba.ParticleLayout()
particle_layout.addParticle(cylinder, 1.0)
- air_layer = ba.Layer(m_vacuum)
- air_layer.addLayout(particle_layout)
+ vacuum_layer = ba.Layer(m_vacuum)
+ vacuum_layer.addLayout(particle_layout)
substrate_layer = ba.Layer(m_substrate)
multi_layer = ba.MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
multi_layer.addLayer(substrate_layer)
return multi_layer
diff --git a/Examples/python/simulation/ex01_BasicParticles/CylindersWithSizeDistribution.py b/Examples/python/simulation/ex01_BasicParticles/CylindersWithSizeDistribution.py
index 3d2bfe6a6df..c268ad94e0b 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_vacuum = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Vacuum", 0.0, 0.0)
m_particle = ba.HomogeneousMaterial("Particle", 6e-4, 2e-8)
# cylindrical particle
@@ -37,10 +37,10 @@ def get_sample():
particle_layout = ba.ParticleLayout()
particle_layout.addParticle(part_coll)
- air_layer = ba.Layer(m_vacuum)
- air_layer.addLayout(particle_layout)
+ vacuum_layer = ba.Layer(m_vacuum)
+ vacuum_layer.addLayout(particle_layout)
multi_layer = ba.MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
return multi_layer
diff --git a/Examples/python/simulation/ex01_BasicParticles/RotatedPyramids.py b/Examples/python/simulation/ex01_BasicParticles/RotatedPyramids.py
index 3c01393d701..11e878ad705 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_vacuum = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Vacuum", 0.0, 0.0)
m_substrate = ba.HomogeneousMaterial("Substrate", 6e-6, 2e-8)
m_particle = ba.HomogeneousMaterial("Particle", 6e-4, 2e-8)
@@ -22,12 +22,12 @@ def get_sample():
particle_layout.addParticle(
pyramid, 1.0, ba.kvector_t(0.0, 0.0, 0.0), transform)
- air_layer = ba.Layer(m_vacuum)
- air_layer.addLayout(particle_layout)
+ vacuum_layer = ba.Layer(m_vacuum)
+ vacuum_layer.addLayout(particle_layout)
substrate_layer = ba.Layer(m_substrate)
multi_layer = ba.MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
multi_layer.addLayer(substrate_layer)
return multi_layer
diff --git a/Examples/python/simulation/ex01_BasicParticles/TwoTypesOfCylindersWithSizeDistribution.py b/Examples/python/simulation/ex01_BasicParticles/TwoTypesOfCylindersWithSizeDistribution.py
index 6988ede8f52..ca9c7f0aa24 100644
--- a/Examples/python/simulation/ex01_BasicParticles/TwoTypesOfCylindersWithSizeDistribution.py
+++ b/Examples/python/simulation/ex01_BasicParticles/TwoTypesOfCylindersWithSizeDistribution.py
@@ -7,11 +7,11 @@ from bornagain import deg, angstrom, nm
def get_sample():
"""
- Returns a sample with cylinders in a homogeneous medium ("air").
+ Returns a sample with cylinders in a homogeneous medium ("Vacuum").
The cylinders are a 95:5 mixture of two different size distributions.
"""
# defining materials
- m_air = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Vacuum", 0.0, 0.0)
m_particle = ba.HomogeneousMaterial("Particle", 6e-4, 2e-8)
# collection of particles #1
@@ -53,11 +53,11 @@ def get_sample():
particle_layout.addParticle(part_coll1, 0.95)
particle_layout.addParticle(part_coll2, 0.05)
- air_layer = ba.Layer(m_air)
- air_layer.addLayout(particle_layout)
+ vacuum_layer = ba.Layer(m_vacuum)
+ vacuum_layer.addLayout(particle_layout)
multi_layer = ba.MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
return multi_layer
diff --git a/Examples/python/simulation/ex02_LayeredStructures/BuriedParticles.py b/Examples/python/simulation/ex02_LayeredStructures/BuriedParticles.py
index 796297eaadb..3ceb999c787 100644
--- a/Examples/python/simulation/ex02_LayeredStructures/BuriedParticles.py
+++ b/Examples/python/simulation/ex02_LayeredStructures/BuriedParticles.py
@@ -7,10 +7,10 @@ from bornagain import deg, angstrom, nm
def get_sample():
"""
- Returns a sample with spherical particles in an layer between air and substrate.
+ Returns a sample with spherical particles in an layer between vacuum and substrate.
"""
# defining materials
- m_vacuum = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Vacuum", 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,13 +23,13 @@ def get_sample():
particle_layout.addParticle(sphere, 1.0)
# assembling the sample
- air_layer = ba.Layer(m_vacuum)
+ vacuum_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)
multi_layer = ba.MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
multi_layer.addLayer(intermediate_layer)
multi_layer.addLayer(substrate_layer)
return multi_layer
diff --git a/Examples/python/simulation/ex03_InterferenceFunctions/ApproximationDA.py b/Examples/python/simulation/ex03_InterferenceFunctions/ApproximationDA.py
index 4d2ec8eec6e..8933892ba41 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_vacuum = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Vacuum", 0.0, 0.0)
m_substrate = ba.HomogeneousMaterial("Substrate", 6e-6, 2e-8)
m_particle = ba.HomogeneousMaterial("Particle", 6e-4, 2e-8)
@@ -38,11 +38,11 @@ def get_sample():
particle_layout.addParticle(cylinder2, 0.2)
particle_layout.setInterferenceFunction(interference)
- air_layer = ba.Layer(m_vacuum)
- air_layer.addLayout(particle_layout)
+ vacuum_layer = ba.Layer(m_vacuum)
+ vacuum_layer.addLayout(particle_layout)
substrate_layer = ba.Layer(m_substrate)
multi_layer = ba.MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
multi_layer.addLayer(substrate_layer)
return multi_layer
diff --git a/Examples/python/simulation/ex03_InterferenceFunctions/ApproximationLMA.py b/Examples/python/simulation/ex03_InterferenceFunctions/ApproximationLMA.py
index 71e69748958..bff8e67d92b 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_vacuum = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Vacuum", 0.0, 0.0)
m_substrate = ba.HomogeneousMaterial("Substrate", 6e-6, 2e-8)
m_particle = ba.HomogeneousMaterial("Particle", 6e-4, 2e-8)
@@ -46,12 +46,12 @@ def get_sample():
particle_layout2.addParticle(cylinder2, 0.2)
particle_layout2.setInterferenceFunction(interference2)
- air_layer = ba.Layer(m_vacuum)
- air_layer.addLayout(particle_layout1)
- air_layer.addLayout(particle_layout2)
+ vacuum_layer = ba.Layer(m_vacuum)
+ vacuum_layer.addLayout(particle_layout1)
+ vacuum_layer.addLayout(particle_layout2)
substrate_layer = ba.Layer(m_substrate)
multi_layer = ba.MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
multi_layer.addLayer(substrate_layer)
return multi_layer
diff --git a/Examples/python/simulation/ex03_InterferenceFunctions/ApproximationSSCA.py b/Examples/python/simulation/ex03_InterferenceFunctions/ApproximationSSCA.py
index 9d5c8c4e2fe..1d6389d713b 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_vacuum = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Vacuum", 0.0, 0.0)
m_substrate = ba.HomogeneousMaterial("Substrate", 6e-6, 2e-8)
m_particle = ba.HomogeneousMaterial("Particle", 6e-4, 2e-8)
@@ -38,11 +38,11 @@ def get_sample():
particle_layout.addParticle(cylinder2, 0.2)
particle_layout.setInterferenceFunction(interference)
- air_layer = ba.Layer(m_vacuum)
- air_layer.addLayout(particle_layout)
+ vacuum_layer = ba.Layer(m_vacuum)
+ vacuum_layer.addLayout(particle_layout)
substrate_layer = ba.Layer(m_substrate)
multi_layer = ba.MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
multi_layer.addLayer(substrate_layer)
return multi_layer
diff --git a/Examples/python/simulation/ex03_InterferenceFunctions/CosineRipplesAtRectLattice.py b/Examples/python/simulation/ex03_InterferenceFunctions/CosineRipplesAtRectLattice.py
index db526931aad..763fc30f52c 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_vacuum = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Vacuum", 0.0, 0.0)
m_substrate = ba.HomogeneousMaterial("Substrate", 6e-6, 2e-8)
m_particle = ba.HomogeneousMaterial("Particle", 6e-4, 2e-8)
@@ -30,11 +30,11 @@ def get_sample():
particle_layout.setInterferenceFunction(interference)
# assemble the sample
- air_layer = ba.Layer(m_vacuum)
- air_layer.addLayout(particle_layout)
+ vacuum_layer = ba.Layer(m_vacuum)
+ vacuum_layer.addLayout(particle_layout)
substrate_layer = ba.Layer(m_substrate)
multi_layer = ba.MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
multi_layer.addLayer(substrate_layer)
return multi_layer
diff --git a/Examples/python/simulation/ex03_InterferenceFunctions/Interference1DLattice.py b/Examples/python/simulation/ex03_InterferenceFunctions/Interference1DLattice.py
index eab09e82131..20d98c6b4fd 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_vacuum = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Vacuum", 0.0, 0.0)
m_substrate = ba.HomogeneousMaterial("Substrate", 6e-6, 2e-8)
m_particle = ba.HomogeneousMaterial("Particle", 6e-4, 2e-8)
@@ -35,12 +35,12 @@ def get_sample(lattice_rotation_angle=45*deg):
particle_layout.setInterferenceFunction(interference)
# assembling the sample
- air_layer = ba.Layer(m_vacuum)
- air_layer.addLayout(particle_layout)
+ vacuum_layer = ba.Layer(m_vacuum)
+ vacuum_layer.addLayout(particle_layout)
substrate_layer = ba.Layer(m_substrate)
multi_layer = ba.MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
multi_layer.addLayer(substrate_layer)
return multi_layer
diff --git a/Examples/python/simulation/ex03_InterferenceFunctions/Interference1DRadialParaCrystal.py b/Examples/python/simulation/ex03_InterferenceFunctions/Interference1DRadialParaCrystal.py
index 48fe0837d16..7a38f018a40 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_vacuum = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Vacuum", 0.0, 0.0)
m_substrate = ba.HomogeneousMaterial("Substrate", 6e-6, 2e-8)
m_particle = ba.HomogeneousMaterial("Particle", 6e-4, 2e-8)
@@ -31,12 +31,12 @@ def get_sample():
particle_layout.setInterferenceFunction(interference)
# assembling the sample
- air_layer = ba.Layer(m_vacuum)
- air_layer.addLayout(particle_layout)
+ vacuum_layer = ba.Layer(m_vacuum)
+ vacuum_layer.addLayout(particle_layout)
substrate_layer = ba.Layer(m_substrate)
multi_layer = ba.MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
multi_layer.addLayer(substrate_layer)
# print(multi_layer.treeToString())
return multi_layer
diff --git a/Examples/python/simulation/ex03_InterferenceFunctions/Interference2DCenteredSquareLattice.py b/Examples/python/simulation/ex03_InterferenceFunctions/Interference2DCenteredSquareLattice.py
index 9256bf2da28..a5ac25677f0 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_vacuum = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Vacuum", 0.0, 0.0)
m_substrate = ba.HomogeneousMaterial("Substrate", 6e-6, 2e-8)
m_particle = ba.HomogeneousMaterial("Particle", 6e-4, 2e-8)
@@ -33,12 +33,12 @@ def get_sample():
particle_layout.setInterferenceFunction(interference)
# assembling the sample
- air_layer = ba.Layer(m_vacuum)
- air_layer.addLayout(particle_layout)
+ vacuum_layer = ba.Layer(m_vacuum)
+ vacuum_layer.addLayout(particle_layout)
substrate_layer = ba.Layer(m_substrate)
multi_layer = ba.MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
multi_layer.addLayer(substrate_layer)
print(multi_layer.treeToString())
diff --git a/Examples/python/simulation/ex03_InterferenceFunctions/Interference2DLatticeSumOfRotated.py b/Examples/python/simulation/ex03_InterferenceFunctions/Interference2DLatticeSumOfRotated.py
index 009a0d1d586..2e987129e11 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_vacuum = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Vacuum", 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_vacuum)
+ vacuum_layer = ba.Layer(m_vacuum)
substrate_layer = ba.Layer(m_substrate)
p_interference_function = \
@@ -30,10 +30,10 @@ def get_sample():
particle_layout.addParticle(cylinder, 1.0)
particle_layout.setInterferenceFunction(p_interference_function)
- air_layer.addLayout(particle_layout)
+ vacuum_layer.addLayout(particle_layout)
multi_layer = ba.MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
multi_layer.addLayer(substrate_layer)
return multi_layer
diff --git a/Examples/python/simulation/ex03_InterferenceFunctions/Interference2DParaCrystal.py b/Examples/python/simulation/ex03_InterferenceFunctions/Interference2DParaCrystal.py
index cd3a756505a..ad7b5e226ad 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_vacuum = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Vacuum", 0.0, 0.0)
m_substrate = ba.HomogeneousMaterial("Substrate", 6e-6, 2e-8)
m_particle = ba.HomogeneousMaterial("Particle", 6e-4, 2e-8)
@@ -27,13 +27,13 @@ def get_sample():
particle_layout.setInterferenceFunction(interference)
# assembling the sample
- air_layer = ba.Layer(m_vacuum)
- air_layer.addLayout(particle_layout)
+ vacuum_layer = ba.Layer(m_vacuum)
+ vacuum_layer.addLayout(particle_layout)
substrate_layer = ba.Layer(m_substrate)
multi_layer = ba.MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
multi_layer.addLayer(substrate_layer)
print(multi_layer.parametersToString())
print(multi_layer.treeToString())
diff --git a/Examples/python/simulation/ex03_InterferenceFunctions/Interference2DRotatedSquareLattice.py b/Examples/python/simulation/ex03_InterferenceFunctions/Interference2DRotatedSquareLattice.py
index 2e782fd6cdc..daed2dea678 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_vacuum = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Vacuum", 0.0, 0.0)
m_substrate = ba.HomogeneousMaterial("Substrate", 6e-6, 2e-8)
m_particle = ba.HomogeneousMaterial("Particle", 6e-4, 2e-8)
@@ -29,12 +29,12 @@ def get_sample():
particle_layout.setInterferenceFunction(interference)
# assembling the sample
- air_layer = ba.Layer(m_vacuum)
- air_layer.addLayout(particle_layout)
+ vacuum_layer = ba.Layer(m_vacuum)
+ vacuum_layer.addLayout(particle_layout)
substrate_layer = ba.Layer(m_substrate)
multi_layer = ba.MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
multi_layer.addLayer(substrate_layer)
return multi_layer
diff --git a/Examples/python/simulation/ex03_InterferenceFunctions/Interference2DSquareFiniteLattice.py b/Examples/python/simulation/ex03_InterferenceFunctions/Interference2DSquareFiniteLattice.py
index 9c1f77b72e6..ad783998dc3 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_vacuum = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Vacuum", 0.0, 0.0)
m_substrate = ba.HomogeneousMaterial("Substrate", 6e-6, 2e-8)
m_particle = ba.HomogeneousMaterial("Particle", 6e-4, 2e-8)
@@ -27,12 +27,12 @@ def get_sample():
particle_layout.setInterferenceFunction(interference)
# assembling the sample
- air_layer = ba.Layer(m_vacuum)
- air_layer.addLayout(particle_layout)
+ vacuum_layer = ba.Layer(m_vacuum)
+ vacuum_layer.addLayout(particle_layout)
substrate_layer = ba.Layer(m_substrate)
multi_layer = ba.MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
multi_layer.addLayer(substrate_layer)
print(multi_layer.parametersToString())
print(multi_layer.treeToString())
diff --git a/Examples/python/simulation/ex03_InterferenceFunctions/Interference2DSquareLattice.py b/Examples/python/simulation/ex03_InterferenceFunctions/Interference2DSquareLattice.py
index e33a162141e..de7eb3b86dd 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_vacuum = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Vacuum", 0.0, 0.0)
m_substrate = ba.HomogeneousMaterial("Substrate", 6e-6, 2e-8)
m_particle = ba.HomogeneousMaterial("Particle", 6e-4, 2e-8)
@@ -28,12 +28,12 @@ def get_sample():
particle_layout.setInterferenceFunction(interference)
# assembling the sample
- air_layer = ba.Layer(m_vacuum)
- air_layer.addLayout(particle_layout)
+ vacuum_layer = ba.Layer(m_vacuum)
+ vacuum_layer.addLayout(particle_layout)
substrate_layer = ba.Layer(m_substrate)
multi_layer = ba.MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
multi_layer.addLayer(substrate_layer)
print(multi_layer.parametersToString())
print(multi_layer.treeToString())
diff --git a/Examples/python/simulation/ex03_InterferenceFunctions/RectangularGrating.py b/Examples/python/simulation/ex03_InterferenceFunctions/RectangularGrating.py
index 542ceff7d53..b3765dcbcde 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_vacuum = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Vacuum", 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,8 +36,8 @@ def get_sample(lattice_rotation_angle=0.0*deg):
particle_layout.setInterferenceFunction(interference)
# assembling the sample
- air_layer = ba.Layer(m_vacuum)
- air_layer.addLayout(particle_layout)
+ vacuum_layer = ba.Layer(m_vacuum)
+ vacuum_layer.addLayout(particle_layout)
substrate_layer = ba.Layer(m_si)
roughness = ba.LayerRoughness()
@@ -46,7 +46,7 @@ def get_sample(lattice_rotation_angle=0.0*deg):
roughness.setLatteralCorrLength(10.0 * nm)
multi_layer = ba.MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
multi_layer.addLayerWithTopRoughness(substrate_layer, roughness)
return multi_layer
diff --git a/Examples/python/simulation/ex03_InterferenceFunctions/SpheresAtHexLattice.py b/Examples/python/simulation/ex03_InterferenceFunctions/SpheresAtHexLattice.py
index 51247ec3ee7..3acb9d9be9a 100644
--- a/Examples/python/simulation/ex03_InterferenceFunctions/SpheresAtHexLattice.py
+++ b/Examples/python/simulation/ex03_InterferenceFunctions/SpheresAtHexLattice.py
@@ -10,7 +10,7 @@ def get_sample():
Returns a sample with spherical particles on a substrate,
forming a hexagonal 2D lattice.
"""
- m_air = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Vacuum", 0.0, 0.0)
m_substrate = ba.HomogeneousMaterial("Substrate", 6e-6, 2e-8)
m_particle = ba.HomogeneousMaterial("Particle", 6e-4, 2e-8)
@@ -25,11 +25,11 @@ def get_sample():
particle_layout.setInterferenceFunction(interference)
- air_layer = ba.Layer(m_air)
- air_layer.addLayout(particle_layout)
+ vacuum_layer = ba.Layer(m_vacuum)
+ vacuum_layer.addLayout(particle_layout)
substrate_layer = ba.Layer(m_substrate, 0)
multi_layer = ba.MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
multi_layer.addLayer(substrate_layer)
return multi_layer
diff --git a/Examples/python/simulation/ex03_InterferenceFunctions/TriangularRipple.py b/Examples/python/simulation/ex03_InterferenceFunctions/TriangularRipple.py
index 48e97b2a9a5..ea813a7fc43 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_vacuum = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Vacuum", 0.0, 0.0)
m_substrate = ba.HomogeneousMaterial("Substrate", 6e-6, 2e-8)
m_particle = ba.HomogeneousMaterial("Particle", 6e-4, 2e-8)
@@ -30,12 +30,12 @@ def get_sample():
interference.setDecayFunction(pdf)
particle_layout.setInterferenceFunction(interference)
- # air layer with particles and substrate form multi layer
- air_layer = ba.Layer(m_vacuum)
- air_layer.addLayout(particle_layout)
+ # vacuum layer with particles and substrate form multi layer
+ vacuum_layer = ba.Layer(m_vacuum)
+ vacuum_layer.addLayout(particle_layout)
substrate_layer = ba.Layer(m_substrate, 0)
multi_layer = ba.MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
multi_layer.addLayer(substrate_layer)
return multi_layer
diff --git a/Examples/python/simulation/ex04_ComplexShapes/BiMaterialCylinders.py b/Examples/python/simulation/ex04_ComplexShapes/BiMaterialCylinders.py
index 9973c7b2863..63e44dee9a2 100644
--- a/Examples/python/simulation/ex04_ComplexShapes/BiMaterialCylinders.py
+++ b/Examples/python/simulation/ex04_ComplexShapes/BiMaterialCylinders.py
@@ -29,12 +29,12 @@ def get_composition(top_material, bottom_material,
def get_sample():
"""
Returns a multi layer with substrate/air layers.
- Air layer contains cylindrical particles made of two materials.
+ Vacuum layer contains cylindrical particles made of two materials.
Particle shifted down to cross interface.
"""
# defining materials
- m_air = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Vacuum", 0.0, 0.0)
m_substrate = ba.HomogeneousMaterial("Substrate", 3.212e-6, 3.244e-8)
m_top_part = ba.HomogeneousMaterial("Ag", 1.245e-5, 5.419e-7)
m_bottom_part = ba.HomogeneousMaterial("Teflon", 2.900e-6, 6.019e-9)
@@ -48,12 +48,12 @@ def get_sample():
particle_layout.addParticle(composition)
particle_layout.setTotalParticleSurfaceDensity(1)
- # air layer with particles and substrate form multi layer
- air_layer = ba.Layer(m_air)
- air_layer.addLayout(particle_layout)
+ # vacuum layer with particles and substrate form multi layer
+ vacuum_layer = ba.Layer(m_vacuum)
+ vacuum_layer.addLayout(particle_layout)
substrate_layer = ba.Layer(m_substrate)
multi_layer = ba.MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
multi_layer.addLayer(substrate_layer)
print(multi_layer.treeToString())
return multi_layer
diff --git a/Examples/python/simulation/ex04_ComplexShapes/CoreShellNanoparticles.py b/Examples/python/simulation/ex04_ComplexShapes/CoreShellNanoparticles.py
index 122a84562a3..5c62ecb333c 100644
--- a/Examples/python/simulation/ex04_ComplexShapes/CoreShellNanoparticles.py
+++ b/Examples/python/simulation/ex04_ComplexShapes/CoreShellNanoparticles.py
@@ -10,7 +10,7 @@ def get_sample():
Returns a sample with box-shaped core-shell particles on a substrate.
"""
# defining materials
- m_air = ba.HomogeneousMaterial("Air", 0.0, 0.0 )
+ m_vacuum = ba.HomogeneousMaterial("Vacuum", 0.0, 0.0 )
m_shell = ba.HomogeneousMaterial("Shell", 1e-4, 2e-8 )
m_core = ba.HomogeneousMaterial("Core", 6e-5, 2e-8 )
@@ -27,11 +27,11 @@ def get_sample():
interference = ba.InterferenceFunctionNone()
particle_layout.setInterferenceFunction(interference)
- air_layer = ba.Layer(m_air)
- air_layer.addLayout(particle_layout)
+ vacuum_layer = ba.Layer(m_vacuum)
+ vacuum_layer.addLayout(particle_layout)
multi_layer = ba.MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
return multi_layer
diff --git a/Examples/python/simulation/ex04_ComplexShapes/CustomFormFactor.py b/Examples/python/simulation/ex04_ComplexShapes/CustomFormFactor.py
index 71b2c25bb36..2b307a57d95 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_vacuum = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Vacuum", 0.0, 0.0)
m_substrate = ba.HomogeneousMaterial("Substrate", 6e-6, 2e-8)
m_particle = ba.HomogeneousMaterial("Particle", 6e-4, 2e-8)
@@ -58,13 +58,13 @@ def get_sample():
particle = ba.Particle(m_particle, ff)
particle_layout = ba.ParticleLayout()
particle_layout.addParticle(particle, 1.0)
- air_layer = ba.Layer(m_vacuum)
- air_layer.addLayout(particle_layout)
+ vacuum_layer = ba.Layer(m_vacuum)
+ vacuum_layer.addLayout(particle_layout)
substrate_layer = ba.Layer(m_substrate)
# assemble multilayer
multi_layer = ba.MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
multi_layer.addLayer(substrate_layer)
return multi_layer
diff --git a/Examples/python/simulation/ex04_ComplexShapes/HexagonalLatticesWithBasis.py b/Examples/python/simulation/ex04_ComplexShapes/HexagonalLatticesWithBasis.py
index e5eb2bdb53a..94a8a4b03e9 100644
--- a/Examples/python/simulation/ex04_ComplexShapes/HexagonalLatticesWithBasis.py
+++ b/Examples/python/simulation/ex04_ComplexShapes/HexagonalLatticesWithBasis.py
@@ -11,7 +11,7 @@ def get_sample():
Returns a sample with spheres on a substrate,
forming two hexagonal close packed layers.
"""
- m_air = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Vacuum", 0.0, 0.0)
m_substrate = ba.HomogeneousMaterial("Substrate", 6e-6, 2e-8)
m_particle = ba.HomogeneousMaterial("Particle", 6e-4, 2e-8)
@@ -33,11 +33,11 @@ def get_sample():
particle_layout.setInterferenceFunction(interference)
- air_layer = ba.Layer(m_air)
- air_layer.addLayout(particle_layout)
+ vacuum_layer = ba.Layer(m_vacuum)
+ vacuum_layer.addLayout(particle_layout)
substrate_layer = ba.Layer(m_substrate, 0)
multi_layer = ba.MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
multi_layer.addLayer(substrate_layer)
return multi_layer
diff --git a/Examples/python/simulation/ex04_ComplexShapes/LargeParticlesFormFactor.py b/Examples/python/simulation/ex04_ComplexShapes/LargeParticlesFormFactor.py
index 61a190d14c1..b2bbc6112b9 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_vacuum = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Vacuum", 0.0, 0.0)
m_substrate = ba.HomogeneousMaterial("Substrate", 6e-6, 2e-8)
m_particle = ba.HomogeneousMaterial("Particle", 6e-4, 2e-8)
@@ -29,12 +29,12 @@ def get_sample(cylinder_radius, cylinder_height):
particle_layout = ba.ParticleLayout()
particle_layout.addParticle(cylinder, 1.0)
- air_layer = ba.Layer(m_vacuum)
- air_layer.addLayout(particle_layout)
+ vacuum_layer = ba.Layer(m_vacuum)
+ vacuum_layer.addLayout(particle_layout)
substrate_layer = ba.Layer(m_substrate)
multi_layer = ba.MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
multi_layer.addLayer(substrate_layer)
return multi_layer
diff --git a/Examples/python/simulation/ex04_ComplexShapes/MesoCrystal.py b/Examples/python/simulation/ex04_ComplexShapes/MesoCrystal.py
index d317f86fc40..cb7550db810 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_vacuum = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Vacuum", 0.0, 0.0)
m_substrate = ba.HomogeneousMaterial("Substrate", 6e-6, 2e-8)
m_particle = ba.HomogeneousMaterial("Particle", 6e-4, 2e-8)
@@ -34,12 +34,12 @@ def get_sample():
particle_layout = ba.ParticleLayout()
particle_layout.addParticle(meso)
- air_layer = ba.Layer(m_vacuum)
- air_layer.addLayout(particle_layout)
+ vacuum_layer = ba.Layer(m_vacuum)
+ vacuum_layer.addLayout(particle_layout)
substrate_layer = ba.Layer(m_substrate)
multi_layer = ba.MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
multi_layer.addLayer(substrate_layer)
return multi_layer
diff --git a/Examples/python/simulation/ex04_ComplexShapes/ParticlesCrossingInterface.py b/Examples/python/simulation/ex04_ComplexShapes/ParticlesCrossingInterface.py
index 2f82ac861a3..c9cb50390a3 100644
--- a/Examples/python/simulation/ex04_ComplexShapes/ParticlesCrossingInterface.py
+++ b/Examples/python/simulation/ex04_ComplexShapes/ParticlesCrossingInterface.py
@@ -4,7 +4,7 @@ particles can now cross interfaces.
Given example is similar to simulation/ex01_BasicParticles/CylindersAndPrisms.py,
with the difference, that z-position of particles is adjusted to move them slightly
-down from air layer and to make them cross substrate/air interface.
+down from vacuum layer and to make them cross substrate/air interface.
Note:
1) Simulation kernel automatically detects particles crossing interface and
@@ -28,7 +28,7 @@ def get_sample():
Returns a sample with uncorrelated cylinders and prisms on a substrate.
"""
# defining materials
- m_air = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Vacuum", 0.0, 0.0)
m_substrate = ba.HomogeneousMaterial("Substrate", 6e-6, 2e-8)
m_particle = ba.HomogeneousMaterial("Particle", 6e-4, 2e-8)
@@ -49,12 +49,12 @@ def get_sample():
interference = ba.InterferenceFunctionNone()
particle_layout.setInterferenceFunction(interference)
- # air layer with particles and substrate form multi layer
- air_layer = ba.Layer(m_air)
- air_layer.addLayout(particle_layout)
+ # vacuum layer with particles and substrate form multi layer
+ vacuum_layer = ba.Layer(m_vacuum)
+ vacuum_layer.addLayout(particle_layout)
substrate_layer = ba.Layer(m_substrate)
multi_layer = ba.MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
multi_layer.addLayer(substrate_layer)
print(multi_layer.treeToString())
return multi_layer
diff --git a/Examples/python/simulation/ex05_BeamAndDetector/BeamDivergence.py b/Examples/python/simulation/ex05_BeamAndDetector/BeamDivergence.py
index ad471fa380c..a0f9e73d1ae 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_vacuum = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Vacuum", 0.0, 0.0)
m_substrate = ba.HomogeneousMaterial("Substrate", 6e-6, 2e-8)
m_particle = ba.HomogeneousMaterial("Particle", 6e-4, 2e-8)
@@ -21,12 +21,12 @@ def get_sample():
particle_layout.addParticle(cylinder, 1.0)
# assembling the sample
- air_layer = ba.Layer(m_vacuum)
- air_layer.addLayout(particle_layout)
+ vacuum_layer = ba.Layer(m_vacuum)
+ vacuum_layer.addLayout(particle_layout)
substrate_layer = ba.Layer(m_substrate)
multi_layer = ba.MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
multi_layer.addLayer(substrate_layer)
return multi_layer
diff --git a/Examples/python/simulation/ex05_BeamAndDetector/ConstantBackground.py b/Examples/python/simulation/ex05_BeamAndDetector/ConstantBackground.py
index e42fb4e1ed1..5a0484c5b14 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_vacuum = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Vacuum", 0.0, 0.0)
m_substrate = ba.HomogeneousMaterial("Substrate", 6e-6, 2e-8)
m_particle = ba.HomogeneousMaterial("Particle", 6e-4, 2e-8)
@@ -21,12 +21,12 @@ def get_sample():
particle_layout.addParticle(cylinder, 1.0)
# assembling the sample
- air_layer = ba.Layer(m_vacuum)
- air_layer.addLayout(particle_layout)
+ vacuum_layer = ba.Layer(m_vacuum)
+ vacuum_layer.addLayout(particle_layout)
substrate_layer = ba.Layer(m_substrate)
multi_layer = ba.MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
multi_layer.addLayer(substrate_layer)
return multi_layer
diff --git a/Examples/python/simulation/ex05_BeamAndDetector/DetectorResolutionFunction.py b/Examples/python/simulation/ex05_BeamAndDetector/DetectorResolutionFunction.py
index 5add5e87a41..d2735fa4cb4 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_vacuum = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Vacuum", 0.0, 0.0)
m_substrate = ba.HomogeneousMaterial("Substrate", 6e-6, 2e-8)
m_particle = ba.HomogeneousMaterial("Particle", 6e-4, 2e-8)
@@ -21,12 +21,12 @@ def get_sample():
particle_layout.addParticle(cylinder, 1.0)
# assembling the sample
- air_layer = ba.Layer(m_vacuum)
- air_layer.addLayout(particle_layout)
+ vacuum_layer = ba.Layer(m_vacuum)
+ vacuum_layer.addLayout(particle_layout)
substrate_layer = ba.Layer(m_substrate)
multi_layer = ba.MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
multi_layer.addLayer(substrate_layer)
return multi_layer
diff --git a/Examples/python/simulation/ex05_BeamAndDetector/OffSpecularSimulation.py b/Examples/python/simulation/ex05_BeamAndDetector/OffSpecularSimulation.py
index 36d2323b42a..43fccdc77cb 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_vacuum = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Vacuum", 0.0, 0.0)
m_substrate = ba.HomogeneousMaterial("Substrate", 6e-6, 2e-8)
m_particle = ba.HomogeneousMaterial("Particle", 6e-4, 2e-8)
@@ -35,12 +35,12 @@ def get_sample():
particle_layout.setInterferenceFunction(interference)
# assembling the sample
- air_layer = ba.Layer(m_vacuum)
- air_layer.addLayout(particle_layout)
+ vacuum_layer = ba.Layer(m_vacuum)
+ vacuum_layer.addLayout(particle_layout)
substrate_layer = ba.Layer(m_substrate)
multi_layer = ba.MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
multi_layer.addLayer(substrate_layer)
return multi_layer
diff --git a/Examples/python/simulation/ex05_BeamAndDetector/RectangularDetector.py b/Examples/python/simulation/ex05_BeamAndDetector/RectangularDetector.py
index a1cd1e3dff7..7bf9045b881 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_vacuum = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Vacuum", 0.0, 0.0)
m_substrate = ba.HomogeneousMaterial("Substrate", 6e-6, 2e-8)
m_particle = ba.HomogeneousMaterial("Particle", 6e-4, 2e-8)
@@ -29,12 +29,12 @@ def get_sample():
particle_layout = ba.ParticleLayout()
particle_layout.addParticle(cylinder, 1.0)
- air_layer = ba.Layer(m_vacuum)
- air_layer.addLayout(particle_layout)
+ vacuum_layer = ba.Layer(m_vacuum)
+ vacuum_layer.addLayout(particle_layout)
substrate_layer = ba.Layer(m_substrate)
multi_layer = ba.MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
multi_layer.addLayer(substrate_layer)
return multi_layer
diff --git a/Examples/python/simulation/ex06_Reflectometry/BeamAngularDivergence.py b/Examples/python/simulation/ex06_Reflectometry/BeamAngularDivergence.py
index 4288219cb19..54392356753 100644
--- a/Examples/python/simulation/ex06_Reflectometry/BeamAngularDivergence.py
+++ b/Examples/python/simulation/ex06_Reflectometry/BeamAngularDivergence.py
@@ -33,17 +33,17 @@ d_ti = 30 * ba.angstrom
def get_sample():
# defining materials
- m_air = ba.MaterialBySLD("Air", 0.0, 0.0)
+ m_vacuum = ba.MaterialBySLD("Vacuum", 0.0, 0.0)
m_ni = ba.MaterialBySLD("Ni", ni_sld_real, 0.0)
m_ti = ba.MaterialBySLD("Ti", ti_sld_real, 0.0)
m_substrate = ba.MaterialBySLD("SiSubstrate", si_sld_real, 0.0)
- air_layer = ba.Layer(m_air)
+ vacuum_layer = ba.Layer(m_vacuum)
ni_layer = ba.Layer(m_ni, d_ni)
ti_layer = ba.Layer(m_ti, d_ti)
substrate_layer = ba.Layer(m_substrate)
multi_layer = ba.MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
for i in range(n_repetitions):
multi_layer.addLayer(ti_layer)
multi_layer.addLayer(ni_layer)
diff --git a/Examples/python/simulation/ex06_Reflectometry/BeamFullDivergence.py b/Examples/python/simulation/ex06_Reflectometry/BeamFullDivergence.py
index af8e98d6f6e..c087a54f0dc 100644
--- a/Examples/python/simulation/ex06_Reflectometry/BeamFullDivergence.py
+++ b/Examples/python/simulation/ex06_Reflectometry/BeamFullDivergence.py
@@ -32,17 +32,17 @@ def get_sample():
# defining materials
# this example implies beam divergence in the wavelength,
# thus MaterialBySLD must be used to provide correct result
- m_air = ba.MaterialBySLD("Air", 0.0, 0.0)
+ m_vacuum = ba.MaterialBySLD("Vacuum", 0.0, 0.0)
m_ni = ba.MaterialBySLD("Ni", ni_sld_real, 0.0)
m_ti = ba.MaterialBySLD("Ti", ti_sld_real, 0.0)
m_substrate = ba.MaterialBySLD("SiSubstrate", si_sld_real, 0.0)
- air_layer = ba.Layer(m_air)
+ vacuum_layer = ba.Layer(m_vacuum)
ni_layer = ba.Layer(m_ni, d_ni)
ti_layer = ba.Layer(m_ti, d_ti)
substrate_layer = ba.Layer(m_substrate)
multi_layer = ba.MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
for i in range(n_repetitions):
multi_layer.addLayer(ti_layer)
multi_layer.addLayer(ni_layer)
diff --git a/Examples/python/simulation/ex07_Miscellaneous/AccessingSimulationResults.py b/Examples/python/simulation/ex07_Miscellaneous/AccessingSimulationResults.py
index e4e5511cba1..a56f0748f01 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_vacuum = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Vacuum", 0.0, 0.0)
m_substrate = ba.HomogeneousMaterial("Substrate", 6e-6, 2e-8)
m_particle = ba.HomogeneousMaterial("Particle", 6e-4, 2e-8)
@@ -25,12 +25,12 @@ def get_sample():
particle_layout = ba.ParticleLayout()
particle_layout.addParticle(cylinder, 1.0)
- air_layer = ba.Layer(m_vacuum)
- air_layer.addLayout(particle_layout)
+ vacuum_layer = ba.Layer(m_vacuum)
+ vacuum_layer.addLayout(particle_layout)
substrate_layer = ba.Layer(m_substrate)
multi_layer = ba.MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
multi_layer.addLayer(substrate_layer)
return multi_layer
diff --git a/Examples/python/simulation/ex07_Miscellaneous/AxesInDifferentUnits.py b/Examples/python/simulation/ex07_Miscellaneous/AxesInDifferentUnits.py
index 4527ccf199a..0b9c24c381e 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_vacuum = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Vacuum", 0.0, 0.0)
m_substrate = ba.HomogeneousMaterial("Substrate", 6e-6, 2e-8)
m_particle = ba.HomogeneousMaterial("Particle", 6e-4, 2e-8)
@@ -23,12 +23,12 @@ def get_sample():
particle_layout = ba.ParticleLayout()
particle_layout.addParticle(cylinder, 1.0)
- air_layer = ba.Layer(m_vacuum)
- air_layer.addLayout(particle_layout)
+ vacuum_layer = ba.Layer(m_vacuum)
+ vacuum_layer.addLayout(particle_layout)
substrate_layer = ba.Layer(m_substrate)
multi_layer = ba.MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
multi_layer.addLayer(substrate_layer)
return multi_layer
diff --git a/Examples/python/simulation/ex07_Miscellaneous/BoxesWithSpecularPeak.py b/Examples/python/simulation/ex07_Miscellaneous/BoxesWithSpecularPeak.py
index e302ecbd727..9f87fcc2ae2 100644
--- a/Examples/python/simulation/ex07_Miscellaneous/BoxesWithSpecularPeak.py
+++ b/Examples/python/simulation/ex07_Miscellaneous/BoxesWithSpecularPeak.py
@@ -10,7 +10,7 @@ def get_sample():
Returns a sample with boxes on a substrate.
"""
# defining materials
- m_air = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Vacuum", 0.0, 0.0)
m_substrate = ba.HomogeneousMaterial("Substrate", 6e-6, 2e-8)
m_particle = ba.HomogeneousMaterial("Particle", 3e-5, 2e-8)
@@ -26,12 +26,12 @@ def get_sample():
interference.setDecayFunction(pdf)
particle_layout.setInterferenceFunction(interference)
- air_layer = ba.Layer(m_air)
- air_layer.addLayout(particle_layout)
+ vacuum_layer = ba.Layer(m_vacuum)
+ vacuum_layer.addLayout(particle_layout)
substrate_layer = ba.Layer(m_substrate)
multi_layer = ba.MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
multi_layer.addLayer(substrate_layer)
return multi_layer
diff --git a/Examples/python/simulation/ex07_Miscellaneous/CylindersInAverageLayer.py b/Examples/python/simulation/ex07_Miscellaneous/CylindersInAverageLayer.py
index 3890e6650ab..917a65dd866 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_vacuum = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Vacuum", 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,13 +28,13 @@ def get_sample(cyl_height=5*nm):
interference.setDecayFunction(pdf)
particle_layout.setInterferenceFunction(interference)
- air_layer = ba.Layer(m_vacuum)
+ vacuum_layer = ba.Layer(m_vacuum)
intermediate_layer = ba.Layer(m_layer, 5*nm)
intermediate_layer.addLayout(particle_layout)
substrate_layer = ba.Layer(m_substrate)
multi_layer = ba.MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
multi_layer.addLayer(intermediate_layer)
multi_layer.addLayer(substrate_layer)
return multi_layer
diff --git a/Examples/python/simulation/ex07_Miscellaneous/FindPeaks.py b/Examples/python/simulation/ex07_Miscellaneous/FindPeaks.py
index cdbbb9c3f56..67e819af38a 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_vacuum = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Vacuum", 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,8 +37,8 @@ def get_sample(lattice_rotation_angle=0.0*deg):
particle_layout.setInterferenceFunction(interference)
# assembling the sample
- air_layer = ba.Layer(m_vacuum)
- air_layer.addLayout(particle_layout)
+ vacuum_layer = ba.Layer(m_vacuum)
+ vacuum_layer.addLayout(particle_layout)
substrate_layer = ba.Layer(m_si)
roughness = ba.LayerRoughness()
@@ -47,7 +47,7 @@ def get_sample(lattice_rotation_angle=0.0*deg):
roughness.setLatteralCorrLength(10.0 * nm)
multi_layer = ba.MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
multi_layer.addLayerWithTopRoughness(substrate_layer, roughness)
return multi_layer
diff --git a/Examples/python/simulation/ex07_Miscellaneous/HalfSpheresInAverageTopLayer.py b/Examples/python/simulation/ex07_Miscellaneous/HalfSpheresInAverageTopLayer.py
index c0b16c15463..b486ffdd191 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_vacuum = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Vacuum", 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,13 +31,13 @@ def get_sample():
interference.setDecayFunction(pdf)
particle_layout.setInterferenceFunction(interference)
- air_layer = ba.Layer(m_vacuum)
- air_layer.addLayout(particle_layout)
- air_layer.setNumberOfSlices(n_slices)
+ vacuum_layer = ba.Layer(m_vacuum)
+ vacuum_layer.addLayout(particle_layout)
+ vacuum_layer.setNumberOfSlices(n_slices)
substrate_layer = ba.Layer(m_substrate)
multi_layer = ba.MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
multi_layer.addLayer(substrate_layer)
return multi_layer
diff --git a/Examples/python/simulation/ex07_Miscellaneous/MagneticSpheres.py b/Examples/python/simulation/ex07_Miscellaneous/MagneticSpheres.py
index a9b91399902..a1a126cb466 100644
--- a/Examples/python/simulation/ex07_Miscellaneous/MagneticSpheres.py
+++ b/Examples/python/simulation/ex07_Miscellaneous/MagneticSpheres.py
@@ -16,7 +16,7 @@ def get_sample():
# defining materials
particle_material = ba.HomogeneousMaterial("Particle", 2e-5, 4e-7,
magnetization_particle)
- air_material = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ vacuum_material = ba.HomogeneousMaterial("Vacuum", 0.0, 0.0)
substrate_material = ba.HomogeneousMaterial("Substrate", 7e-6, 1.8e-7)
# spherical magnetic particle
@@ -27,13 +27,13 @@ def get_sample():
particle_layout.addParticle(sphere, 1.0, position)
# defining layers
- air_layer = ba.Layer(air_material)
+ vacuum_layer = ba.Layer(vacuum_material)
substrate_layer = ba.Layer(substrate_material)
substrate_layer.addLayout(particle_layout)
# defining the multilayer
multi_layer = ba.MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
multi_layer.addLayer(substrate_layer)
return multi_layer
diff --git a/Examples/python/simulation/ex07_Miscellaneous/SimulationParameters.py b/Examples/python/simulation/ex07_Miscellaneous/SimulationParameters.py
index ccc79ca83d8..ad5586ffc84 100644
--- a/Examples/python/simulation/ex07_Miscellaneous/SimulationParameters.py
+++ b/Examples/python/simulation/ex07_Miscellaneous/SimulationParameters.py
@@ -16,7 +16,7 @@ def get_sample():
Parameter set is fixed.
"""
# defining materials
- m_air = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = ba.HomogeneousMaterial("Vacuum", 0.0, 0.0)
m_substrate = ba.HomogeneousMaterial("Substrate", 6e-6, 2e-8)
m_particle = ba.HomogeneousMaterial("Particle", 6e-4, 2e-8)
@@ -32,12 +32,12 @@ def get_sample():
interference = ba.InterferenceFunctionNone()
layout.setInterferenceFunction(interference)
- # air layer with particles and substrate form multi layer
- air_layer = ba.Layer(m_air)
- air_layer.addLayout(layout)
+ # vacuum layer with particles and substrate form multi layer
+ vacuum_layer = ba.Layer(m_vacuum)
+ vacuum_layer.addLayout(layout)
substrate_layer = ba.Layer(m_substrate, 0)
multi_layer = ba.MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
multi_layer.addLayer(substrate_layer)
return multi_layer
diff --git a/GUI/coregui/Models/ApplicationModels.cpp b/GUI/coregui/Models/ApplicationModels.cpp
index 7470c71b558..b37818417c0 100644
--- a/GUI/coregui/Models/ApplicationModels.cpp
+++ b/GUI/coregui/Models/ApplicationModels.cpp
@@ -85,7 +85,7 @@ void ApplicationModels::resetModels()
m_materialModel->clear();
m_materialModel->addRefractiveMaterial("Default", 1e-3, 1e-5);
- m_materialModel->addRefractiveMaterial("Air", 0.0, 0.0);
+ m_materialModel->addRefractiveMaterial("Vacuum", 0.0, 0.0);
m_materialModel->addRefractiveMaterial("Particle", 6e-4, 2e-8);
m_materialModel->addRefractiveMaterial("Substrate", 6e-6, 2e-8);
diff --git a/GUI/coregui/Views/MaterialEditor/MaterialItemUtils.cpp b/GUI/coregui/Views/MaterialEditor/MaterialItemUtils.cpp
index be18c11c05c..01d933badf2 100644
--- a/GUI/coregui/Views/MaterialEditor/MaterialItemUtils.cpp
+++ b/GUI/coregui/Views/MaterialEditor/MaterialItemUtils.cpp
@@ -48,7 +48,7 @@ std::map<QString, QString> get_tag_map()
QColor MaterialItemUtils::suggestMaterialColor(const QString& name)
{
- if (name.contains("Air")) {
+ if (name.contains("Vacuum")) {
return QColor(179, 242, 255);
} else if (name.contains("Substrate")) {
return QColor(205, 102, 0);
diff --git a/Tests/Functional/Python/PyCore/mesocrystal1.py b/Tests/Functional/Python/PyCore/mesocrystal1.py
index 5b50b52379f..b95cc239f04 100644
--- a/Tests/Functional/Python/PyCore/mesocrystal1.py
+++ b/Tests/Functional/Python/PyCore/mesocrystal1.py
@@ -51,10 +51,10 @@ class MySampleBuilder(ISampleBuilder):
n_air = complex(1.0, 0.0)
n_substrate = complex(1.0-7.57e-6, 1.73e-7)
- p_air_material = HomogeneousMaterial("Air", n_air)
+ p_vacuum_material = HomogeneousMaterial("Vacuum", n_air)
p_average_layer_material = HomogeneousMaterial("Averagelayer", n_avg)
p_substrate_material = HomogeneousMaterial("Substrate", n_substrate)
- air_layer = Layer(p_air_material)
+ vacuum_layer = Layer(p_vacuum_material)
avg_layer = Layer(p_average_layer_material, self.meso_height.value)
substrate_layer = Layer(p_substrate_material)
p_interference_function = InterferenceFunctionNone()
@@ -82,7 +82,7 @@ class MySampleBuilder(ISampleBuilder):
roughness = LayerRoughness(self.roughness.value, 0.3, 500.0*nm)
- p_multi_layer.addLayer(air_layer)
+ p_multi_layer.addLayer(vacuum_layer)
p_multi_layer.addLayer(avg_layer)
p_multi_layer.addLayerWithTopRoughness(substrate_layer, roughness)
diff --git a/Tests/Functional/Python/PyCore/parameterpool.py b/Tests/Functional/Python/PyCore/parameterpool.py
index a94aab773d4..6f03869afe9 100644
--- a/Tests/Functional/Python/PyCore/parameterpool.py
+++ b/Tests/Functional/Python/PyCore/parameterpool.py
@@ -12,7 +12,7 @@ class ParameterPoolTest(unittest.TestCase):
Checks values in particle's parameter pool
"""
ff = ba.FormFactorCylinder(5*nm, 6*nm)
- particle = ba.Particle(ba.HomogeneousMaterial("Air", 0.0, 0.0), ff)
+ particle = ba.Particle(ba.HomogeneousMaterial("Vacuum", 0.0, 0.0), ff)
particle.setAbundance(1.0)
particle.setPosition(2.0, 3.0, 4.0)
@@ -33,7 +33,7 @@ class ParameterPoolTest(unittest.TestCase):
Modification of particle parameters via parameter pool
"""
ff = ba.FormFactorCylinder(5*nm, 6*nm)
- particle = ba.Particle(ba.HomogeneousMaterial("Air", 0.0, 0.0), ff)
+ particle = ba.Particle(ba.HomogeneousMaterial("Vacuum", 0.0, 0.0), ff)
particle.setAbundance(1.0)
particle.setPosition(2.0, 3.0, 4.0)
@@ -53,7 +53,7 @@ class ParameterPoolTest(unittest.TestCase):
particle and its children (in given case, form factor of cylinder)
"""
ff = ba.FormFactorCylinder(5*nm, 6*nm)
- particle = ba.Particle(ba.HomogeneousMaterial("Air", 0.0, 0.0), ff)
+ particle = ba.Particle(ba.HomogeneousMaterial("Vacuum", 0.0, 0.0), ff)
particle.setAbundance(1.0)
particle.setPosition(2.0, 3.0, 4.0)
@@ -71,7 +71,7 @@ class ParameterPoolTest(unittest.TestCase):
Modifies values of particle's parameter tree.
"""
ff = ba.FormFactorCylinder(5*nm, 6*nm)
- particle = ba.Particle(ba.HomogeneousMaterial("Air", 0.0, 0.0), ff)
+ particle = ba.Particle(ba.HomogeneousMaterial("Vacuum", 0.0, 0.0), ff)
particle.setAbundance(1.0)
particle.setPosition(2.0, 3.0, 4.0)
@@ -96,7 +96,7 @@ class ParameterPoolTest(unittest.TestCase):
Modification of particle's parameters without intermediate access to parameter pool
"""
ff = ba.FormFactorCylinder(5*nm, 6*nm)
- particle = ba.Particle(ba.HomogeneousMaterial("Air", 0.0, 0.0), ff)
+ particle = ba.Particle(ba.HomogeneousMaterial("Vacuum", 0.0, 0.0), ff)
particle.setAbundance(1.0)
particle.setPosition(2.0, 3.0, 4.0)
diff --git a/Tests/Functional/Python/PyCore/polmagcylinders1.py b/Tests/Functional/Python/PyCore/polmagcylinders1.py
index 202fceeb708..e848cf6d297 100644
--- a/Tests/Functional/Python/PyCore/polmagcylinders1.py
+++ b/Tests/Functional/Python/PyCore/polmagcylinders1.py
@@ -11,7 +11,7 @@ from bornagain import nanometer, angstrom, degree
# ----------------------------------
def runSimulation():
# defining materials
- mAmbience = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ mAmbience = ba.HomogeneousMaterial("Vacuum", 0.0, 0.0)
mSubstrate = ba.HomogeneousMaterial("Substrate", 6e-6, 2e-8)
magnetic_field = ba.kvector_t(0, 0, 0)
@@ -26,12 +26,12 @@ def runSimulation():
interference = ba.InterferenceFunctionNone()
particle_layout.setInterferenceFunction(interference)
- # air layer with particles and substrate form multi layer
- air_layer = ba.Layer(mAmbience)
- air_layer.addLayout(particle_layout)
+ # vacuum layer with particles and substrate form multi layer
+ vacuum_layer = ba.Layer(mAmbience)
+ vacuum_layer.addLayout(particle_layout)
substrate_layer = ba.Layer(mSubstrate, 0)
multi_layer = ba.MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
multi_layer.addLayer(substrate_layer)
# build and run experiment
diff --git a/Tests/Functional/Python/PyCore/polmagcylinders2.py b/Tests/Functional/Python/PyCore/polmagcylinders2.py
index 2fe13d2c191..6864e65b63e 100644
--- a/Tests/Functional/Python/PyCore/polmagcylinders2.py
+++ b/Tests/Functional/Python/PyCore/polmagcylinders2.py
@@ -16,7 +16,7 @@ REFERENCE_DIR = "@TEST_REFERENCE_DIR@/Python"
def getSimulationIntensity(rho_beam, efficiency):
print("- simulate", flush=True)
# defining materials
- mAmbience = HomogeneousMaterial("Air", 0.0, 0.0)
+ mAmbience = HomogeneousMaterial("Vacuum", 0.0, 0.0)
mSubstrate = HomogeneousMaterial("Substrate", 15e-6, 0.0)
magnetization = kvector_t(0, 1e6, 0)
@@ -31,12 +31,12 @@ def getSimulationIntensity(rho_beam, efficiency):
interference = InterferenceFunctionNone()
particle_layout.setInterferenceFunction(interference)
- # air layer with particles and substrate form multi layer
- air_layer = Layer(mAmbience)
- air_layer.addLayout(particle_layout)
+ # vacuum layer with particles and substrate form multi layer
+ vacuum_layer = Layer(mAmbience)
+ vacuum_layer.addLayout(particle_layout)
substrate_layer = Layer(mSubstrate, 0)
multi_layer = MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
multi_layer.addLayer(substrate_layer)
# build and run experiment
diff --git a/Tests/Functional/Python/PyCore/sliced_composition.py b/Tests/Functional/Python/PyCore/sliced_composition.py
index 1a5afddb8b0..a4e9b46bd85 100644
--- a/Tests/Functional/Python/PyCore/sliced_composition.py
+++ b/Tests/Functional/Python/PyCore/sliced_composition.py
@@ -11,7 +11,7 @@ import bornagain as ba
from bornagain import deg, kvector_t, nm
mSubstrate = ba.HomogeneousMaterial("Substrate", 3.212e-6, 3.244e-8)
-mAmbience = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+mAmbience = ba.HomogeneousMaterial("Vacuum", 0.0, 0.0)
mParticle = ba.HomogeneousMaterial("Ag", 1.245e-5, 5.419e-7)
sphere_radius = 10.0
bottom_cup_height = 4.0
@@ -25,11 +25,11 @@ class SlicedSpheresTest(unittest.TestCase):
by the user.
"""
- air_layer = ba.Layer(mAmbience)
+ vacuum_layer = ba.Layer(mAmbience)
if particle_to_air:
layout = ba.ParticleLayout()
layout.addParticle(particle_to_air)
- air_layer.addLayout(layout)
+ vacuum_layer.addLayout(layout)
substrate = ba.Layer(mSubstrate)
if particle_to_substrate:
@@ -38,7 +38,7 @@ class SlicedSpheresTest(unittest.TestCase):
substrate.addLayout(layout)
multi_layer = ba.MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
multi_layer.addLayer(substrate)
return multi_layer
@@ -125,7 +125,7 @@ class SlicedSpheresTest(unittest.TestCase):
Compares two simulation intended to provide identical results.
Simulation #1: no particles at all
Simulation #2: spherical composition on top of substrate crossing the interface
- Bottom part of composition is made of substrate material, top part from air layer material
+ Bottom part of composition is made of substrate material, top part from vacuum layer material
"""
shift = bottom_cup_height
@@ -147,7 +147,7 @@ class SlicedSpheresTest(unittest.TestCase):
Compares two simulation intended to provide identical results.
Simulation #1: spherical particle on top of substrate
Simulation #2: spherical composition on top of substrate, where top and bottom are made of same material
- Both particles are inserted in air layer with shift to go below interface
+ Both particles are inserted in vacuum layer with shift to go below interface
"""
shift = 3*nm
diff --git a/Tests/Functional/Python/PyCore/sliced_spheres.py b/Tests/Functional/Python/PyCore/sliced_spheres.py
index de691a18753..1195f1df170 100644
--- a/Tests/Functional/Python/PyCore/sliced_spheres.py
+++ b/Tests/Functional/Python/PyCore/sliced_spheres.py
@@ -11,7 +11,7 @@ import bornagain as ba
from bornagain import deg, kvector_t
mSubstrate = ba.HomogeneousMaterial("Substrate", 3.212e-6, 3.244e-8)
-mAmbience = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+mAmbience = ba.HomogeneousMaterial("Vacuum", 0.0, 0.0)
class SlicedSpheresTest(unittest.TestCase):
@@ -21,11 +21,11 @@ class SlicedSpheresTest(unittest.TestCase):
by the user.
"""
- air_layer = ba.Layer(mAmbience)
+ vacuum_layer = ba.Layer(mAmbience)
if particle_to_air:
layout = ba.ParticleLayout()
layout.addParticle(particle_to_air)
- air_layer.addLayout(layout)
+ vacuum_layer.addLayout(layout)
substrate = ba.Layer(mSubstrate)
if particle_to_substrate:
@@ -34,7 +34,7 @@ class SlicedSpheresTest(unittest.TestCase):
substrate.addLayout(layout)
multi_layer = ba.MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
multi_layer.addLayer(substrate)
return multi_layer
@@ -71,8 +71,8 @@ class SlicedSpheresTest(unittest.TestCase):
def testSphericalLacuneInSubstrate(self):
"""
- Similar to previous. Truncated sphere and sphere are made of air material.
- From scattering point of view, both cases should look like an air lacune in substrate.
+ Similar to previous. Truncated sphere and sphere are made of vacuum material.
+ From scattering point of view, both cases should look like an vacuum lacune in substrate.
"""
sphere_radius = 10.0
@@ -95,7 +95,7 @@ class SlicedSpheresTest(unittest.TestCase):
def testSpheresCrossingInterface(self):
"""
Compares two simulation intended to provide identical results.
- Simulation #1: full sphere inserted in air layer to cross interface
+ Simulation #1: full sphere inserted in vacuum layer to cross interface
Simulation #2: full sphere inserted in substrate layer to cross interface
Both spheres are made of same material.
"""
@@ -104,7 +104,7 @@ class SlicedSpheresTest(unittest.TestCase):
sphere_radius = 10.0
sphere_shift = 4.0 # shift beneath interface in absolute units
- # Sphere intended for air layer and crossing interface
+ # Sphere intended for vacuum layer and crossing interface
sphere1 = ba.Particle(mParticle, ba.FormFactorFullSphere(sphere_radius))
sphere1.setPosition(0, 0, -sphere_shift)
reference = self.get_result(particle_to_air=sphere1)
diff --git a/Tests/Functional/Python/PyCore/transform_BoxComposition.py b/Tests/Functional/Python/PyCore/transform_BoxComposition.py
index adf6c70a265..9c6310d3629 100644
--- a/Tests/Functional/Python/PyCore/transform_BoxComposition.py
+++ b/Tests/Functional/Python/PyCore/transform_BoxComposition.py
@@ -22,21 +22,21 @@ particle_material = HomogeneousMaterial("Ag", 1.245e-5, 5.419e-7)
class TransformBoxCompositionTest(unittest.TestCase):
def get_sample(self, particle):
- mAmbience = HomogeneousMaterial("Air", 0.0, 0.0)
+ mAmbience = HomogeneousMaterial("Vacuum", 0.0, 0.0)
mMiddle= HomogeneousMaterial("Teflon", 2.900e-6, 6.019e-9)
mSubstrate = HomogeneousMaterial("Substrate", 3.212e-6, 3.244e-8)
layout = ParticleLayout()
layout.addParticle(particle)
- air_layer = Layer(mAmbience)
+ vacuum_layer = Layer(mAmbience)
middle_layer = Layer(mMiddle, layer_thickness)
- # air_layer.addLayout(layout)
+ # vacuum_layer.addLayout(layout)
middle_layer.addLayout(layout)
substrate = Layer(mSubstrate)
multi_layer = MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
multi_layer.addLayer(middle_layer)
multi_layer.addLayer(substrate)
return multi_layer
diff --git a/Tests/Functional/Python/PyCore/transform_CoreShellBox.py b/Tests/Functional/Python/PyCore/transform_CoreShellBox.py
index 62bc0ac51be..008bd3aba92 100644
--- a/Tests/Functional/Python/PyCore/transform_CoreShellBox.py
+++ b/Tests/Functional/Python/PyCore/transform_CoreShellBox.py
@@ -17,20 +17,20 @@ layer_thickness = 100.0
class TransformCoreShellBoxTest(unittest.TestCase):
def get_sample(self, particle):
- mAmbience = HomogeneousMaterial("Air", 0.0, 0.0)
+ mAmbience = HomogeneousMaterial("Vacuum", 0.0, 0.0)
mMiddle= HomogeneousMaterial("Teflon", 2.900e-6, 6.019e-9)
mSubstrate = HomogeneousMaterial("Substrate", 3.212e-6, 3.244e-8)
layout = ParticleLayout()
layout.addParticle(particle)
- air_layer = Layer(mAmbience)
+ vacuum_layer = Layer(mAmbience)
middle_layer = Layer(mMiddle, layer_thickness)
middle_layer.addLayout(layout)
substrate = Layer(mSubstrate)
multi_layer = MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
multi_layer.addLayer(middle_layer)
multi_layer.addLayer(substrate)
return multi_layer
diff --git a/Tests/Functional/Python/PyCore/transform_box.py b/Tests/Functional/Python/PyCore/transform_box.py
index 465c5224f82..6090c6a7564 100644
--- a/Tests/Functional/Python/PyCore/transform_box.py
+++ b/Tests/Functional/Python/PyCore/transform_box.py
@@ -16,20 +16,20 @@ layer_thickness = 100
class BoxTransformationsTest(unittest.TestCase):
def get_sample(self, particle):
- mAmbience = ba.HomogeneousMaterial("Air", 0.0, 0.0)
+ mAmbience = ba.HomogeneousMaterial("Vacuum", 0.0, 0.0)
mMiddle= ba.HomogeneousMaterial("Teflon", 2.900e-6, 6.019e-9)
mSubstrate = ba.HomogeneousMaterial("Substrate", 3.212e-6, 3.244e-8)
layout = ba.ParticleLayout()
layout.addParticle(particle)
- air_layer = ba.Layer(mAmbience)
+ vacuum_layer = ba.Layer(mAmbience)
middle_layer = ba.Layer(mMiddle, layer_thickness)
middle_layer.addLayout(layout)
substrate = ba.Layer(mSubstrate)
multi_layer = ba.MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
multi_layer.addLayer(middle_layer)
multi_layer.addLayer(substrate)
return multi_layer
diff --git a/Tests/Functional/Python/PyCore/transform_cube.py b/Tests/Functional/Python/PyCore/transform_cube.py
index d38f276a17d..cd586e043ac 100644
--- a/Tests/Functional/Python/PyCore/transform_cube.py
+++ b/Tests/Functional/Python/PyCore/transform_cube.py
@@ -13,8 +13,8 @@ class RotationsCubeTest(unittest.TestCase):
"""
Test of rotations and translations of simple cube in three layers system
"""
- def get_sample(self, formfactor, rot = None, pos = None, layout_rot = None, layout_pos = None, add_to="air"):
- mAmbience = HomogeneousMaterial("Air", 0.0, 0.0)
+ def get_sample(self, formfactor, rot = None, pos = None, layout_rot = None, layout_pos = None, add_to="Vacuum"):
+ mAmbience = HomogeneousMaterial("Vacuum", 0.0, 0.0)
mParticle = HomogeneousMaterial("Particle", 6e-4, 2e-8)
mMiddle= HomogeneousMaterial("MidleLayer", 5e-5, 2e-8)
mSubstrate = HomogeneousMaterial("Substrate", 6e-6, 2e-8)
@@ -35,22 +35,22 @@ class RotationsCubeTest(unittest.TestCase):
else:
layout.addParticle(particle)
- air_layer = Layer(mAmbience)
+ vacuum_layer = Layer(mAmbience)
middle_layer = Layer(mSubstrate, 50.0)
substrate = Layer(mSubstrate)
- if add_to == "air":
- air_layer.addLayout(layout)
+ if add_to == "Vacuum":
+ vacuum_layer.addLayout(layout)
else:
middle_layer.addLayout(layout)
multi_layer = MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
multi_layer.addLayer(middle_layer)
multi_layer.addLayer(substrate)
return multi_layer
- def get_result(self, data, add_to="air"):
+ def get_result(self, data, add_to="Vacuum"):
ff = data[0]
rot = data[1]
pos = data[2]
@@ -62,7 +62,7 @@ class RotationsCubeTest(unittest.TestCase):
simulation.runSimulation()
return simulation.result()
- def get_difference(self, reference_data, test_data, add_to="air"):
+ def get_difference(self, reference_data, test_data, add_to="Vacuum"):
intensity = self.get_result(test_data, add_to)
return RelativeDifference(reference_data, intensity)
diff --git a/Tests/Functional/Python/PyEmbedded/Tests.cpp b/Tests/Functional/Python/PyEmbedded/Tests.cpp
index c66150ce0f6..54f631b1b18 100644
--- a/Tests/Functional/Python/PyEmbedded/Tests.cpp
+++ b/Tests/Functional/Python/PyEmbedded/Tests.cpp
@@ -315,10 +315,10 @@ TEST_F(PyEmbedded, EmbeddedMultiLayer)
buf << "import bornagain as ba \n";
buf << " \n";
buf << "def get_simulation(): \n";
- buf << " m_vacuum = ba.HomogeneousMaterial(\"Air\", 0.0, 0.0) \n";
- buf << " air_layer = ba.Layer(m_vacuum) \n";
+ buf << " m_vacuum = ba.HomogeneousMaterial(\"Vacuum\", 0.0, 0.0) \n";
+ buf << " vacuum_layer = ba.Layer(m_vacuum) \n";
buf << " multilayer = ba.MultiLayer() \n";
- buf << " multilayer.addLayer(air_layer) \n";
+ buf << " multilayer.addLayer(vacuum_layer) \n";
buf << " return multilayer \n";
PyObject* pCompiledFn = Py_CompileString(buf.str().c_str(), "", Py_file_input);
@@ -394,10 +394,10 @@ TEST_F(PyEmbedded, ModuleFunctionsList)
buf << "import bornagain as ba \n";
buf << " \n";
buf << "def get_simulation(): \n";
- buf << " m_vacuum = ba.HomogeneousMaterial(\"Air\", 0.0, 0.0) \n";
- buf << " air_layer = ba.Layer(m_vacuum) \n";
+ buf << " m_vacuum = ba.HomogeneousMaterial(\"Vacuum\", 0.0, 0.0) \n";
+ buf << " vacuum_layer = ba.Layer(m_vacuum) \n";
buf << " multilayer = ba.MultiLayer() \n";
- buf << " multilayer.addLayer(air_layer) \n";
+ buf << " multilayer.addLayer(vacuum_layer) \n";
buf << " return multilayer \n";
auto listOfFunc = PyImport::listOfFunctions(buf.str(), BABuild::buildLibDir());
diff --git a/Tests/Functional/Std/StandardTests.h b/Tests/Functional/Std/StandardTests.h
index 2ef50ebd787..fe6f4c3bd78 100644
--- a/Tests/Functional/Std/StandardTests.h
+++ b/Tests/Functional/Std/StandardTests.h
@@ -23,7 +23,7 @@ class Std : public ::testing::Test
TEST_F(Std, FormFactors)
{
- EXPECT_TRUE(run("FormFactors", "MiniGISAS", "ParticleInTheAirBuilder", 2e-10));
+ EXPECT_TRUE(run("FormFactors", "MiniGISAS", "ParticleInVacuumBuilder", 2e-10));
}
TEST_F(Std, GISASAbsorptiveSLDLayers)
diff --git a/Tests/Performance/Core/Mesocrystal.cpp b/Tests/Performance/Core/Mesocrystal.cpp
index eee54e3daed..babad9965f3 100644
--- a/Tests/Performance/Core/Mesocrystal.cpp
+++ b/Tests/Performance/Core/Mesocrystal.cpp
@@ -124,10 +124,10 @@ MultiLayer* MesoCrystalPerformanceBuilder::buildSample() const
auto multi_layer = new MultiLayer;
- auto air_material = HomogeneousMaterial("Air", 0.0, 0.0);
+ auto vacuum_material = HomogeneousMaterial("Vacuum", 0.0, 0.0);
auto substrate_material = HomogeneousMaterial("Substrate", 7.57e-6, 1.73e-7);
auto average_layer_material = HomogeneousMaterial("AverageLayer", n_avg);
- Layer air_layer(air_material);
+ Layer vacuum_layer(vacuum_material);
Layer avg_layer(average_layer_material, m_meso_height);
Layer substrate_layer(substrate_material);
ParticleLayout particle_decoration;
@@ -156,7 +156,7 @@ MultiLayer* MesoCrystalPerformanceBuilder::buildSample() const
LayerRoughness roughness(m_roughness, 0.3, 500.0 * nm);
- multi_layer->addLayer(air_layer);
+ multi_layer->addLayer(vacuum_layer);
multi_layer->addLayer(avg_layer);
multi_layer->addLayerWithTopRoughness(substrate_layer, roughness);
diff --git a/Tests/Performance/Core/ThreadingComponents.cpp b/Tests/Performance/Core/ThreadingComponents.cpp
index 919447107ff..d68e07c92bd 100644
--- a/Tests/Performance/Core/ThreadingComponents.cpp
+++ b/Tests/Performance/Core/ThreadingComponents.cpp
@@ -35,7 +35,7 @@ namespace
//! Returns multilayer spheres distribution at lattice points.
std::unique_ptr<MultiLayer> createSampleSpheresDistribution(int nspheres)
{
- auto material_1 = HomogeneousMaterial("example06_Air", 0.0, 0.0);
+ auto material_1 = HomogeneousMaterial("example06_Vacuum", 0.0, 0.0);
auto material_2 = HomogeneousMaterial("example08_Particle", 0.0006, 2e-08);
auto material_3 = HomogeneousMaterial("example06_Substrate", 6e-06, 2e-08);
diff --git a/Tests/Performance/Python/test_performance.py b/Tests/Performance/Python/test_performance.py
index e3bda9c37fb..2dbfcc03944 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_vacuum = HomogeneousMaterial("Air", 0.0, 0.0)
+ m_vacuum = HomogeneousMaterial("Vacuum", 0.0, 0.0)
m_substrate = HomogeneousMaterial("Substrate", 6e-6, 2e-8)
m_particle = HomogeneousMaterial("Particle", 6e-4, 2e-8)
@@ -164,13 +164,13 @@ class CustomTest(FactoryTest):
particle = Particle(m_particle, ff)
particle_layout = ParticleLayout()
particle_layout.addParticle(particle, 1.0)
- air_layer = Layer(m_vacuum)
- air_layer.addLayout(particle_layout)
+ vacuum_layer = Layer(m_vacuum)
+ vacuum_layer.addLayout(particle_layout)
substrate_layer = Layer(m_substrate)
# assemble multilayer
multi_layer = MultiLayer()
- multi_layer.addLayer(air_layer)
+ multi_layer.addLayer(vacuum_layer)
multi_layer.addLayer(substrate_layer)
return multi_layer
diff --git a/Tests/UnitTests/Core/Fresnel/SpecularMagneticOldTest.cpp b/Tests/UnitTests/Core/Fresnel/SpecularMagneticOldTest.cpp
index 7a800c53d12..121f98d2511 100644
--- a/Tests/UnitTests/Core/Fresnel/SpecularMagneticOldTest.cpp
+++ b/Tests/UnitTests/Core/Fresnel/SpecularMagneticOldTest.cpp
@@ -20,7 +20,7 @@ TEST_F(SpecularMagneticOldTest, initial)
// @Error: Throws exception (Layer index is out of bounds)
// matrix.execute(mLayer, v, coeff);
- Material air = HomogeneousMaterial("air", 0, 1.0);
+ Material air = HomogeneousMaterial("Air", 0, 1.0);
Layer layer0(air, 0 * Units::nanometer);
mLayer.addLayer(layer0);
SimulationOptions options;
@@ -39,15 +39,15 @@ TEST_F(SpecularMagneticOldTest, zerofield)
MultiLayer multi_layer_scalar;
Material substr_material_scalar = HomogeneousMaterial("Substrate", 7e-6, 2e-8);
- Layer air_layer(HomogeneousMaterial("Air", 0.0, 0.0));
+ Layer vacuum_layer(HomogeneousMaterial("Vacuum", 0.0, 0.0));
Layer substr_layer_scalar(substr_material_scalar);
- multi_layer_scalar.addLayer(air_layer);
+ multi_layer_scalar.addLayer(vacuum_layer);
multi_layer_scalar.addLayer(substr_layer_scalar);
MultiLayer multi_layer_zerofield;
Material substr_material_zerofield = HomogeneousMaterial("Substrate", 7e-6, 2e-8, substr_field);
Layer substr_layer_zerofield(substr_material_zerofield);
- multi_layer_zerofield.addLayer(air_layer);
+ multi_layer_zerofield.addLayer(vacuum_layer);
multi_layer_zerofield.addLayer(substr_layer_zerofield);
SimulationOptions options;
diff --git a/Tests/UnitTests/Core/Fresnel/SpecularMagneticTest.cpp b/Tests/UnitTests/Core/Fresnel/SpecularMagneticTest.cpp
index ebdac99eb48..99cc5fc8499 100644
--- a/Tests/UnitTests/Core/Fresnel/SpecularMagneticTest.cpp
+++ b/Tests/UnitTests/Core/Fresnel/SpecularMagneticTest.cpp
@@ -88,7 +88,7 @@ void SpecularMagneticTest::testZeroField(const kvector_t& k, const ProcessedSamp
std::unique_ptr<ProcessedSample> SpecularMagneticTest::sample_degenerate()
{
MultiLayer mLayer;
- Material air = HomogeneousMaterial("air", 0, 1.0);
+ Material air = HomogeneousMaterial("Vacuum", 0, 1.0);
mLayer.addLayer(Layer(air, 0 * Units::nanometer));
return std::make_unique<ProcessedSample>(mLayer, SimulationOptions());
}
@@ -102,9 +102,9 @@ std::unique_ptr<ProcessedSample> SpecularMagneticTest::sample_zerofield()
{
MultiLayer multi_layer_scalar;
Material substr_material_scalar = HomogeneousMaterial("Substrate", 7e-6, 2e-8);
- Layer air_layer(HomogeneousMaterial("Air", 0.0, 0.0));
+ Layer vacuum_layer(HomogeneousMaterial("Vacuum", 0.0, 0.0));
Layer substr_layer_scalar(substr_material_scalar);
- multi_layer_scalar.addLayer(air_layer);
+ multi_layer_scalar.addLayer(vacuum_layer);
multi_layer_scalar.addLayer(substr_layer_scalar);
SimulationOptions options;
diff --git a/Tests/UnitTests/Core/Sample/LayerInterfaceTest.cpp b/Tests/UnitTests/Core/Sample/LayerInterfaceTest.cpp
index 9af807c8ff4..88154a20d79 100644
--- a/Tests/UnitTests/Core/Sample/LayerInterfaceTest.cpp
+++ b/Tests/UnitTests/Core/Sample/LayerInterfaceTest.cpp
@@ -11,8 +11,8 @@ class LayerInterfaceTest : public ::testing::Test
TEST_F(LayerInterfaceTest, createSmoothInterface)
{
- std::unique_ptr<Layer> layer0(new Layer(HomogeneousMaterial("air", 0.0, 0.0)));
- std::unique_ptr<Layer> layer1(new Layer(HomogeneousMaterial("air", 0.0, 0.0)));
+ std::unique_ptr<Layer> layer0(new Layer(HomogeneousMaterial("Vacuum", 0.0, 0.0)));
+ std::unique_ptr<Layer> layer1(new Layer(HomogeneousMaterial("Vacuum", 0.0, 0.0)));
std::unique_ptr<LayerInterface> interface(
LayerInterface::createSmoothInterface(layer0.get(), layer1.get()));
@@ -25,8 +25,8 @@ TEST_F(LayerInterfaceTest, createSmoothInterface)
TEST_F(LayerInterfaceTest, createRoughInterface)
{
- std::unique_ptr<Layer> layer0(new Layer(HomogeneousMaterial("air", 0.0, 0.0)));
- std::unique_ptr<Layer> layer1(new Layer(HomogeneousMaterial("air", 0.0, 0.0)));
+ std::unique_ptr<Layer> layer0(new Layer(HomogeneousMaterial("Vacuum", 0.0, 0.0)));
+ std::unique_ptr<Layer> layer1(new Layer(HomogeneousMaterial("Vacuum", 0.0, 0.0)));
std::unique_ptr<LayerInterface> interface(LayerInterface::createRoughInterface(
layer0.get(), layer1.get(), LayerRoughness(1.0, 2.0, 3.0)));
diff --git a/Tests/UnitTests/Core/Sample/LayerTest.cpp b/Tests/UnitTests/Core/Sample/LayerTest.cpp
index 14f1cb0eca0..0605917921e 100644
--- a/Tests/UnitTests/Core/Sample/LayerTest.cpp
+++ b/Tests/UnitTests/Core/Sample/LayerTest.cpp
@@ -10,19 +10,19 @@ class LayerTest : public ::testing::Test
TEST_F(LayerTest, LayerGetAndSet)
{
- Material air = HomogeneousMaterial("air", 0, 0);
- Layer layer(air, 10 * Units::nanometer);
- EXPECT_EQ(air, *layer.material());
+ Material vacuum = HomogeneousMaterial("Vacuum", 0, 0);
+ Layer layer(vacuum, 10 * Units::nanometer);
+ EXPECT_EQ(vacuum, *layer.material());
EXPECT_EQ(0u, layer.layouts().size());
EXPECT_EQ(10, layer.thickness());
EXPECT_EQ(layer.numberOfLayouts(), 0u);
layer.setThickness(20.0);
- EXPECT_EQ(air, *layer.material());
+ EXPECT_EQ(vacuum, *layer.material());
EXPECT_EQ(20, layer.thickness());
std::unique_ptr<Layer> clone(layer.clone());
- EXPECT_EQ(air, *clone->material());
+ EXPECT_EQ(vacuum, *clone->material());
EXPECT_EQ(0u, clone->layouts().size());
EXPECT_EQ(20, clone->thickness());
EXPECT_EQ(clone->numberOfLayouts(), 0u);
@@ -30,10 +30,10 @@ TEST_F(LayerTest, LayerGetAndSet)
TEST_F(LayerTest, LayerAndDecoration)
{
- Material air = HomogeneousMaterial("air", 0, 0);
+ Material vacuum = HomogeneousMaterial("Vacuum", 0, 0);
std::unique_ptr<ParticleLayout> layout1(new ParticleLayout());
- Layer layer(air, 10 * Units::nanometer);
+ Layer layer(vacuum, 10 * Units::nanometer);
layer.addLayout(*layout1);
EXPECT_EQ(layer.numberOfLayouts(), 1u);
@@ -44,7 +44,7 @@ TEST_F(LayerTest, LayerAndDecoration)
TEST_F(LayerTest, getChildren)
{
- Layer layer(HomogeneousMaterial("air", 0.0, 0.0));
+ Layer layer(HomogeneousMaterial("Vacuum", 0.0, 0.0));
std::vector<const INode*> children = layer.getChildren();
EXPECT_EQ(children.size(), 0u);
diff --git a/Tests/UnitTests/Core/Sample/MultiLayerTest.cpp b/Tests/UnitTests/Core/Sample/MultiLayerTest.cpp
index bcbbe118e50..b30ec360db4 100644
--- a/Tests/UnitTests/Core/Sample/MultiLayerTest.cpp
+++ b/Tests/UnitTests/Core/Sample/MultiLayerTest.cpp
@@ -18,7 +18,7 @@ class MultiLayerTest : public ::testing::Test
protected:
MultiLayerTest()
// The following delta, beta are all unphysical. Values don't matter here.
- : air(HomogeneousMaterial("air", 1e-6, 9e-4)),
+ : air(HomogeneousMaterial("Vacuum", 1e-6, 9e-4)),
iron(HomogeneousMaterial("iron", 2e-5, 8e-5)),
chromium(HomogeneousMaterial("chromium", 3e-7, 7e-6)),
stone(HomogeneousMaterial("stone", 4e-4, 8e-7)), topLayer(air, 0 * Units::nanometer),
diff --git a/Tests/UnitTests/Core/Sample/ParticleCompositionTest.cpp b/Tests/UnitTests/Core/Sample/ParticleCompositionTest.cpp
index a1dd5c55ce2..c03abd3d37b 100644
--- a/Tests/UnitTests/Core/Sample/ParticleCompositionTest.cpp
+++ b/Tests/UnitTests/Core/Sample/ParticleCompositionTest.cpp
@@ -22,7 +22,7 @@ TEST_F(ParticleCompositionTest, ParticleCompositionClone)
ParticleComposition composition;
Particle particle;
kvector_t position = kvector_t(1.0, 1.0, 1.0);
- Material material = HomogeneousMaterial("Air", 0.0, 0.0);
+ Material material = HomogeneousMaterial("Vacuum", 0.0, 0.0);
composition.addParticle(particle, position);
std::unique_ptr<ParticleComposition> clone(composition.clone());
@@ -35,7 +35,7 @@ TEST_F(ParticleCompositionTest, ParticleCompositionClone)
TEST_F(ParticleCompositionTest, getChildren)
{
- Material material = HomogeneousMaterial("Air", 0.0, 0.0);
+ Material material = HomogeneousMaterial("Vacuum", 0.0, 0.0);
ParticleComposition composition;
composition.addParticle(Particle(material, FormFactorFullSphere(1.0)));
diff --git a/Tests/UnitTests/Core/Sample/ParticleDistributionTest.cpp b/Tests/UnitTests/Core/Sample/ParticleDistributionTest.cpp
index d8a6c317030..9b92e0fa43e 100644
--- a/Tests/UnitTests/Core/Sample/ParticleDistributionTest.cpp
+++ b/Tests/UnitTests/Core/Sample/ParticleDistributionTest.cpp
@@ -16,7 +16,7 @@ ParticleDistributionTest::~ParticleDistributionTest() = default;
TEST_F(ParticleDistributionTest, getChildren)
{
- Particle particle(HomogeneousMaterial("Air", 0.0, 0.0), FormFactorFullSphere(1.0));
+ Particle particle(HomogeneousMaterial("Vacuum", 0.0, 0.0), FormFactorFullSphere(1.0));
ParameterDistribution parameter("name", DistributionGate(1.0, 2.0), 5, 0.0, 1.0);
ParticleDistribution distr(particle, parameter);
@@ -27,7 +27,7 @@ TEST_F(ParticleDistributionTest, getChildren)
TEST_F(ParticleDistributionTest, mainParameterUnits)
{
- Material mat = HomogeneousMaterial("Air", 0.0, 0.0);
+ Material mat = HomogeneousMaterial("Vacuum", 0.0, 0.0);
DistributionGate gate(1.0, 2.0);
ParameterDistribution par("/Particle/FullSphere/Radius", gate, 5);
diff --git a/Tests/UnitTests/Core/Sample/ParticleTest.cpp b/Tests/UnitTests/Core/Sample/ParticleTest.cpp
index 6b4aec1e2a5..7121acf4472 100644
--- a/Tests/UnitTests/Core/Sample/ParticleTest.cpp
+++ b/Tests/UnitTests/Core/Sample/ParticleTest.cpp
@@ -32,7 +32,7 @@ TEST_F(ParticleTest, Clone)
TEST_F(ParticleTest, Constructors)
{
- Material mat = HomogeneousMaterial("Air", 0, 0);
+ Material mat = HomogeneousMaterial("Vacuum", 0, 0);
FormFactorFullSphere sphere(1.0);
RotationZ transform(45. * Units::degree);
@@ -56,7 +56,7 @@ TEST_F(ParticleTest, Constructors)
TEST_F(ParticleTest, setters)
{
- Material mat = HomogeneousMaterial("Air", 0, 0);
+ Material mat = HomogeneousMaterial("Vacuum", 0, 0);
FormFactorFullSphere sphere(2.1);
RotationY transform(45. * Units::degree);
@@ -75,7 +75,7 @@ TEST_F(ParticleTest, setters)
TEST_F(ParticleTest, getChildren)
{
- Material mat = HomogeneousMaterial("Air", 0, 0);
+ Material mat = HomogeneousMaterial("Vacuum", 0, 0);
FormFactorFullSphere sphere(2.1);
// Checking children of particle (no rotation)
diff --git a/Tests/UnitTests/Core/Sample/RTTest.cpp b/Tests/UnitTests/Core/Sample/RTTest.cpp
index e37485a2cf9..f0a51e32870 100644
--- a/Tests/UnitTests/Core/Sample/RTTest.cpp
+++ b/Tests/UnitTests/Core/Sample/RTTest.cpp
@@ -38,7 +38,7 @@ protected:
return result;
}
- const Material air = HomogeneousMaterial("air", 1e-8, 1e-8);
+ const Material air = HomogeneousMaterial("Air", 1e-8, 1e-8);
const Material amat = HomogeneousMaterial("material A", 2e-6, 8e-7);
const Material bmat = HomogeneousMaterial("material B (high absorption)", 3e-5, 2e-4);
const Material stone = HomogeneousMaterial("substrate material", 1e-6, 1e-7);
diff --git a/Wrap/swig/libBornAgainCore.i b/Wrap/swig/libBornAgainCore.i
index 7b936a75f60..7b516e93b83 100644
--- a/Wrap/swig/libBornAgainCore.i
+++ b/Wrap/swig/libBornAgainCore.i
@@ -47,8 +47,8 @@
%template(vector_complex_t) std::vector< std::complex<double>>;
%template(vector_string_t) std::vector<std::string>;
%template(map_string_double_t) std::map<std::string, double>;
-%template(pair_double_t) std::pair<double, double>;
-%template(vector_pair_double_t) std::vector<std::pair<double, double>>;
+%template(pvacuum_double_t) std::pair<double, double>;
+%template(vector_pvacuum_double_t) std::vector<std::pair<double, double>>;
%nodefaultctor ParameterPool;
#define SWIG_FILE_WITH_INIT
diff --git a/auto/Wrap/libBornAgainCore.py b/auto/Wrap/libBornAgainCore.py
index ec4fb701d95..bf792977134 100644
--- a/auto/Wrap/libBornAgainCore.py
+++ b/auto/Wrap/libBornAgainCore.py
@@ -1525,7 +1525,7 @@ class map_string_double_t(object):
# Register map_string_double_t in _libBornAgainCore:
_libBornAgainCore.map_string_double_t_swigregister(map_string_double_t)
-class pair_double_t(object):
+class pvacuum_double_t(object):
r"""Proxy of C++ std::pair< double,double > class."""
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
@@ -1533,13 +1533,13 @@ class pair_double_t(object):
def __init__(self, *args):
r"""
- __init__(pair_double_t self) -> pair_double_t
- __init__(pair_double_t self, double first, double second) -> pair_double_t
- __init__(pair_double_t self, pair_double_t other) -> pair_double_t
+ __init__(pvacuum_double_t self) -> pvacuum_double_t
+ __init__(pvacuum_double_t self, double first, double second) -> pvacuum_double_t
+ __init__(pvacuum_double_t self, pvacuum_double_t other) -> pvacuum_double_t
"""
- _libBornAgainCore.pair_double_t_swiginit(self, _libBornAgainCore.new_pair_double_t(*args))
- first = property(_libBornAgainCore.pair_double_t_first_get, _libBornAgainCore.pair_double_t_first_set, doc=r"""first : double""")
- second = property(_libBornAgainCore.pair_double_t_second_get, _libBornAgainCore.pair_double_t_second_set, doc=r"""second : double""")
+ _libBornAgainCore.pvacuum_double_t_swiginit(self, _libBornAgainCore.new_pvacuum_double_t(*args))
+ first = property(_libBornAgainCore.pvacuum_double_t_first_get, _libBornAgainCore.pvacuum_double_t_first_set, doc=r"""first : double""")
+ second = property(_libBornAgainCore.pvacuum_double_t_second_get, _libBornAgainCore.pvacuum_double_t_second_set, doc=r"""second : double""")
def __len__(self):
return 2
def __repr__(self):
@@ -1554,183 +1554,183 @@ class pair_double_t(object):
self.first = val
else:
self.second = val
- __swig_destroy__ = _libBornAgainCore.delete_pair_double_t
+ __swig_destroy__ = _libBornAgainCore.delete_pvacuum_double_t
-# Register pair_double_t in _libBornAgainCore:
-_libBornAgainCore.pair_double_t_swigregister(pair_double_t)
+# Register pvacuum_double_t in _libBornAgainCore:
+_libBornAgainCore.pvacuum_double_t_swigregister(pvacuum_double_t)
-class vector_pair_double_t(object):
+class vector_pvacuum_double_t(object):
r"""Proxy of C++ std::vector< std::pair< double,double > > class."""
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
__repr__ = _swig_repr
def iterator(self):
- r"""iterator(vector_pair_double_t self) -> SwigPyIterator"""
- return _libBornAgainCore.vector_pair_double_t_iterator(self)
+ r"""iterator(vector_pvacuum_double_t self) -> SwigPyIterator"""
+ return _libBornAgainCore.vector_pvacuum_double_t_iterator(self)
def __iter__(self):
return self.iterator()
def __nonzero__(self):
- r"""__nonzero__(vector_pair_double_t self) -> bool"""
- return _libBornAgainCore.vector_pair_double_t___nonzero__(self)
+ r"""__nonzero__(vector_pvacuum_double_t self) -> bool"""
+ return _libBornAgainCore.vector_pvacuum_double_t___nonzero__(self)
def __bool__(self):
- r"""__bool__(vector_pair_double_t self) -> bool"""
- return _libBornAgainCore.vector_pair_double_t___bool__(self)
+ r"""__bool__(vector_pvacuum_double_t self) -> bool"""
+ return _libBornAgainCore.vector_pvacuum_double_t___bool__(self)
def __len__(self):
- r"""__len__(vector_pair_double_t self) -> std::vector< std::pair< double,double > >::size_type"""
- return _libBornAgainCore.vector_pair_double_t___len__(self)
+ r"""__len__(vector_pvacuum_double_t self) -> std::vector< std::pair< double,double > >::size_type"""
+ return _libBornAgainCore.vector_pvacuum_double_t___len__(self)
def __getslice__(self, i, j):
- r"""__getslice__(vector_pair_double_t self, std::vector< std::pair< double,double > >::difference_type i, std::vector< std::pair< double,double > >::difference_type j) -> vector_pair_double_t"""
- return _libBornAgainCore.vector_pair_double_t___getslice__(self, i, j)
+ r"""__getslice__(vector_pvacuum_double_t self, std::vector< std::pair< double,double > >::difference_type i, std::vector< std::pair< double,double > >::difference_type j) -> vector_pvacuum_double_t"""
+ return _libBornAgainCore.vector_pvacuum_double_t___getslice__(self, i, j)
def __setslice__(self, *args):
r"""
- __setslice__(vector_pair_double_t self, std::vector< std::pair< double,double > >::difference_type i, std::vector< std::pair< double,double > >::difference_type j)
- __setslice__(vector_pair_double_t self, std::vector< std::pair< double,double > >::difference_type i, std::vector< std::pair< double,double > >::difference_type j, vector_pair_double_t v)
+ __setslice__(vector_pvacuum_double_t self, std::vector< std::pair< double,double > >::difference_type i, std::vector< std::pair< double,double > >::difference_type j)
+ __setslice__(vector_pvacuum_double_t self, std::vector< std::pair< double,double > >::difference_type i, std::vector< std::pair< double,double > >::difference_type j, vector_pvacuum_double_t v)
"""
- return _libBornAgainCore.vector_pair_double_t___setslice__(self, *args)
+ return _libBornAgainCore.vector_pvacuum_double_t___setslice__(self, *args)
def __delslice__(self, i, j):
- r"""__delslice__(vector_pair_double_t self, std::vector< std::pair< double,double > >::difference_type i, std::vector< std::pair< double,double > >::difference_type j)"""
- return _libBornAgainCore.vector_pair_double_t___delslice__(self, i, j)
+ r"""__delslice__(vector_pvacuum_double_t self, std::vector< std::pair< double,double > >::difference_type i, std::vector< std::pair< double,double > >::difference_type j)"""
+ return _libBornAgainCore.vector_pvacuum_double_t___delslice__(self, i, j)
def __delitem__(self, *args):
r"""
- __delitem__(vector_pair_double_t self, std::vector< std::pair< double,double > >::difference_type i)
- __delitem__(vector_pair_double_t self, PySliceObject * slice)
+ __delitem__(vector_pvacuum_double_t self, std::vector< std::pair< double,double > >::difference_type i)
+ __delitem__(vector_pvacuum_double_t self, PySliceObject * slice)
"""
- return _libBornAgainCore.vector_pair_double_t___delitem__(self, *args)
+ return _libBornAgainCore.vector_pvacuum_double_t___delitem__(self, *args)
def __getitem__(self, *args):
r"""
- __getitem__(vector_pair_double_t self, PySliceObject * slice) -> vector_pair_double_t
- __getitem__(vector_pair_double_t self, std::vector< std::pair< double,double > >::difference_type i) -> pair_double_t
+ __getitem__(vector_pvacuum_double_t self, PySliceObject * slice) -> vector_pvacuum_double_t
+ __getitem__(vector_pvacuum_double_t self, std::vector< std::pair< double,double > >::difference_type i) -> pvacuum_double_t
"""
- return _libBornAgainCore.vector_pair_double_t___getitem__(self, *args)
+ return _libBornAgainCore.vector_pvacuum_double_t___getitem__(self, *args)
def __setitem__(self, *args):
r"""
- __setitem__(vector_pair_double_t self, PySliceObject * slice, vector_pair_double_t v)
- __setitem__(vector_pair_double_t self, PySliceObject * slice)
- __setitem__(vector_pair_double_t self, std::vector< std::pair< double,double > >::difference_type i, pair_double_t x)
+ __setitem__(vector_pvacuum_double_t self, PySliceObject * slice, vector_pvacuum_double_t v)
+ __setitem__(vector_pvacuum_double_t self, PySliceObject * slice)
+ __setitem__(vector_pvacuum_double_t self, std::vector< std::pair< double,double > >::difference_type i, pvacuum_double_t x)
"""
- return _libBornAgainCore.vector_pair_double_t___setitem__(self, *args)
+ return _libBornAgainCore.vector_pvacuum_double_t___setitem__(self, *args)
def pop(self):
- r"""pop(vector_pair_double_t self) -> pair_double_t"""
- return _libBornAgainCore.vector_pair_double_t_pop(self)
+ r"""pop(vector_pvacuum_double_t self) -> pvacuum_double_t"""
+ return _libBornAgainCore.vector_pvacuum_double_t_pop(self)
def append(self, x):
- r"""append(vector_pair_double_t self, pair_double_t x)"""
- return _libBornAgainCore.vector_pair_double_t_append(self, x)
+ r"""append(vector_pvacuum_double_t self, pvacuum_double_t x)"""
+ return _libBornAgainCore.vector_pvacuum_double_t_append(self, x)
def empty(self):
- r"""empty(vector_pair_double_t self) -> bool"""
- return _libBornAgainCore.vector_pair_double_t_empty(self)
+ r"""empty(vector_pvacuum_double_t self) -> bool"""
+ return _libBornAgainCore.vector_pvacuum_double_t_empty(self)
def size(self):
- r"""size(vector_pair_double_t self) -> std::vector< std::pair< double,double > >::size_type"""
- return _libBornAgainCore.vector_pair_double_t_size(self)
+ r"""size(vector_pvacuum_double_t self) -> std::vector< std::pair< double,double > >::size_type"""
+ return _libBornAgainCore.vector_pvacuum_double_t_size(self)
def swap(self, v):
r"""
- swap(vector_pair_double_t self, vector_pair_double_t v)
+ swap(vector_pvacuum_double_t self, vector_pvacuum_double_t v)
void swap(OutputDataIterator< TValue, TContainer > &left, OutputDataIterator< TValue, TContainer > &right)
make Swappable
"""
- return _libBornAgainCore.vector_pair_double_t_swap(self, v)
+ return _libBornAgainCore.vector_pvacuum_double_t_swap(self, v)
def begin(self):
- r"""begin(vector_pair_double_t self) -> std::vector< std::pair< double,double > >::iterator"""
- return _libBornAgainCore.vector_pair_double_t_begin(self)
+ r"""begin(vector_pvacuum_double_t self) -> std::vector< std::pair< double,double > >::iterator"""
+ return _libBornAgainCore.vector_pvacuum_double_t_begin(self)
def end(self):
- r"""end(vector_pair_double_t self) -> std::vector< std::pair< double,double > >::iterator"""
- return _libBornAgainCore.vector_pair_double_t_end(self)
+ r"""end(vector_pvacuum_double_t self) -> std::vector< std::pair< double,double > >::iterator"""
+ return _libBornAgainCore.vector_pvacuum_double_t_end(self)
def rbegin(self):
- r"""rbegin(vector_pair_double_t self) -> std::vector< std::pair< double,double > >::reverse_iterator"""
- return _libBornAgainCore.vector_pair_double_t_rbegin(self)
+ r"""rbegin(vector_pvacuum_double_t self) -> std::vector< std::pair< double,double > >::reverse_iterator"""
+ return _libBornAgainCore.vector_pvacuum_double_t_rbegin(self)
def rend(self):
- r"""rend(vector_pair_double_t self) -> std::vector< std::pair< double,double > >::reverse_iterator"""
- return _libBornAgainCore.vector_pair_double_t_rend(self)
+ r"""rend(vector_pvacuum_double_t self) -> std::vector< std::pair< double,double > >::reverse_iterator"""
+ return _libBornAgainCore.vector_pvacuum_double_t_rend(self)
def clear(self):
- r"""clear(vector_pair_double_t self)"""
- return _libBornAgainCore.vector_pair_double_t_clear(self)
+ r"""clear(vector_pvacuum_double_t self)"""
+ return _libBornAgainCore.vector_pvacuum_double_t_clear(self)
def get_allocator(self):
- r"""get_allocator(vector_pair_double_t self) -> std::vector< std::pair< double,double > >::allocator_type"""
- return _libBornAgainCore.vector_pair_double_t_get_allocator(self)
+ r"""get_allocator(vector_pvacuum_double_t self) -> std::vector< std::pair< double,double > >::allocator_type"""
+ return _libBornAgainCore.vector_pvacuum_double_t_get_allocator(self)
def pop_back(self):
- r"""pop_back(vector_pair_double_t self)"""
- return _libBornAgainCore.vector_pair_double_t_pop_back(self)
+ r"""pop_back(vector_pvacuum_double_t self)"""
+ return _libBornAgainCore.vector_pvacuum_double_t_pop_back(self)
def erase(self, *args):
r"""
- erase(vector_pair_double_t self, std::vector< std::pair< double,double > >::iterator pos) -> std::vector< std::pair< double,double > >::iterator
- erase(vector_pair_double_t self, std::vector< std::pair< double,double > >::iterator first, std::vector< std::pair< double,double > >::iterator last) -> std::vector< std::pair< double,double > >::iterator
+ erase(vector_pvacuum_double_t self, std::vector< std::pair< double,double > >::iterator pos) -> std::vector< std::pair< double,double > >::iterator
+ erase(vector_pvacuum_double_t self, std::vector< std::pair< double,double > >::iterator first, std::vector< std::pair< double,double > >::iterator last) -> std::vector< std::pair< double,double > >::iterator
"""
- return _libBornAgainCore.vector_pair_double_t_erase(self, *args)
+ return _libBornAgainCore.vector_pvacuum_double_t_erase(self, *args)
def __init__(self, *args):
r"""
- __init__(vector_pair_double_t self) -> vector_pair_double_t
- __init__(vector_pair_double_t self, vector_pair_double_t other) -> vector_pair_double_t
- __init__(vector_pair_double_t self, std::vector< std::pair< double,double > >::size_type size) -> vector_pair_double_t
- __init__(vector_pair_double_t self, std::vector< std::pair< double,double > >::size_type size, pair_double_t value) -> vector_pair_double_t
+ __init__(vector_pvacuum_double_t self) -> vector_pvacuum_double_t
+ __init__(vector_pvacuum_double_t self, vector_pvacuum_double_t other) -> vector_pvacuum_double_t
+ __init__(vector_pvacuum_double_t self, std::vector< std::pair< double,double > >::size_type size) -> vector_pvacuum_double_t
+ __init__(vector_pvacuum_double_t self, std::vector< std::pair< double,double > >::size_type size, pvacuum_double_t value) -> vector_pvacuum_double_t
"""
- _libBornAgainCore.vector_pair_double_t_swiginit(self, _libBornAgainCore.new_vector_pair_double_t(*args))
+ _libBornAgainCore.vector_pvacuum_double_t_swiginit(self, _libBornAgainCore.new_vector_pvacuum_double_t(*args))
def push_back(self, x):
- r"""push_back(vector_pair_double_t self, pair_double_t x)"""
- return _libBornAgainCore.vector_pair_double_t_push_back(self, x)
+ r"""push_back(vector_pvacuum_double_t self, pvacuum_double_t x)"""
+ return _libBornAgainCore.vector_pvacuum_double_t_push_back(self, x)
def front(self):
- r"""front(vector_pair_double_t self) -> pair_double_t"""
- return _libBornAgainCore.vector_pair_double_t_front(self)
+ r"""front(vector_pvacuum_double_t self) -> pvacuum_double_t"""
+ return _libBornAgainCore.vector_pvacuum_double_t_front(self)
def back(self):
- r"""back(vector_pair_double_t self) -> pair_double_t"""
- return _libBornAgainCore.vector_pair_double_t_back(self)
+ r"""back(vector_pvacuum_double_t self) -> pvacuum_double_t"""
+ return _libBornAgainCore.vector_pvacuum_double_t_back(self)
def assign(self, n, x):
- r"""assign(vector_pair_double_t self, std::vector< std::pair< double,double > >::size_type n, pair_double_t x)"""
- return _libBornAgainCore.vector_pair_double_t_assign(self, n, x)
+ r"""assign(vector_pvacuum_double_t self, std::vector< std::pair< double,double > >::size_type n, pvacuum_double_t x)"""
+ return _libBornAgainCore.vector_pvacuum_double_t_assign(self, n, x)
def resize(self, *args):
r"""
- resize(vector_pair_double_t self, std::vector< std::pair< double,double > >::size_type new_size)
- resize(vector_pair_double_t self, std::vector< std::pair< double,double > >::size_type new_size, pair_double_t x)
+ resize(vector_pvacuum_double_t self, std::vector< std::pair< double,double > >::size_type new_size)
+ resize(vector_pvacuum_double_t self, std::vector< std::pair< double,double > >::size_type new_size, pvacuum_double_t x)
"""
- return _libBornAgainCore.vector_pair_double_t_resize(self, *args)
+ return _libBornAgainCore.vector_pvacuum_double_t_resize(self, *args)
def insert(self, *args):
r"""
- insert(vector_pair_double_t self, std::vector< std::pair< double,double > >::iterator pos, pair_double_t x) -> std::vector< std::pair< double,double > >::iterator
- insert(vector_pair_double_t self, std::vector< std::pair< double,double > >::iterator pos, std::vector< std::pair< double,double > >::size_type n, pair_double_t x)
+ insert(vector_pvacuum_double_t self, std::vector< std::pair< double,double > >::iterator pos, pvacuum_double_t x) -> std::vector< std::pair< double,double > >::iterator
+ insert(vector_pvacuum_double_t self, std::vector< std::pair< double,double > >::iterator pos, std::vector< std::pair< double,double > >::size_type n, pvacuum_double_t x)
"""
- return _libBornAgainCore.vector_pair_double_t_insert(self, *args)
+ return _libBornAgainCore.vector_pvacuum_double_t_insert(self, *args)
def reserve(self, n):
- r"""reserve(vector_pair_double_t self, std::vector< std::pair< double,double > >::size_type n)"""
- return _libBornAgainCore.vector_pair_double_t_reserve(self, n)
+ r"""reserve(vector_pvacuum_double_t self, std::vector< std::pair< double,double > >::size_type n)"""
+ return _libBornAgainCore.vector_pvacuum_double_t_reserve(self, n)
def capacity(self):
- r"""capacity(vector_pair_double_t self) -> std::vector< std::pair< double,double > >::size_type"""
- return _libBornAgainCore.vector_pair_double_t_capacity(self)
- __swig_destroy__ = _libBornAgainCore.delete_vector_pair_double_t
+ r"""capacity(vector_pvacuum_double_t self) -> std::vector< std::pair< double,double > >::size_type"""
+ return _libBornAgainCore.vector_pvacuum_double_t_capacity(self)
+ __swig_destroy__ = _libBornAgainCore.delete_vector_pvacuum_double_t
-# Register vector_pair_double_t in _libBornAgainCore:
-_libBornAgainCore.vector_pair_double_t_swigregister(vector_pair_double_t)
+# Register vector_pvacuum_double_t in _libBornAgainCore:
+_libBornAgainCore.vector_pvacuum_double_t_swigregister(vector_pvacuum_double_t)
import libBornAgainFit
class swig_dummy_type_axisinfo_vector(object):
@@ -10540,7 +10540,7 @@ class IFTDecayFunction2D(ICloneable, INode):
def boundingReciprocalLatticeCoordinates(self, qX, qY, a, b, alpha):
r"""
- boundingReciprocalLatticeCoordinates(IFTDecayFunction2D self, double qX, double qY, double a, double b, double alpha) -> pair_double_t
+ boundingReciprocalLatticeCoordinates(IFTDecayFunction2D self, double qX, double qY, double a, double b, double alpha) -> pvacuum_double_t
std::pair< double, double > IFTDecayFunction2D::boundingReciprocalLatticeCoordinates(double qX, double qY, double a, double b, double alpha) const
transform back to a*, b* basis:
@@ -18137,7 +18137,7 @@ def MaterialProfile_cpp(multilayer, n_points, z_min, z_max):
def DefaultMaterialProfileLimits(multilayer):
r"""
- DefaultMaterialProfileLimits(MultiLayer multilayer) -> pair_double_t
+ DefaultMaterialProfileLimits(MultiLayer multilayer) -> pvacuum_double_t
std::pair<double, double> DefaultMaterialProfileLimits(const MultiLayer &multilayer)
Get default z limits for generating a material profile.
@@ -21011,7 +21011,7 @@ _libBornAgainCore.SimulationResult_swigregister(SimulationResult)
def FindPeaks(*args):
r"""
- FindPeaks(Histogram2D hist, double sigma=2, std::string const & option={}, double threshold=0.05) -> vector_pair_double_t
+ FindPeaks(Histogram2D hist, double sigma=2, std::string const & option={}, double threshold=0.05) -> vector_pvacuum_double_t
std::vector< std::pair< double, double > > SpectrumUtils::FindPeaks(const Histogram2D &hist, double sigma=2, const std::string &option={}, double threshold=0.05)
"""
diff --git a/auto/Wrap/libBornAgainCore_wrap.cpp b/auto/Wrap/libBornAgainCore_wrap.cpp
index 0c704367224..8483c301e18 100644
--- a/auto/Wrap/libBornAgainCore_wrap.cpp
+++ b/auto/Wrap/libBornAgainCore_wrap.cpp
@@ -25650,7 +25650,7 @@ SWIGINTERN PyObject *map_string_double_t_swiginit(PyObject *SWIGUNUSEDPARM(self)
return SWIG_Python_InitShadowInstance(args);
}
-SWIGINTERN PyObject *_wrap_new_pair_double_t__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
+SWIGINTERN PyObject *_wrap_new_pvacuum_double_t__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
PyObject *resultobj = 0;
std::pair< double,double > *result = 0 ;
@@ -25663,7 +25663,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_new_pair_double_t__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_pvacuum_double_t__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
double arg1 ;
double arg2 ;
@@ -25676,12 +25676,12 @@ SWIGINTERN PyObject *_wrap_new_pair_double_t__SWIG_1(PyObject *SWIGUNUSEDPARM(se
if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
if (!SWIG_IsOK(ecode1)) {
- SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_pair_double_t" "', argument " "1"" of type '" "double""'");
+ SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_pvacuum_double_t" "', argument " "1"" of type '" "double""'");
}
arg1 = static_cast< double >(val1);
ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
if (!SWIG_IsOK(ecode2)) {
- SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_pair_double_t" "', argument " "2"" of type '" "double""'");
+ SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_pvacuum_double_t" "', argument " "2"" of type '" "double""'");
}
arg2 = static_cast< double >(val2);
result = (std::pair< double,double > *)new std::pair< double,double >(arg1,arg2);
@@ -25692,7 +25692,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_new_pair_double_t__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_pvacuum_double_t__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
std::pair< double,double > *arg1 = 0 ;
int res1 = SWIG_OLDOBJ ;
@@ -25703,10 +25703,10 @@ SWIGINTERN PyObject *_wrap_new_pair_double_t__SWIG_2(PyObject *SWIGUNUSEDPARM(se
std::pair< double,double > *ptr = (std::pair< double,double > *)0;
res1 = swig::asptr(swig_obj[0], &ptr);
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_pair_double_t" "', argument " "1"" of type '" "std::pair< double,double > const &""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_pvacuum_double_t" "', argument " "1"" of type '" "std::pair< double,double > const &""'");
}
if (!ptr) {
- SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_pair_double_t" "', argument " "1"" of type '" "std::pair< double,double > const &""'");
+ SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_pvacuum_double_t" "', argument " "1"" of type '" "std::pair< double,double > const &""'");
}
arg1 = ptr;
}
@@ -25720,23 +25720,23 @@ fail:
}
-SWIGINTERN PyObject *_wrap_new_pair_double_t(PyObject *self, PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_pvacuum_double_t(PyObject *self, PyObject *args) {
Py_ssize_t argc;
PyObject *argv[3] = {
0
};
- if (!(argc = SWIG_Python_UnpackTuple(args, "new_pair_double_t", 0, 2, argv))) SWIG_fail;
+ if (!(argc = SWIG_Python_UnpackTuple(args, "new_pvacuum_double_t", 0, 2, argv))) SWIG_fail;
--argc;
if (argc == 0) {
- return _wrap_new_pair_double_t__SWIG_0(self, argc, argv);
+ return _wrap_new_pvacuum_double_t__SWIG_0(self, argc, argv);
}
if (argc == 1) {
int _v;
int res = swig::asptr(argv[0], (std::pair< double,double >**)(0));
_v = SWIG_CheckState(res);
if (_v) {
- return _wrap_new_pair_double_t__SWIG_2(self, argc, argv);
+ return _wrap_new_pvacuum_double_t__SWIG_2(self, argc, argv);
}
}
if (argc == 2) {
@@ -25751,13 +25751,13 @@ SWIGINTERN PyObject *_wrap_new_pair_double_t(PyObject *self, PyObject *args) {
_v = SWIG_CheckState(res);
}
if (_v) {
- return _wrap_new_pair_double_t__SWIG_1(self, argc, argv);
+ return _wrap_new_pvacuum_double_t__SWIG_1(self, argc, argv);
}
}
}
fail:
- SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_pair_double_t'.\n"
+ SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_pvacuum_double_t'.\n"
" Possible C/C++ prototypes are:\n"
" std::pair< double,double >::pair()\n"
" std::pair< double,double >::pair(double,double)\n"
@@ -25766,7 +25766,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_pair_double_t_first_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_pvacuum_double_t_first_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
std::pair< double,double > *arg1 = (std::pair< double,double > *) 0 ;
double arg2 ;
@@ -25776,15 +25776,15 @@ SWIGINTERN PyObject *_wrap_pair_double_t_first_set(PyObject *SWIGUNUSEDPARM(self
int ecode2 = 0 ;
PyObject *swig_obj[2] ;
- if (!SWIG_Python_UnpackTuple(args, "pair_double_t_first_set", 2, 2, swig_obj)) SWIG_fail;
+ if (!SWIG_Python_UnpackTuple(args, "pvacuum_double_t_first_set", 2, 2, swig_obj)) SWIG_fail;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__pairT_double_double_t, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "pair_double_t_first_set" "', argument " "1"" of type '" "std::pair< double,double > *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "pvacuum_double_t_first_set" "', argument " "1"" of type '" "std::pair< double,double > *""'");
}
arg1 = reinterpret_cast< std::pair< double,double > * >(argp1);
ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
if (!SWIG_IsOK(ecode2)) {
- SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "pair_double_t_first_set" "', argument " "2"" of type '" "double""'");
+ SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "pvacuum_double_t_first_set" "', argument " "2"" of type '" "double""'");
}
arg2 = static_cast< double >(val2);
if (arg1) (arg1)->first = arg2;
@@ -25795,7 +25795,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_pair_double_t_first_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_pvacuum_double_t_first_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
std::pair< double,double > *arg1 = (std::pair< double,double > *) 0 ;
void *argp1 = 0 ;
@@ -25807,7 +25807,7 @@ SWIGINTERN PyObject *_wrap_pair_double_t_first_get(PyObject *SWIGUNUSEDPARM(self
swig_obj[0] = args;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__pairT_double_double_t, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "pair_double_t_first_get" "', argument " "1"" of type '" "std::pair< double,double > *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "pvacuum_double_t_first_get" "', argument " "1"" of type '" "std::pair< double,double > *""'");
}
arg1 = reinterpret_cast< std::pair< double,double > * >(argp1);
result = (double) ((arg1)->first);
@@ -25818,7 +25818,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_pair_double_t_second_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_pvacuum_double_t_second_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
std::pair< double,double > *arg1 = (std::pair< double,double > *) 0 ;
double arg2 ;
@@ -25828,15 +25828,15 @@ SWIGINTERN PyObject *_wrap_pair_double_t_second_set(PyObject *SWIGUNUSEDPARM(sel
int ecode2 = 0 ;
PyObject *swig_obj[2] ;
- if (!SWIG_Python_UnpackTuple(args, "pair_double_t_second_set", 2, 2, swig_obj)) SWIG_fail;
+ if (!SWIG_Python_UnpackTuple(args, "pvacuum_double_t_second_set", 2, 2, swig_obj)) SWIG_fail;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__pairT_double_double_t, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "pair_double_t_second_set" "', argument " "1"" of type '" "std::pair< double,double > *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "pvacuum_double_t_second_set" "', argument " "1"" of type '" "std::pair< double,double > *""'");
}
arg1 = reinterpret_cast< std::pair< double,double > * >(argp1);
ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
if (!SWIG_IsOK(ecode2)) {
- SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "pair_double_t_second_set" "', argument " "2"" of type '" "double""'");
+ SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "pvacuum_double_t_second_set" "', argument " "2"" of type '" "double""'");
}
arg2 = static_cast< double >(val2);
if (arg1) (arg1)->second = arg2;
@@ -25847,7 +25847,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_pair_double_t_second_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_pvacuum_double_t_second_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
std::pair< double,double > *arg1 = (std::pair< double,double > *) 0 ;
void *argp1 = 0 ;
@@ -25859,7 +25859,7 @@ SWIGINTERN PyObject *_wrap_pair_double_t_second_get(PyObject *SWIGUNUSEDPARM(sel
swig_obj[0] = args;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__pairT_double_double_t, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "pair_double_t_second_get" "', argument " "1"" of type '" "std::pair< double,double > *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "pvacuum_double_t_second_get" "', argument " "1"" of type '" "std::pair< double,double > *""'");
}
arg1 = reinterpret_cast< std::pair< double,double > * >(argp1);
result = (double) ((arg1)->second);
@@ -25870,7 +25870,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_delete_pair_double_t(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_pvacuum_double_t(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
std::pair< double,double > *arg1 = (std::pair< double,double > *) 0 ;
void *argp1 = 0 ;
@@ -25881,7 +25881,7 @@ SWIGINTERN PyObject *_wrap_delete_pair_double_t(PyObject *SWIGUNUSEDPARM(self),
swig_obj[0] = args;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__pairT_double_double_t, SWIG_POINTER_DISOWN | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_pair_double_t" "', argument " "1"" of type '" "std::pair< double,double > *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_pvacuum_double_t" "', argument " "1"" of type '" "std::pair< double,double > *""'");
}
arg1 = reinterpret_cast< std::pair< double,double > * >(argp1);
delete arg1;
@@ -25892,18 +25892,18 @@ fail:
}
-SWIGINTERN PyObject *pair_double_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *pvacuum_double_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_std__pairT_double_double_t, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
-SWIGINTERN PyObject *pair_double_t_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *pvacuum_double_t_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
return SWIG_Python_InitShadowInstance(args);
}
-SWIGINTERN PyObject *_wrap_vector_pair_double_t_iterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_pvacuum_double_t_iterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
PyObject **arg2 = (PyObject **) 0 ;
@@ -25917,7 +25917,7 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t_iterator(PyObject *SWIGUNUSEDPAR
swig_obj[0] = args;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t_iterator" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pvacuum_double_t_iterator" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'");
}
arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
result = (swig::SwigPyIterator *)std_vector_Sl_std_pair_Sl_double_Sc_double_Sg__Sg__iterator(arg1,arg2);
@@ -25928,7 +25928,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_vector_pair_double_t___nonzero__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_pvacuum_double_t___nonzero__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
void *argp1 = 0 ;
@@ -25940,7 +25940,7 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t___nonzero__(PyObject *SWIGUNUSED
swig_obj[0] = args;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t___nonzero__" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > const *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pvacuum_double_t___nonzero__" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > const *""'");
}
arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
result = (bool)std_vector_Sl_std_pair_Sl_double_Sc_double_Sg__Sg____nonzero__((std::vector< std::pair< double,double > > const *)arg1);
@@ -25951,7 +25951,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_vector_pair_double_t___bool__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_pvacuum_double_t___bool__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
void *argp1 = 0 ;
@@ -25963,7 +25963,7 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t___bool__(PyObject *SWIGUNUSEDPAR
swig_obj[0] = args;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t___bool__" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > const *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pvacuum_double_t___bool__" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > const *""'");
}
arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
result = (bool)std_vector_Sl_std_pair_Sl_double_Sc_double_Sg__Sg____bool__((std::vector< std::pair< double,double > > const *)arg1);
@@ -25974,7 +25974,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_vector_pair_double_t___len__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_pvacuum_double_t___len__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
void *argp1 = 0 ;
@@ -25986,7 +25986,7 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t___len__(PyObject *SWIGUNUSEDPARM
swig_obj[0] = args;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t___len__" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > const *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pvacuum_double_t___len__" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > const *""'");
}
arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
result = std_vector_Sl_std_pair_Sl_double_Sc_double_Sg__Sg____len__((std::vector< std::pair< double,double > > const *)arg1);
@@ -25997,7 +25997,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_vector_pair_double_t___getslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_pvacuum_double_t___getslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
std::vector< std::pair< double,double > >::difference_type arg2 ;
@@ -26011,20 +26011,20 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t___getslice__(PyObject *SWIGUNUSE
PyObject *swig_obj[3] ;
std::vector< std::pair< double,double >,std::allocator< std::pair< double,double > > > *result = 0 ;
- if (!SWIG_Python_UnpackTuple(args, "vector_pair_double_t___getslice__", 3, 3, swig_obj)) SWIG_fail;
+ if (!SWIG_Python_UnpackTuple(args, "vector_pvacuum_double_t___getslice__", 3, 3, swig_obj)) SWIG_fail;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t___getslice__" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pvacuum_double_t___getslice__" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'");
}
arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
if (!SWIG_IsOK(ecode2)) {
- SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_pair_double_t___getslice__" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::difference_type""'");
+ SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_pvacuum_double_t___getslice__" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::difference_type""'");
}
arg2 = static_cast< std::vector< std::pair< double,double > >::difference_type >(val2);
ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
if (!SWIG_IsOK(ecode3)) {
- SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_pair_double_t___getslice__" "', argument " "3"" of type '" "std::vector< std::pair< double,double > >::difference_type""'");
+ SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_pvacuum_double_t___getslice__" "', argument " "3"" of type '" "std::vector< std::pair< double,double > >::difference_type""'");
}
arg3 = static_cast< std::vector< std::pair< double,double > >::difference_type >(val3);
try {
@@ -26041,7 +26041,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_vector_pair_double_t___setslice____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_vector_pvacuum_double_t___setslice____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
std::vector< std::pair< double,double > >::difference_type arg2 ;
@@ -26056,17 +26056,17 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t___setslice____SWIG_0(PyObject *S
if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t___setslice__" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pvacuum_double_t___setslice__" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'");
}
arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
if (!SWIG_IsOK(ecode2)) {
- SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_pair_double_t___setslice__" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::difference_type""'");
+ SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_pvacuum_double_t___setslice__" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::difference_type""'");
}
arg2 = static_cast< std::vector< std::pair< double,double > >::difference_type >(val2);
ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
if (!SWIG_IsOK(ecode3)) {
- SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_pair_double_t___setslice__" "', argument " "3"" of type '" "std::vector< std::pair< double,double > >::difference_type""'");
+ SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_pvacuum_double_t___setslice__" "', argument " "3"" of type '" "std::vector< std::pair< double,double > >::difference_type""'");
}
arg3 = static_cast< std::vector< std::pair< double,double > >::difference_type >(val3);
try {
@@ -26083,7 +26083,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_vector_pair_double_t___setslice____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_vector_pvacuum_double_t___setslice____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
std::vector< std::pair< double,double > >::difference_type arg2 ;
@@ -26100,27 +26100,27 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t___setslice____SWIG_1(PyObject *S
if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t___setslice__" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pvacuum_double_t___setslice__" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'");
}
arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
if (!SWIG_IsOK(ecode2)) {
- SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_pair_double_t___setslice__" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::difference_type""'");
+ SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_pvacuum_double_t___setslice__" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::difference_type""'");
}
arg2 = static_cast< std::vector< std::pair< double,double > >::difference_type >(val2);
ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
if (!SWIG_IsOK(ecode3)) {
- SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_pair_double_t___setslice__" "', argument " "3"" of type '" "std::vector< std::pair< double,double > >::difference_type""'");
+ SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_pvacuum_double_t___setslice__" "', argument " "3"" of type '" "std::vector< std::pair< double,double > >::difference_type""'");
}
arg3 = static_cast< std::vector< std::pair< double,double > >::difference_type >(val3);
{
std::vector< std::pair< double,double >,std::allocator< std::pair< double,double > > > *ptr = (std::vector< std::pair< double,double >,std::allocator< std::pair< double,double > > > *)0;
res4 = swig::asptr(swig_obj[3], &ptr);
if (!SWIG_IsOK(res4)) {
- SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "vector_pair_double_t___setslice__" "', argument " "4"" of type '" "std::vector< std::pair< double,double >,std::allocator< std::pair< double,double > > > const &""'");
+ SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "vector_pvacuum_double_t___setslice__" "', argument " "4"" of type '" "std::vector< std::pair< double,double >,std::allocator< std::pair< double,double > > > const &""'");
}
if (!ptr) {
- SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "vector_pair_double_t___setslice__" "', argument " "4"" of type '" "std::vector< std::pair< double,double >,std::allocator< std::pair< double,double > > > const &""'");
+ SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "vector_pvacuum_double_t___setslice__" "', argument " "4"" of type '" "std::vector< std::pair< double,double >,std::allocator< std::pair< double,double > > > const &""'");
}
arg4 = ptr;
}
@@ -26140,13 +26140,13 @@ fail:
}
-SWIGINTERN PyObject *_wrap_vector_pair_double_t___setslice__(PyObject *self, PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_pvacuum_double_t___setslice__(PyObject *self, PyObject *args) {
Py_ssize_t argc;
PyObject *argv[5] = {
0
};
- if (!(argc = SWIG_Python_UnpackTuple(args, "vector_pair_double_t___setslice__", 0, 4, argv))) SWIG_fail;
+ if (!(argc = SWIG_Python_UnpackTuple(args, "vector_pvacuum_double_t___setslice__", 0, 4, argv))) SWIG_fail;
--argc;
if (argc == 3) {
int _v;
@@ -26163,7 +26163,7 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t___setslice__(PyObject *self, PyO
_v = SWIG_CheckState(res);
}
if (_v) {
- return _wrap_vector_pair_double_t___setslice____SWIG_0(self, argc, argv);
+ return _wrap_vector_pvacuum_double_t___setslice____SWIG_0(self, argc, argv);
}
}
}
@@ -26186,7 +26186,7 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t___setslice__(PyObject *self, PyO
int res = swig::asptr(argv[3], (std::vector< std::pair< double,double >,std::allocator< std::pair< double,double > > >**)(0));
_v = SWIG_CheckState(res);
if (_v) {
- return _wrap_vector_pair_double_t___setslice____SWIG_1(self, argc, argv);
+ return _wrap_vector_pvacuum_double_t___setslice____SWIG_1(self, argc, argv);
}
}
}
@@ -26194,7 +26194,7 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t___setslice__(PyObject *self, PyO
}
fail:
- SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_pair_double_t___setslice__'.\n"
+ SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_pvacuum_double_t___setslice__'.\n"
" Possible C/C++ prototypes are:\n"
" std::vector< std::pair< double,double > >::__setslice__(std::vector< std::pair< double,double > >::difference_type,std::vector< std::pair< double,double > >::difference_type)\n"
" std::vector< std::pair< double,double > >::__setslice__(std::vector< std::pair< double,double > >::difference_type,std::vector< std::pair< double,double > >::difference_type,std::vector< std::pair< double,double >,std::allocator< std::pair< double,double > > > const &)\n");
@@ -26202,7 +26202,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_vector_pair_double_t___delslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_pvacuum_double_t___delslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
std::vector< std::pair< double,double > >::difference_type arg2 ;
@@ -26215,20 +26215,20 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t___delslice__(PyObject *SWIGUNUSE
int ecode3 = 0 ;
PyObject *swig_obj[3] ;
- if (!SWIG_Python_UnpackTuple(args, "vector_pair_double_t___delslice__", 3, 3, swig_obj)) SWIG_fail;
+ if (!SWIG_Python_UnpackTuple(args, "vector_pvacuum_double_t___delslice__", 3, 3, swig_obj)) SWIG_fail;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t___delslice__" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pvacuum_double_t___delslice__" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'");
}
arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
if (!SWIG_IsOK(ecode2)) {
- SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_pair_double_t___delslice__" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::difference_type""'");
+ SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_pvacuum_double_t___delslice__" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::difference_type""'");
}
arg2 = static_cast< std::vector< std::pair< double,double > >::difference_type >(val2);
ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
if (!SWIG_IsOK(ecode3)) {
- SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_pair_double_t___delslice__" "', argument " "3"" of type '" "std::vector< std::pair< double,double > >::difference_type""'");
+ SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_pvacuum_double_t___delslice__" "', argument " "3"" of type '" "std::vector< std::pair< double,double > >::difference_type""'");
}
arg3 = static_cast< std::vector< std::pair< double,double > >::difference_type >(val3);
try {
@@ -26245,7 +26245,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_vector_pair_double_t___delitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_vector_pvacuum_double_t___delitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
std::vector< std::pair< double,double > >::difference_type arg2 ;
@@ -26257,12 +26257,12 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t___delitem____SWIG_0(PyObject *SW
if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t___delitem__" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pvacuum_double_t___delitem__" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'");
}
arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
if (!SWIG_IsOK(ecode2)) {
- SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_pair_double_t___delitem__" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::difference_type""'");
+ SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_pvacuum_double_t___delitem__" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::difference_type""'");
}
arg2 = static_cast< std::vector< std::pair< double,double > >::difference_type >(val2);
try {
@@ -26279,7 +26279,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_vector_pair_double_t___getitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_vector_pvacuum_double_t___getitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
PySliceObject *arg2 = (PySliceObject *) 0 ;
@@ -26290,12 +26290,12 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t___getitem____SWIG_0(PyObject *SW
if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t___getitem__" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pvacuum_double_t___getitem__" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'");
}
arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
{
if (!PySlice_Check(swig_obj[1])) {
- SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_pair_double_t___getitem__" "', argument " "2"" of type '" "PySliceObject *""'");
+ SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_pvacuum_double_t___getitem__" "', argument " "2"" of type '" "PySliceObject *""'");
}
arg2 = (PySliceObject *) swig_obj[1];
}
@@ -26313,7 +26313,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_vector_pair_double_t___setitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_vector_pvacuum_double_t___setitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
PySliceObject *arg2 = (PySliceObject *) 0 ;
@@ -26325,12 +26325,12 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t___setitem____SWIG_0(PyObject *SW
if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t___setitem__" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pvacuum_double_t___setitem__" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'");
}
arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
{
if (!PySlice_Check(swig_obj[1])) {
- SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_pair_double_t___setitem__" "', argument " "2"" of type '" "PySliceObject *""'");
+ SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_pvacuum_double_t___setitem__" "', argument " "2"" of type '" "PySliceObject *""'");
}
arg2 = (PySliceObject *) swig_obj[1];
}
@@ -26338,10 +26338,10 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t___setitem____SWIG_0(PyObject *SW
std::vector< std::pair< double,double >,std::allocator< std::pair< double,double > > > *ptr = (std::vector< std::pair< double,double >,std::allocator< std::pair< double,double > > > *)0;
res3 = swig::asptr(swig_obj[2], &ptr);
if (!SWIG_IsOK(res3)) {
- SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vector_pair_double_t___setitem__" "', argument " "3"" of type '" "std::vector< std::pair< double,double >,std::allocator< std::pair< double,double > > > const &""'");
+ SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vector_pvacuum_double_t___setitem__" "', argument " "3"" of type '" "std::vector< std::pair< double,double >,std::allocator< std::pair< double,double > > > const &""'");
}
if (!ptr) {
- SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "vector_pair_double_t___setitem__" "', argument " "3"" of type '" "std::vector< std::pair< double,double >,std::allocator< std::pair< double,double > > > const &""'");
+ SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "vector_pvacuum_double_t___setitem__" "', argument " "3"" of type '" "std::vector< std::pair< double,double >,std::allocator< std::pair< double,double > > > const &""'");
}
arg3 = ptr;
}
@@ -26361,7 +26361,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_vector_pair_double_t___setitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_vector_pvacuum_double_t___setitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
PySliceObject *arg2 = (PySliceObject *) 0 ;
@@ -26371,12 +26371,12 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t___setitem____SWIG_1(PyObject *SW
if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t___setitem__" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pvacuum_double_t___setitem__" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'");
}
arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
{
if (!PySlice_Check(swig_obj[1])) {
- SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_pair_double_t___setitem__" "', argument " "2"" of type '" "PySliceObject *""'");
+ SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_pvacuum_double_t___setitem__" "', argument " "2"" of type '" "PySliceObject *""'");
}
arg2 = (PySliceObject *) swig_obj[1];
}
@@ -26394,7 +26394,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_vector_pair_double_t___delitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_vector_pvacuum_double_t___delitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
PySliceObject *arg2 = (PySliceObject *) 0 ;
@@ -26404,12 +26404,12 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t___delitem____SWIG_1(PyObject *SW
if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t___delitem__" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pvacuum_double_t___delitem__" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'");
}
arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
{
if (!PySlice_Check(swig_obj[1])) {
- SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_pair_double_t___delitem__" "', argument " "2"" of type '" "PySliceObject *""'");
+ SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_pvacuum_double_t___delitem__" "', argument " "2"" of type '" "PySliceObject *""'");
}
arg2 = (PySliceObject *) swig_obj[1];
}
@@ -26427,13 +26427,13 @@ fail:
}
-SWIGINTERN PyObject *_wrap_vector_pair_double_t___delitem__(PyObject *self, PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_pvacuum_double_t___delitem__(PyObject *self, PyObject *args) {
Py_ssize_t argc;
PyObject *argv[3] = {
0
};
- if (!(argc = SWIG_Python_UnpackTuple(args, "vector_pair_double_t___delitem__", 0, 2, argv))) SWIG_fail;
+ if (!(argc = SWIG_Python_UnpackTuple(args, "vector_pvacuum_double_t___delitem__", 0, 2, argv))) SWIG_fail;
--argc;
if (argc == 2) {
int _v;
@@ -26444,7 +26444,7 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t___delitem__(PyObject *self, PyOb
_v = PySlice_Check(argv[1]);
}
if (_v) {
- return _wrap_vector_pair_double_t___delitem____SWIG_1(self, argc, argv);
+ return _wrap_vector_pvacuum_double_t___delitem____SWIG_1(self, argc, argv);
}
}
}
@@ -26458,13 +26458,13 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t___delitem__(PyObject *self, PyOb
_v = SWIG_CheckState(res);
}
if (_v) {
- return _wrap_vector_pair_double_t___delitem____SWIG_0(self, argc, argv);
+ return _wrap_vector_pvacuum_double_t___delitem____SWIG_0(self, argc, argv);
}
}
}
fail:
- SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_pair_double_t___delitem__'.\n"
+ SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_pvacuum_double_t___delitem__'.\n"
" Possible C/C++ prototypes are:\n"
" std::vector< std::pair< double,double > >::__delitem__(std::vector< std::pair< double,double > >::difference_type)\n"
" std::vector< std::pair< double,double > >::__delitem__(PySliceObject *)\n");
@@ -26472,7 +26472,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_vector_pair_double_t___getitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_vector_pvacuum_double_t___getitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
std::vector< std::pair< double,double > >::difference_type arg2 ;
@@ -26485,12 +26485,12 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t___getitem____SWIG_1(PyObject *SW
if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t___getitem__" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > const *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pvacuum_double_t___getitem__" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > const *""'");
}
arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
if (!SWIG_IsOK(ecode2)) {
- SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_pair_double_t___getitem__" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::difference_type""'");
+ SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_pvacuum_double_t___getitem__" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::difference_type""'");
}
arg2 = static_cast< std::vector< std::pair< double,double > >::difference_type >(val2);
try {
@@ -26506,13 +26506,13 @@ fail:
}
-SWIGINTERN PyObject *_wrap_vector_pair_double_t___getitem__(PyObject *self, PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_pvacuum_double_t___getitem__(PyObject *self, PyObject *args) {
Py_ssize_t argc;
PyObject *argv[3] = {
0
};
- if (!(argc = SWIG_Python_UnpackTuple(args, "vector_pair_double_t___getitem__", 0, 2, argv))) SWIG_fail;
+ if (!(argc = SWIG_Python_UnpackTuple(args, "vector_pvacuum_double_t___getitem__", 0, 2, argv))) SWIG_fail;
--argc;
if (argc == 2) {
int _v;
@@ -26523,7 +26523,7 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t___getitem__(PyObject *self, PyOb
_v = PySlice_Check(argv[1]);
}
if (_v) {
- return _wrap_vector_pair_double_t___getitem____SWIG_0(self, argc, argv);
+ return _wrap_vector_pvacuum_double_t___getitem____SWIG_0(self, argc, argv);
}
}
}
@@ -26537,13 +26537,13 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t___getitem__(PyObject *self, PyOb
_v = SWIG_CheckState(res);
}
if (_v) {
- return _wrap_vector_pair_double_t___getitem____SWIG_1(self, argc, argv);
+ return _wrap_vector_pvacuum_double_t___getitem____SWIG_1(self, argc, argv);
}
}
}
fail:
- SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_pair_double_t___getitem__'.\n"
+ SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_pvacuum_double_t___getitem__'.\n"
" Possible C/C++ prototypes are:\n"
" std::vector< std::pair< double,double > >::__getitem__(PySliceObject *)\n"
" std::vector< std::pair< double,double > >::__getitem__(std::vector< std::pair< double,double > >::difference_type) const\n");
@@ -26551,7 +26551,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_vector_pair_double_t___setitem____SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_vector_pvacuum_double_t___setitem____SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
std::vector< std::pair< double,double > >::difference_type arg2 ;
@@ -26565,22 +26565,22 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t___setitem____SWIG_2(PyObject *SW
if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t___setitem__" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pvacuum_double_t___setitem__" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'");
}
arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
if (!SWIG_IsOK(ecode2)) {
- SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_pair_double_t___setitem__" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::difference_type""'");
+ SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_pvacuum_double_t___setitem__" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::difference_type""'");
}
arg2 = static_cast< std::vector< std::pair< double,double > >::difference_type >(val2);
{
std::pair< double,double > *ptr = (std::pair< double,double > *)0;
res3 = swig::asptr(swig_obj[2], &ptr);
if (!SWIG_IsOK(res3)) {
- SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vector_pair_double_t___setitem__" "', argument " "3"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'");
+ SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vector_pvacuum_double_t___setitem__" "', argument " "3"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'");
}
if (!ptr) {
- SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "vector_pair_double_t___setitem__" "', argument " "3"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'");
+ SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "vector_pvacuum_double_t___setitem__" "', argument " "3"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'");
}
arg3 = ptr;
}
@@ -26598,13 +26598,13 @@ fail:
}
-SWIGINTERN PyObject *_wrap_vector_pair_double_t___setitem__(PyObject *self, PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_pvacuum_double_t___setitem__(PyObject *self, PyObject *args) {
Py_ssize_t argc;
PyObject *argv[4] = {
0
};
- if (!(argc = SWIG_Python_UnpackTuple(args, "vector_pair_double_t___setitem__", 0, 3, argv))) SWIG_fail;
+ if (!(argc = SWIG_Python_UnpackTuple(args, "vector_pvacuum_double_t___setitem__", 0, 3, argv))) SWIG_fail;
--argc;
if (argc == 2) {
int _v;
@@ -26615,7 +26615,7 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t___setitem__(PyObject *self, PyOb
_v = PySlice_Check(argv[1]);
}
if (_v) {
- return _wrap_vector_pair_double_t___setitem____SWIG_1(self, argc, argv);
+ return _wrap_vector_pvacuum_double_t___setitem____SWIG_1(self, argc, argv);
}
}
}
@@ -26631,7 +26631,7 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t___setitem__(PyObject *self, PyOb
int res = swig::asptr(argv[2], (std::vector< std::pair< double,double >,std::allocator< std::pair< double,double > > >**)(0));
_v = SWIG_CheckState(res);
if (_v) {
- return _wrap_vector_pair_double_t___setitem____SWIG_0(self, argc, argv);
+ return _wrap_vector_pvacuum_double_t___setitem____SWIG_0(self, argc, argv);
}
}
}
@@ -26649,14 +26649,14 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t___setitem__(PyObject *self, PyOb
int res = swig::asptr(argv[2], (std::pair< double,double >**)(0));
_v = SWIG_CheckState(res);
if (_v) {
- return _wrap_vector_pair_double_t___setitem____SWIG_2(self, argc, argv);
+ return _wrap_vector_pvacuum_double_t___setitem____SWIG_2(self, argc, argv);
}
}
}
}
fail:
- SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_pair_double_t___setitem__'.\n"
+ SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_pvacuum_double_t___setitem__'.\n"
" Possible C/C++ prototypes are:\n"
" std::vector< std::pair< double,double > >::__setitem__(PySliceObject *,std::vector< std::pair< double,double >,std::allocator< std::pair< double,double > > > const &)\n"
" std::vector< std::pair< double,double > >::__setitem__(PySliceObject *)\n"
@@ -26665,7 +26665,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_vector_pair_double_t_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_pvacuum_double_t_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
void *argp1 = 0 ;
@@ -26677,7 +26677,7 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t_pop(PyObject *SWIGUNUSEDPARM(sel
swig_obj[0] = args;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t_pop" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pvacuum_double_t_pop" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'");
}
arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
try {
@@ -26692,7 +26692,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_vector_pair_double_t_append(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_pvacuum_double_t_append(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
std::vector< std::pair< double,double > >::value_type *arg2 = 0 ;
@@ -26701,20 +26701,20 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t_append(PyObject *SWIGUNUSEDPARM(
int res2 = SWIG_OLDOBJ ;
PyObject *swig_obj[2] ;
- if (!SWIG_Python_UnpackTuple(args, "vector_pair_double_t_append", 2, 2, swig_obj)) SWIG_fail;
+ if (!SWIG_Python_UnpackTuple(args, "vector_pvacuum_double_t_append", 2, 2, swig_obj)) SWIG_fail;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t_append" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pvacuum_double_t_append" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'");
}
arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
{
std::pair< double,double > *ptr = (std::pair< double,double > *)0;
res2 = swig::asptr(swig_obj[1], &ptr);
if (!SWIG_IsOK(res2)) {
- SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "vector_pair_double_t_append" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'");
+ SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "vector_pvacuum_double_t_append" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'");
}
if (!ptr) {
- SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "vector_pair_double_t_append" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'");
+ SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "vector_pvacuum_double_t_append" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'");
}
arg2 = ptr;
}
@@ -26728,7 +26728,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_new_vector_pair_double_t__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
+SWIGINTERN PyObject *_wrap_new_vector_pvacuum_double_t__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
PyObject *resultobj = 0;
std::vector< std::pair< double,double > > *result = 0 ;
@@ -26741,7 +26741,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_new_vector_pair_double_t__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_vector_pvacuum_double_t__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
std::vector< std::pair< double,double > > *arg1 = 0 ;
int res1 = SWIG_OLDOBJ ;
@@ -26752,10 +26752,10 @@ SWIGINTERN PyObject *_wrap_new_vector_pair_double_t__SWIG_1(PyObject *SWIGUNUSED
std::vector< std::pair< double,double >,std::allocator< std::pair< double,double > > > *ptr = (std::vector< std::pair< double,double >,std::allocator< std::pair< double,double > > > *)0;
res1 = swig::asptr(swig_obj[0], &ptr);
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_vector_pair_double_t" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > const &""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_vector_pvacuum_double_t" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > const &""'");
}
if (!ptr) {
- SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_vector_pair_double_t" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > const &""'");
+ SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_vector_pvacuum_double_t" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > const &""'");
}
arg1 = ptr;
}
@@ -26769,7 +26769,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_vector_pair_double_t_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_pvacuum_double_t_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
void *argp1 = 0 ;
@@ -26781,7 +26781,7 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t_empty(PyObject *SWIGUNUSEDPARM(s
swig_obj[0] = args;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t_empty" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > const *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pvacuum_double_t_empty" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > const *""'");
}
arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
result = (bool)((std::vector< std::pair< double,double > > const *)arg1)->empty();
@@ -26792,7 +26792,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_vector_pair_double_t_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_pvacuum_double_t_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
void *argp1 = 0 ;
@@ -26804,7 +26804,7 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t_size(PyObject *SWIGUNUSEDPARM(se
swig_obj[0] = args;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t_size" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > const *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pvacuum_double_t_size" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > const *""'");
}
arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
result = ((std::vector< std::pair< double,double > > const *)arg1)->size();
@@ -26815,7 +26815,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_vector_pair_double_t_swap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_pvacuum_double_t_swap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
std::vector< std::pair< double,double > > *arg2 = 0 ;
@@ -26825,18 +26825,18 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t_swap(PyObject *SWIGUNUSEDPARM(se
int res2 = 0 ;
PyObject *swig_obj[2] ;
- if (!SWIG_Python_UnpackTuple(args, "vector_pair_double_t_swap", 2, 2, swig_obj)) SWIG_fail;
+ if (!SWIG_Python_UnpackTuple(args, "vector_pvacuum_double_t_swap", 2, 2, swig_obj)) SWIG_fail;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t_swap" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pvacuum_double_t_swap" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'");
}
arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 );
if (!SWIG_IsOK(res2)) {
- SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "vector_pair_double_t_swap" "', argument " "2"" of type '" "std::vector< std::pair< double,double > > &""'");
+ SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "vector_pvacuum_double_t_swap" "', argument " "2"" of type '" "std::vector< std::pair< double,double > > &""'");
}
if (!argp2) {
- SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "vector_pair_double_t_swap" "', argument " "2"" of type '" "std::vector< std::pair< double,double > > &""'");
+ SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "vector_pvacuum_double_t_swap" "', argument " "2"" of type '" "std::vector< std::pair< double,double > > &""'");
}
arg2 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp2);
(arg1)->swap(*arg2);
@@ -26847,7 +26847,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_vector_pair_double_t_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_pvacuum_double_t_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
void *argp1 = 0 ;
@@ -26859,7 +26859,7 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t_begin(PyObject *SWIGUNUSEDPARM(s
swig_obj[0] = args;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t_begin" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pvacuum_double_t_begin" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'");
}
arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
result = (arg1)->begin();
@@ -26871,7 +26871,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_vector_pair_double_t_end(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_pvacuum_double_t_end(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
void *argp1 = 0 ;
@@ -26883,7 +26883,7 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t_end(PyObject *SWIGUNUSEDPARM(sel
swig_obj[0] = args;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t_end" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pvacuum_double_t_end" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'");
}
arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
result = (arg1)->end();
@@ -26895,7 +26895,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_vector_pair_double_t_rbegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_pvacuum_double_t_rbegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
void *argp1 = 0 ;
@@ -26907,7 +26907,7 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t_rbegin(PyObject *SWIGUNUSEDPARM(
swig_obj[0] = args;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t_rbegin" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pvacuum_double_t_rbegin" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'");
}
arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
result = (arg1)->rbegin();
@@ -26919,7 +26919,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_vector_pair_double_t_rend(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_pvacuum_double_t_rend(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
void *argp1 = 0 ;
@@ -26931,7 +26931,7 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t_rend(PyObject *SWIGUNUSEDPARM(se
swig_obj[0] = args;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t_rend" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pvacuum_double_t_rend" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'");
}
arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
result = (arg1)->rend();
@@ -26943,7 +26943,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_vector_pair_double_t_clear(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_pvacuum_double_t_clear(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
void *argp1 = 0 ;
@@ -26954,7 +26954,7 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t_clear(PyObject *SWIGUNUSEDPARM(s
swig_obj[0] = args;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t_clear" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pvacuum_double_t_clear" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'");
}
arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
(arg1)->clear();
@@ -26965,7 +26965,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_vector_pair_double_t_get_allocator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_pvacuum_double_t_get_allocator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
void *argp1 = 0 ;
@@ -26977,7 +26977,7 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t_get_allocator(PyObject *SWIGUNUS
swig_obj[0] = args;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t_get_allocator" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > const *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pvacuum_double_t_get_allocator" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > const *""'");
}
arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
result = ((std::vector< std::pair< double,double > > const *)arg1)->get_allocator();
@@ -26988,7 +26988,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_new_vector_pair_double_t__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_vector_pvacuum_double_t__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
std::vector< std::pair< double,double > >::size_type arg1 ;
size_t val1 ;
@@ -26998,7 +26998,7 @@ SWIGINTERN PyObject *_wrap_new_vector_pair_double_t__SWIG_2(PyObject *SWIGUNUSED
if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
ecode1 = SWIG_AsVal_size_t(swig_obj[0], &val1);
if (!SWIG_IsOK(ecode1)) {
- SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_vector_pair_double_t" "', argument " "1"" of type '" "std::vector< std::pair< double,double > >::size_type""'");
+ SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_vector_pvacuum_double_t" "', argument " "1"" of type '" "std::vector< std::pair< double,double > >::size_type""'");
}
arg1 = static_cast< std::vector< std::pair< double,double > >::size_type >(val1);
result = (std::vector< std::pair< double,double > > *)new std::vector< std::pair< double,double > >(arg1);
@@ -27009,7 +27009,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_vector_pair_double_t_pop_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_pvacuum_double_t_pop_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
void *argp1 = 0 ;
@@ -27020,7 +27020,7 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t_pop_back(PyObject *SWIGUNUSEDPAR
swig_obj[0] = args;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t_pop_back" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pvacuum_double_t_pop_back" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'");
}
arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
(arg1)->pop_back();
@@ -27031,7 +27031,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_vector_pair_double_t_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_vector_pvacuum_double_t_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
std::vector< std::pair< double,double > >::size_type arg2 ;
@@ -27043,12 +27043,12 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t_resize__SWIG_0(PyObject *SWIGUNU
if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t_resize" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pvacuum_double_t_resize" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'");
}
arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
if (!SWIG_IsOK(ecode2)) {
- SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_pair_double_t_resize" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::size_type""'");
+ SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_pvacuum_double_t_resize" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::size_type""'");
}
arg2 = static_cast< std::vector< std::pair< double,double > >::size_type >(val2);
(arg1)->resize(arg2);
@@ -27059,7 +27059,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_vector_pair_double_t_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_vector_pvacuum_double_t_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
std::vector< std::pair< double,double > >::iterator arg2 ;
@@ -27072,18 +27072,18 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t_erase__SWIG_0(PyObject *SWIGUNUS
if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t_erase" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pvacuum_double_t_erase" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'");
}
arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
if (!SWIG_IsOK(res2) || !iter2) {
- SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_pair_double_t_erase" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::iterator""'");
+ SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_pvacuum_double_t_erase" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::iterator""'");
} else {
swig::SwigPyIterator_T<std::vector< std::pair< double,double > >::iterator > *iter_t = dynamic_cast<swig::SwigPyIterator_T<std::vector< std::pair< double,double > >::iterator > *>(iter2);
if (iter_t) {
arg2 = iter_t->get_current();
} else {
- SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_pair_double_t_erase" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::iterator""'");
+ SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_pvacuum_double_t_erase" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::iterator""'");
}
}
result = std_vector_Sl_std_pair_Sl_double_Sc_double_Sg__Sg__erase__SWIG_0(arg1,arg2);
@@ -27095,7 +27095,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_vector_pair_double_t_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_vector_pvacuum_double_t_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
std::vector< std::pair< double,double > >::iterator arg2 ;
@@ -27111,29 +27111,29 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t_erase__SWIG_1(PyObject *SWIGUNUS
if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t_erase" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pvacuum_double_t_erase" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'");
}
arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
if (!SWIG_IsOK(res2) || !iter2) {
- SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_pair_double_t_erase" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::iterator""'");
+ SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_pvacuum_double_t_erase" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::iterator""'");
} else {
swig::SwigPyIterator_T<std::vector< std::pair< double,double > >::iterator > *iter_t = dynamic_cast<swig::SwigPyIterator_T<std::vector< std::pair< double,double > >::iterator > *>(iter2);
if (iter_t) {
arg2 = iter_t->get_current();
} else {
- SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_pair_double_t_erase" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::iterator""'");
+ SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_pvacuum_double_t_erase" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::iterator""'");
}
}
res3 = SWIG_ConvertPtr(swig_obj[2], SWIG_as_voidptrptr(&iter3), swig::SwigPyIterator::descriptor(), 0);
if (!SWIG_IsOK(res3) || !iter3) {
- SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_pair_double_t_erase" "', argument " "3"" of type '" "std::vector< std::pair< double,double > >::iterator""'");
+ SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_pvacuum_double_t_erase" "', argument " "3"" of type '" "std::vector< std::pair< double,double > >::iterator""'");
} else {
swig::SwigPyIterator_T<std::vector< std::pair< double,double > >::iterator > *iter_t = dynamic_cast<swig::SwigPyIterator_T<std::vector< std::pair< double,double > >::iterator > *>(iter3);
if (iter_t) {
arg3 = iter_t->get_current();
} else {
- SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_pair_double_t_erase" "', argument " "3"" of type '" "std::vector< std::pair< double,double > >::iterator""'");
+ SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_pvacuum_double_t_erase" "', argument " "3"" of type '" "std::vector< std::pair< double,double > >::iterator""'");
}
}
result = std_vector_Sl_std_pair_Sl_double_Sc_double_Sg__Sg__erase__SWIG_1(arg1,arg2,arg3);
@@ -27145,13 +27145,13 @@ fail:
}
-SWIGINTERN PyObject *_wrap_vector_pair_double_t_erase(PyObject *self, PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_pvacuum_double_t_erase(PyObject *self, PyObject *args) {
Py_ssize_t argc;
PyObject *argv[4] = {
0
};
- if (!(argc = SWIG_Python_UnpackTuple(args, "vector_pair_double_t_erase", 0, 3, argv))) SWIG_fail;
+ if (!(argc = SWIG_Python_UnpackTuple(args, "vector_pvacuum_double_t_erase", 0, 3, argv))) SWIG_fail;
--argc;
if (argc == 2) {
int _v;
@@ -27162,7 +27162,7 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t_erase(PyObject *self, PyObject *
int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::SwigPyIterator::descriptor(), 0);
_v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::SwigPyIterator_T<std::vector< std::pair< double,double > >::iterator > *>(iter) != 0));
if (_v) {
- return _wrap_vector_pair_double_t_erase__SWIG_0(self, argc, argv);
+ return _wrap_vector_pvacuum_double_t_erase__SWIG_0(self, argc, argv);
}
}
}
@@ -27179,14 +27179,14 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t_erase(PyObject *self, PyObject *
int res = SWIG_ConvertPtr(argv[2], SWIG_as_voidptrptr(&iter), swig::SwigPyIterator::descriptor(), 0);
_v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::SwigPyIterator_T<std::vector< std::pair< double,double > >::iterator > *>(iter) != 0));
if (_v) {
- return _wrap_vector_pair_double_t_erase__SWIG_1(self, argc, argv);
+ return _wrap_vector_pvacuum_double_t_erase__SWIG_1(self, argc, argv);
}
}
}
}
fail:
- SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_pair_double_t_erase'.\n"
+ SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_pvacuum_double_t_erase'.\n"
" Possible C/C++ prototypes are:\n"
" std::vector< std::pair< double,double > >::erase(std::vector< std::pair< double,double > >::iterator)\n"
" std::vector< std::pair< double,double > >::erase(std::vector< std::pair< double,double > >::iterator,std::vector< std::pair< double,double > >::iterator)\n");
@@ -27194,7 +27194,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_new_vector_pair_double_t__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_vector_pvacuum_double_t__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
std::vector< std::pair< double,double > >::size_type arg1 ;
std::vector< std::pair< double,double > >::value_type *arg2 = 0 ;
@@ -27206,17 +27206,17 @@ SWIGINTERN PyObject *_wrap_new_vector_pair_double_t__SWIG_3(PyObject *SWIGUNUSED
if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
ecode1 = SWIG_AsVal_size_t(swig_obj[0], &val1);
if (!SWIG_IsOK(ecode1)) {
- SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_vector_pair_double_t" "', argument " "1"" of type '" "std::vector< std::pair< double,double > >::size_type""'");
+ SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_vector_pvacuum_double_t" "', argument " "1"" of type '" "std::vector< std::pair< double,double > >::size_type""'");
}
arg1 = static_cast< std::vector< std::pair< double,double > >::size_type >(val1);
{
std::pair< double,double > *ptr = (std::pair< double,double > *)0;
res2 = swig::asptr(swig_obj[1], &ptr);
if (!SWIG_IsOK(res2)) {
- SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_vector_pair_double_t" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'");
+ SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_vector_pvacuum_double_t" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'");
}
if (!ptr) {
- SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_vector_pair_double_t" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'");
+ SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_vector_pvacuum_double_t" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'");
}
arg2 = ptr;
}
@@ -27230,16 +27230,16 @@ fail:
}
-SWIGINTERN PyObject *_wrap_new_vector_pair_double_t(PyObject *self, PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_vector_pvacuum_double_t(PyObject *self, PyObject *args) {
Py_ssize_t argc;
PyObject *argv[3] = {
0
};
- if (!(argc = SWIG_Python_UnpackTuple(args, "new_vector_pair_double_t", 0, 2, argv))) SWIG_fail;
+ if (!(argc = SWIG_Python_UnpackTuple(args, "new_vector_pvacuum_double_t", 0, 2, argv))) SWIG_fail;
--argc;
if (argc == 0) {
- return _wrap_new_vector_pair_double_t__SWIG_0(self, argc, argv);
+ return _wrap_new_vector_pvacuum_double_t__SWIG_0(self, argc, argv);
}
if (argc == 1) {
int _v;
@@ -27248,7 +27248,7 @@ SWIGINTERN PyObject *_wrap_new_vector_pair_double_t(PyObject *self, PyObject *ar
_v = SWIG_CheckState(res);
}
if (_v) {
- return _wrap_new_vector_pair_double_t__SWIG_2(self, argc, argv);
+ return _wrap_new_vector_pvacuum_double_t__SWIG_2(self, argc, argv);
}
}
if (argc == 1) {
@@ -27256,7 +27256,7 @@ SWIGINTERN PyObject *_wrap_new_vector_pair_double_t(PyObject *self, PyObject *ar
int res = swig::asptr(argv[0], (std::vector< std::pair< double,double >,std::allocator< std::pair< double,double > > >**)(0));
_v = SWIG_CheckState(res);
if (_v) {
- return _wrap_new_vector_pair_double_t__SWIG_1(self, argc, argv);
+ return _wrap_new_vector_pvacuum_double_t__SWIG_1(self, argc, argv);
}
}
if (argc == 2) {
@@ -27269,13 +27269,13 @@ SWIGINTERN PyObject *_wrap_new_vector_pair_double_t(PyObject *self, PyObject *ar
int res = swig::asptr(argv[1], (std::pair< double,double >**)(0));
_v = SWIG_CheckState(res);
if (_v) {
- return _wrap_new_vector_pair_double_t__SWIG_3(self, argc, argv);
+ return _wrap_new_vector_pvacuum_double_t__SWIG_3(self, argc, argv);
}
}
}
fail:
- SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_vector_pair_double_t'.\n"
+ SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_vector_pvacuum_double_t'.\n"
" Possible C/C++ prototypes are:\n"
" std::vector< std::pair< double,double > >::vector()\n"
" std::vector< std::pair< double,double > >::vector(std::vector< std::pair< double,double > > const &)\n"
@@ -27285,7 +27285,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_vector_pair_double_t_push_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_pvacuum_double_t_push_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
std::vector< std::pair< double,double > >::value_type *arg2 = 0 ;
@@ -27294,20 +27294,20 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t_push_back(PyObject *SWIGUNUSEDPA
int res2 = SWIG_OLDOBJ ;
PyObject *swig_obj[2] ;
- if (!SWIG_Python_UnpackTuple(args, "vector_pair_double_t_push_back", 2, 2, swig_obj)) SWIG_fail;
+ if (!SWIG_Python_UnpackTuple(args, "vector_pvacuum_double_t_push_back", 2, 2, swig_obj)) SWIG_fail;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t_push_back" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pvacuum_double_t_push_back" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'");
}
arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
{
std::pair< double,double > *ptr = (std::pair< double,double > *)0;
res2 = swig::asptr(swig_obj[1], &ptr);
if (!SWIG_IsOK(res2)) {
- SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "vector_pair_double_t_push_back" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'");
+ SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "vector_pvacuum_double_t_push_back" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'");
}
if (!ptr) {
- SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "vector_pair_double_t_push_back" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'");
+ SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "vector_pvacuum_double_t_push_back" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'");
}
arg2 = ptr;
}
@@ -27321,7 +27321,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_vector_pair_double_t_front(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_pvacuum_double_t_front(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
void *argp1 = 0 ;
@@ -27333,7 +27333,7 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t_front(PyObject *SWIGUNUSEDPARM(s
swig_obj[0] = args;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t_front" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > const *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pvacuum_double_t_front" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > const *""'");
}
arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
result = (std::vector< std::pair< double,double > >::value_type *) &((std::vector< std::pair< double,double > > const *)arg1)->front();
@@ -27345,7 +27345,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_vector_pair_double_t_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_pvacuum_double_t_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
void *argp1 = 0 ;
@@ -27357,7 +27357,7 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t_back(PyObject *SWIGUNUSEDPARM(se
swig_obj[0] = args;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t_back" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > const *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pvacuum_double_t_back" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > const *""'");
}
arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
result = (std::vector< std::pair< double,double > >::value_type *) &((std::vector< std::pair< double,double > > const *)arg1)->back();
@@ -27369,7 +27369,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_vector_pair_double_t_assign(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_pvacuum_double_t_assign(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
std::vector< std::pair< double,double > >::size_type arg2 ;
@@ -27381,25 +27381,25 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t_assign(PyObject *SWIGUNUSEDPARM(
int res3 = SWIG_OLDOBJ ;
PyObject *swig_obj[3] ;
- if (!SWIG_Python_UnpackTuple(args, "vector_pair_double_t_assign", 3, 3, swig_obj)) SWIG_fail;
+ if (!SWIG_Python_UnpackTuple(args, "vector_pvacuum_double_t_assign", 3, 3, swig_obj)) SWIG_fail;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t_assign" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pvacuum_double_t_assign" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'");
}
arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
if (!SWIG_IsOK(ecode2)) {
- SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_pair_double_t_assign" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::size_type""'");
+ SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_pvacuum_double_t_assign" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::size_type""'");
}
arg2 = static_cast< std::vector< std::pair< double,double > >::size_type >(val2);
{
std::pair< double,double > *ptr = (std::pair< double,double > *)0;
res3 = swig::asptr(swig_obj[2], &ptr);
if (!SWIG_IsOK(res3)) {
- SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vector_pair_double_t_assign" "', argument " "3"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'");
+ SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vector_pvacuum_double_t_assign" "', argument " "3"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'");
}
if (!ptr) {
- SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "vector_pair_double_t_assign" "', argument " "3"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'");
+ SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "vector_pvacuum_double_t_assign" "', argument " "3"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'");
}
arg3 = ptr;
}
@@ -27413,7 +27413,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_vector_pair_double_t_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_vector_pvacuum_double_t_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
std::vector< std::pair< double,double > >::size_type arg2 ;
@@ -27427,22 +27427,22 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t_resize__SWIG_1(PyObject *SWIGUNU
if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t_resize" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pvacuum_double_t_resize" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'");
}
arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
if (!SWIG_IsOK(ecode2)) {
- SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_pair_double_t_resize" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::size_type""'");
+ SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_pvacuum_double_t_resize" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::size_type""'");
}
arg2 = static_cast< std::vector< std::pair< double,double > >::size_type >(val2);
{
std::pair< double,double > *ptr = (std::pair< double,double > *)0;
res3 = swig::asptr(swig_obj[2], &ptr);
if (!SWIG_IsOK(res3)) {
- SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vector_pair_double_t_resize" "', argument " "3"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'");
+ SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vector_pvacuum_double_t_resize" "', argument " "3"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'");
}
if (!ptr) {
- SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "vector_pair_double_t_resize" "', argument " "3"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'");
+ SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "vector_pvacuum_double_t_resize" "', argument " "3"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'");
}
arg3 = ptr;
}
@@ -27456,13 +27456,13 @@ fail:
}
-SWIGINTERN PyObject *_wrap_vector_pair_double_t_resize(PyObject *self, PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_pvacuum_double_t_resize(PyObject *self, PyObject *args) {
Py_ssize_t argc;
PyObject *argv[4] = {
0
};
- if (!(argc = SWIG_Python_UnpackTuple(args, "vector_pair_double_t_resize", 0, 3, argv))) SWIG_fail;
+ if (!(argc = SWIG_Python_UnpackTuple(args, "vector_pvacuum_double_t_resize", 0, 3, argv))) SWIG_fail;
--argc;
if (argc == 2) {
int _v;
@@ -27474,7 +27474,7 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t_resize(PyObject *self, PyObject
_v = SWIG_CheckState(res);
}
if (_v) {
- return _wrap_vector_pair_double_t_resize__SWIG_0(self, argc, argv);
+ return _wrap_vector_pvacuum_double_t_resize__SWIG_0(self, argc, argv);
}
}
}
@@ -27491,14 +27491,14 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t_resize(PyObject *self, PyObject
int res = swig::asptr(argv[2], (std::pair< double,double >**)(0));
_v = SWIG_CheckState(res);
if (_v) {
- return _wrap_vector_pair_double_t_resize__SWIG_1(self, argc, argv);
+ return _wrap_vector_pvacuum_double_t_resize__SWIG_1(self, argc, argv);
}
}
}
}
fail:
- SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_pair_double_t_resize'.\n"
+ SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_pvacuum_double_t_resize'.\n"
" Possible C/C++ prototypes are:\n"
" std::vector< std::pair< double,double > >::resize(std::vector< std::pair< double,double > >::size_type)\n"
" std::vector< std::pair< double,double > >::resize(std::vector< std::pair< double,double > >::size_type,std::vector< std::pair< double,double > >::value_type const &)\n");
@@ -27506,7 +27506,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_vector_pair_double_t_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_vector_pvacuum_double_t_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
std::vector< std::pair< double,double > >::iterator arg2 ;
@@ -27521,28 +27521,28 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t_insert__SWIG_0(PyObject *SWIGUNU
if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t_insert" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pvacuum_double_t_insert" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'");
}
arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
if (!SWIG_IsOK(res2) || !iter2) {
- SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_pair_double_t_insert" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::iterator""'");
+ SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_pvacuum_double_t_insert" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::iterator""'");
} else {
swig::SwigPyIterator_T<std::vector< std::pair< double,double > >::iterator > *iter_t = dynamic_cast<swig::SwigPyIterator_T<std::vector< std::pair< double,double > >::iterator > *>(iter2);
if (iter_t) {
arg2 = iter_t->get_current();
} else {
- SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_pair_double_t_insert" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::iterator""'");
+ SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_pvacuum_double_t_insert" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::iterator""'");
}
}
{
std::pair< double,double > *ptr = (std::pair< double,double > *)0;
res3 = swig::asptr(swig_obj[2], &ptr);
if (!SWIG_IsOK(res3)) {
- SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vector_pair_double_t_insert" "', argument " "3"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'");
+ SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vector_pvacuum_double_t_insert" "', argument " "3"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'");
}
if (!ptr) {
- SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "vector_pair_double_t_insert" "', argument " "3"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'");
+ SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "vector_pvacuum_double_t_insert" "', argument " "3"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'");
}
arg3 = ptr;
}
@@ -27557,7 +27557,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_vector_pair_double_t_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_vector_pvacuum_double_t_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
std::vector< std::pair< double,double > >::iterator arg2 ;
@@ -27574,33 +27574,33 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t_insert__SWIG_1(PyObject *SWIGUNU
if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t_insert" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pvacuum_double_t_insert" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'");
}
arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
if (!SWIG_IsOK(res2) || !iter2) {
- SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_pair_double_t_insert" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::iterator""'");
+ SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_pvacuum_double_t_insert" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::iterator""'");
} else {
swig::SwigPyIterator_T<std::vector< std::pair< double,double > >::iterator > *iter_t = dynamic_cast<swig::SwigPyIterator_T<std::vector< std::pair< double,double > >::iterator > *>(iter2);
if (iter_t) {
arg2 = iter_t->get_current();
} else {
- SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_pair_double_t_insert" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::iterator""'");
+ SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_pvacuum_double_t_insert" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::iterator""'");
}
}
ecode3 = SWIG_AsVal_size_t(swig_obj[2], &val3);
if (!SWIG_IsOK(ecode3)) {
- SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_pair_double_t_insert" "', argument " "3"" of type '" "std::vector< std::pair< double,double > >::size_type""'");
+ SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_pvacuum_double_t_insert" "', argument " "3"" of type '" "std::vector< std::pair< double,double > >::size_type""'");
}
arg3 = static_cast< std::vector< std::pair< double,double > >::size_type >(val3);
{
std::pair< double,double > *ptr = (std::pair< double,double > *)0;
res4 = swig::asptr(swig_obj[3], &ptr);
if (!SWIG_IsOK(res4)) {
- SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "vector_pair_double_t_insert" "', argument " "4"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'");
+ SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "vector_pvacuum_double_t_insert" "', argument " "4"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'");
}
if (!ptr) {
- SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "vector_pair_double_t_insert" "', argument " "4"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'");
+ SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "vector_pvacuum_double_t_insert" "', argument " "4"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'");
}
arg4 = ptr;
}
@@ -27614,13 +27614,13 @@ fail:
}
-SWIGINTERN PyObject *_wrap_vector_pair_double_t_insert(PyObject *self, PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_pvacuum_double_t_insert(PyObject *self, PyObject *args) {
Py_ssize_t argc;
PyObject *argv[5] = {
0
};
- if (!(argc = SWIG_Python_UnpackTuple(args, "vector_pair_double_t_insert", 0, 4, argv))) SWIG_fail;
+ if (!(argc = SWIG_Python_UnpackTuple(args, "vector_pvacuum_double_t_insert", 0, 4, argv))) SWIG_fail;
--argc;
if (argc == 3) {
int _v;
@@ -27634,7 +27634,7 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t_insert(PyObject *self, PyObject
int res = swig::asptr(argv[2], (std::pair< double,double >**)(0));
_v = SWIG_CheckState(res);
if (_v) {
- return _wrap_vector_pair_double_t_insert__SWIG_0(self, argc, argv);
+ return _wrap_vector_pvacuum_double_t_insert__SWIG_0(self, argc, argv);
}
}
}
@@ -27656,7 +27656,7 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t_insert(PyObject *self, PyObject
int res = swig::asptr(argv[3], (std::pair< double,double >**)(0));
_v = SWIG_CheckState(res);
if (_v) {
- return _wrap_vector_pair_double_t_insert__SWIG_1(self, argc, argv);
+ return _wrap_vector_pvacuum_double_t_insert__SWIG_1(self, argc, argv);
}
}
}
@@ -27664,7 +27664,7 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t_insert(PyObject *self, PyObject
}
fail:
- SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_pair_double_t_insert'.\n"
+ SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_pvacuum_double_t_insert'.\n"
" Possible C/C++ prototypes are:\n"
" std::vector< std::pair< double,double > >::insert(std::vector< std::pair< double,double > >::iterator,std::vector< std::pair< double,double > >::value_type const &)\n"
" std::vector< std::pair< double,double > >::insert(std::vector< std::pair< double,double > >::iterator,std::vector< std::pair< double,double > >::size_type,std::vector< std::pair< double,double > >::value_type const &)\n");
@@ -27672,7 +27672,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_vector_pair_double_t_reserve(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_pvacuum_double_t_reserve(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
std::vector< std::pair< double,double > >::size_type arg2 ;
@@ -27682,15 +27682,15 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t_reserve(PyObject *SWIGUNUSEDPARM
int ecode2 = 0 ;
PyObject *swig_obj[2] ;
- if (!SWIG_Python_UnpackTuple(args, "vector_pair_double_t_reserve", 2, 2, swig_obj)) SWIG_fail;
+ if (!SWIG_Python_UnpackTuple(args, "vector_pvacuum_double_t_reserve", 2, 2, swig_obj)) SWIG_fail;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t_reserve" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pvacuum_double_t_reserve" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'");
}
arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
if (!SWIG_IsOK(ecode2)) {
- SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_pair_double_t_reserve" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::size_type""'");
+ SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_pvacuum_double_t_reserve" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::size_type""'");
}
arg2 = static_cast< std::vector< std::pair< double,double > >::size_type >(val2);
(arg1)->reserve(arg2);
@@ -27701,7 +27701,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_vector_pair_double_t_capacity(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_pvacuum_double_t_capacity(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
void *argp1 = 0 ;
@@ -27713,7 +27713,7 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t_capacity(PyObject *SWIGUNUSEDPAR
swig_obj[0] = args;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t_capacity" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > const *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pvacuum_double_t_capacity" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > const *""'");
}
arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
result = ((std::vector< std::pair< double,double > > const *)arg1)->capacity();
@@ -27724,7 +27724,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_delete_vector_pair_double_t(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_vector_pvacuum_double_t(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
void *argp1 = 0 ;
@@ -27735,7 +27735,7 @@ SWIGINTERN PyObject *_wrap_delete_vector_pair_double_t(PyObject *SWIGUNUSEDPARM(
swig_obj[0] = args;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, SWIG_POINTER_DISOWN | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_vector_pair_double_t" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_vector_pvacuum_double_t" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'");
}
arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
delete arg1;
@@ -27746,14 +27746,14 @@ fail:
}
-SWIGINTERN PyObject *vector_pair_double_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *vector_pvacuum_double_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
-SWIGINTERN PyObject *vector_pair_double_t_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *vector_pvacuum_double_t_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
return SWIG_Python_InitShadowInstance(args);
}
@@ -121348,86 +121348,86 @@ static PyMethodDef SwigMethods[] = {
{ "delete_map_string_double_t", _wrap_delete_map_string_double_t, METH_O, "delete_map_string_double_t(map_string_double_t self)"},
{ "map_string_double_t_swigregister", map_string_double_t_swigregister, METH_O, NULL},
{ "map_string_double_t_swiginit", map_string_double_t_swiginit, METH_VARARGS, NULL},
- { "new_pair_double_t", _wrap_new_pair_double_t, METH_VARARGS, "\n"
- "pair_double_t()\n"
- "pair_double_t(double first, double second)\n"
- "new_pair_double_t(pair_double_t other) -> pair_double_t\n"
- ""},
- { "pair_double_t_first_set", _wrap_pair_double_t_first_set, METH_VARARGS, "pair_double_t_first_set(pair_double_t self, double first)"},
- { "pair_double_t_first_get", _wrap_pair_double_t_first_get, METH_O, "pair_double_t_first_get(pair_double_t self) -> double"},
- { "pair_double_t_second_set", _wrap_pair_double_t_second_set, METH_VARARGS, "pair_double_t_second_set(pair_double_t self, double second)"},
- { "pair_double_t_second_get", _wrap_pair_double_t_second_get, METH_O, "pair_double_t_second_get(pair_double_t self) -> double"},
- { "delete_pair_double_t", _wrap_delete_pair_double_t, METH_O, "delete_pair_double_t(pair_double_t self)"},
- { "pair_double_t_swigregister", pair_double_t_swigregister, METH_O, NULL},
- { "pair_double_t_swiginit", pair_double_t_swiginit, METH_VARARGS, NULL},
- { "vector_pair_double_t_iterator", _wrap_vector_pair_double_t_iterator, METH_O, "vector_pair_double_t_iterator(vector_pair_double_t self) -> SwigPyIterator"},
- { "vector_pair_double_t___nonzero__", _wrap_vector_pair_double_t___nonzero__, METH_O, "vector_pair_double_t___nonzero__(vector_pair_double_t self) -> bool"},
- { "vector_pair_double_t___bool__", _wrap_vector_pair_double_t___bool__, METH_O, "vector_pair_double_t___bool__(vector_pair_double_t self) -> bool"},
- { "vector_pair_double_t___len__", _wrap_vector_pair_double_t___len__, METH_O, "vector_pair_double_t___len__(vector_pair_double_t self) -> std::vector< std::pair< double,double > >::size_type"},
- { "vector_pair_double_t___getslice__", _wrap_vector_pair_double_t___getslice__, METH_VARARGS, "vector_pair_double_t___getslice__(vector_pair_double_t self, std::vector< std::pair< double,double > >::difference_type i, std::vector< std::pair< double,double > >::difference_type j) -> vector_pair_double_t"},
- { "vector_pair_double_t___setslice__", _wrap_vector_pair_double_t___setslice__, METH_VARARGS, "\n"
- "vector_pair_double_t___setslice__(vector_pair_double_t self, std::vector< std::pair< double,double > >::difference_type i, std::vector< std::pair< double,double > >::difference_type j)\n"
- "vector_pair_double_t___setslice__(vector_pair_double_t self, std::vector< std::pair< double,double > >::difference_type i, std::vector< std::pair< double,double > >::difference_type j, vector_pair_double_t v)\n"
- ""},
- { "vector_pair_double_t___delslice__", _wrap_vector_pair_double_t___delslice__, METH_VARARGS, "vector_pair_double_t___delslice__(vector_pair_double_t self, std::vector< std::pair< double,double > >::difference_type i, std::vector< std::pair< double,double > >::difference_type j)"},
- { "vector_pair_double_t___delitem__", _wrap_vector_pair_double_t___delitem__, METH_VARARGS, "\n"
- "vector_pair_double_t___delitem__(vector_pair_double_t self, std::vector< std::pair< double,double > >::difference_type i)\n"
- "vector_pair_double_t___delitem__(vector_pair_double_t self, PySliceObject * slice)\n"
- ""},
- { "vector_pair_double_t___getitem__", _wrap_vector_pair_double_t___getitem__, METH_VARARGS, "\n"
- "vector_pair_double_t___getitem__(vector_pair_double_t self, PySliceObject * slice) -> vector_pair_double_t\n"
- "vector_pair_double_t___getitem__(vector_pair_double_t self, std::vector< std::pair< double,double > >::difference_type i) -> pair_double_t\n"
- ""},
- { "vector_pair_double_t___setitem__", _wrap_vector_pair_double_t___setitem__, METH_VARARGS, "\n"
- "vector_pair_double_t___setitem__(vector_pair_double_t self, PySliceObject * slice, vector_pair_double_t v)\n"
- "vector_pair_double_t___setitem__(vector_pair_double_t self, PySliceObject * slice)\n"
- "vector_pair_double_t___setitem__(vector_pair_double_t self, std::vector< std::pair< double,double > >::difference_type i, pair_double_t x)\n"
- ""},
- { "vector_pair_double_t_pop", _wrap_vector_pair_double_t_pop, METH_O, "vector_pair_double_t_pop(vector_pair_double_t self) -> pair_double_t"},
- { "vector_pair_double_t_append", _wrap_vector_pair_double_t_append, METH_VARARGS, "vector_pair_double_t_append(vector_pair_double_t self, pair_double_t x)"},
- { "vector_pair_double_t_empty", _wrap_vector_pair_double_t_empty, METH_O, "vector_pair_double_t_empty(vector_pair_double_t self) -> bool"},
- { "vector_pair_double_t_size", _wrap_vector_pair_double_t_size, METH_O, "vector_pair_double_t_size(vector_pair_double_t self) -> std::vector< std::pair< double,double > >::size_type"},
- { "vector_pair_double_t_swap", _wrap_vector_pair_double_t_swap, METH_VARARGS, "\n"
- "vector_pair_double_t_swap(vector_pair_double_t self, vector_pair_double_t v)\n"
+ { "new_pvacuum_double_t", _wrap_new_pvacuum_double_t, METH_VARARGS, "\n"
+ "pvacuum_double_t()\n"
+ "pvacuum_double_t(double first, double second)\n"
+ "new_pvacuum_double_t(pvacuum_double_t other) -> pvacuum_double_t\n"
+ ""},
+ { "pvacuum_double_t_first_set", _wrap_pvacuum_double_t_first_set, METH_VARARGS, "pvacuum_double_t_first_set(pvacuum_double_t self, double first)"},
+ { "pvacuum_double_t_first_get", _wrap_pvacuum_double_t_first_get, METH_O, "pvacuum_double_t_first_get(pvacuum_double_t self) -> double"},
+ { "pvacuum_double_t_second_set", _wrap_pvacuum_double_t_second_set, METH_VARARGS, "pvacuum_double_t_second_set(pvacuum_double_t self, double second)"},
+ { "pvacuum_double_t_second_get", _wrap_pvacuum_double_t_second_get, METH_O, "pvacuum_double_t_second_get(pvacuum_double_t self) -> double"},
+ { "delete_pvacuum_double_t", _wrap_delete_pvacuum_double_t, METH_O, "delete_pvacuum_double_t(pvacuum_double_t self)"},
+ { "pvacuum_double_t_swigregister", pvacuum_double_t_swigregister, METH_O, NULL},
+ { "pvacuum_double_t_swiginit", pvacuum_double_t_swiginit, METH_VARARGS, NULL},
+ { "vector_pvacuum_double_t_iterator", _wrap_vector_pvacuum_double_t_iterator, METH_O, "vector_pvacuum_double_t_iterator(vector_pvacuum_double_t self) -> SwigPyIterator"},
+ { "vector_pvacuum_double_t___nonzero__", _wrap_vector_pvacuum_double_t___nonzero__, METH_O, "vector_pvacuum_double_t___nonzero__(vector_pvacuum_double_t self) -> bool"},
+ { "vector_pvacuum_double_t___bool__", _wrap_vector_pvacuum_double_t___bool__, METH_O, "vector_pvacuum_double_t___bool__(vector_pvacuum_double_t self) -> bool"},
+ { "vector_pvacuum_double_t___len__", _wrap_vector_pvacuum_double_t___len__, METH_O, "vector_pvacuum_double_t___len__(vector_pvacuum_double_t self) -> std::vector< std::pair< double,double > >::size_type"},
+ { "vector_pvacuum_double_t___getslice__", _wrap_vector_pvacuum_double_t___getslice__, METH_VARARGS, "vector_pvacuum_double_t___getslice__(vector_pvacuum_double_t self, std::vector< std::pair< double,double > >::difference_type i, std::vector< std::pair< double,double > >::difference_type j) -> vector_pvacuum_double_t"},
+ { "vector_pvacuum_double_t___setslice__", _wrap_vector_pvacuum_double_t___setslice__, METH_VARARGS, "\n"
+ "vector_pvacuum_double_t___setslice__(vector_pvacuum_double_t self, std::vector< std::pair< double,double > >::difference_type i, std::vector< std::pair< double,double > >::difference_type j)\n"
+ "vector_pvacuum_double_t___setslice__(vector_pvacuum_double_t self, std::vector< std::pair< double,double > >::difference_type i, std::vector< std::pair< double,double > >::difference_type j, vector_pvacuum_double_t v)\n"
+ ""},
+ { "vector_pvacuum_double_t___delslice__", _wrap_vector_pvacuum_double_t___delslice__, METH_VARARGS, "vector_pvacuum_double_t___delslice__(vector_pvacuum_double_t self, std::vector< std::pair< double,double > >::difference_type i, std::vector< std::pair< double,double > >::difference_type j)"},
+ { "vector_pvacuum_double_t___delitem__", _wrap_vector_pvacuum_double_t___delitem__, METH_VARARGS, "\n"
+ "vector_pvacuum_double_t___delitem__(vector_pvacuum_double_t self, std::vector< std::pair< double,double > >::difference_type i)\n"
+ "vector_pvacuum_double_t___delitem__(vector_pvacuum_double_t self, PySliceObject * slice)\n"
+ ""},
+ { "vector_pvacuum_double_t___getitem__", _wrap_vector_pvacuum_double_t___getitem__, METH_VARARGS, "\n"
+ "vector_pvacuum_double_t___getitem__(vector_pvacuum_double_t self, PySliceObject * slice) -> vector_pvacuum_double_t\n"
+ "vector_pvacuum_double_t___getitem__(vector_pvacuum_double_t self, std::vector< std::pair< double,double > >::difference_type i) -> pvacuum_double_t\n"
+ ""},
+ { "vector_pvacuum_double_t___setitem__", _wrap_vector_pvacuum_double_t___setitem__, METH_VARARGS, "\n"
+ "vector_pvacuum_double_t___setitem__(vector_pvacuum_double_t self, PySliceObject * slice, vector_pvacuum_double_t v)\n"
+ "vector_pvacuum_double_t___setitem__(vector_pvacuum_double_t self, PySliceObject * slice)\n"
+ "vector_pvacuum_double_t___setitem__(vector_pvacuum_double_t self, std::vector< std::pair< double,double > >::difference_type i, pvacuum_double_t x)\n"
+ ""},
+ { "vector_pvacuum_double_t_pop", _wrap_vector_pvacuum_double_t_pop, METH_O, "vector_pvacuum_double_t_pop(vector_pvacuum_double_t self) -> pvacuum_double_t"},
+ { "vector_pvacuum_double_t_append", _wrap_vector_pvacuum_double_t_append, METH_VARARGS, "vector_pvacuum_double_t_append(vector_pvacuum_double_t self, pvacuum_double_t x)"},
+ { "vector_pvacuum_double_t_empty", _wrap_vector_pvacuum_double_t_empty, METH_O, "vector_pvacuum_double_t_empty(vector_pvacuum_double_t self) -> bool"},
+ { "vector_pvacuum_double_t_size", _wrap_vector_pvacuum_double_t_size, METH_O, "vector_pvacuum_double_t_size(vector_pvacuum_double_t self) -> std::vector< std::pair< double,double > >::size_type"},
+ { "vector_pvacuum_double_t_swap", _wrap_vector_pvacuum_double_t_swap, METH_VARARGS, "\n"
+ "vector_pvacuum_double_t_swap(vector_pvacuum_double_t self, vector_pvacuum_double_t v)\n"
"void swap(OutputDataIterator< TValue, TContainer > &left, OutputDataIterator< TValue, TContainer > &right)\n"
"\n"
"make Swappable \n"
"\n"
""},
- { "vector_pair_double_t_begin", _wrap_vector_pair_double_t_begin, METH_O, "vector_pair_double_t_begin(vector_pair_double_t self) -> std::vector< std::pair< double,double > >::iterator"},
- { "vector_pair_double_t_end", _wrap_vector_pair_double_t_end, METH_O, "vector_pair_double_t_end(vector_pair_double_t self) -> std::vector< std::pair< double,double > >::iterator"},
- { "vector_pair_double_t_rbegin", _wrap_vector_pair_double_t_rbegin, METH_O, "vector_pair_double_t_rbegin(vector_pair_double_t self) -> std::vector< std::pair< double,double > >::reverse_iterator"},
- { "vector_pair_double_t_rend", _wrap_vector_pair_double_t_rend, METH_O, "vector_pair_double_t_rend(vector_pair_double_t self) -> std::vector< std::pair< double,double > >::reverse_iterator"},
- { "vector_pair_double_t_clear", _wrap_vector_pair_double_t_clear, METH_O, "vector_pair_double_t_clear(vector_pair_double_t self)"},
- { "vector_pair_double_t_get_allocator", _wrap_vector_pair_double_t_get_allocator, METH_O, "vector_pair_double_t_get_allocator(vector_pair_double_t self) -> std::vector< std::pair< double,double > >::allocator_type"},
- { "vector_pair_double_t_pop_back", _wrap_vector_pair_double_t_pop_back, METH_O, "vector_pair_double_t_pop_back(vector_pair_double_t self)"},
- { "vector_pair_double_t_erase", _wrap_vector_pair_double_t_erase, METH_VARARGS, "\n"
- "vector_pair_double_t_erase(vector_pair_double_t self, std::vector< std::pair< double,double > >::iterator pos) -> std::vector< std::pair< double,double > >::iterator\n"
- "vector_pair_double_t_erase(vector_pair_double_t self, std::vector< std::pair< double,double > >::iterator first, std::vector< std::pair< double,double > >::iterator last) -> std::vector< std::pair< double,double > >::iterator\n"
- ""},
- { "new_vector_pair_double_t", _wrap_new_vector_pair_double_t, METH_VARARGS, "\n"
- "vector_pair_double_t()\n"
- "vector_pair_double_t(vector_pair_double_t other)\n"
- "vector_pair_double_t(std::vector< std::pair< double,double > >::size_type size)\n"
- "new_vector_pair_double_t(std::vector< std::pair< double,double > >::size_type size, pair_double_t value) -> vector_pair_double_t\n"
- ""},
- { "vector_pair_double_t_push_back", _wrap_vector_pair_double_t_push_back, METH_VARARGS, "vector_pair_double_t_push_back(vector_pair_double_t self, pair_double_t x)"},
- { "vector_pair_double_t_front", _wrap_vector_pair_double_t_front, METH_O, "vector_pair_double_t_front(vector_pair_double_t self) -> pair_double_t"},
- { "vector_pair_double_t_back", _wrap_vector_pair_double_t_back, METH_O, "vector_pair_double_t_back(vector_pair_double_t self) -> pair_double_t"},
- { "vector_pair_double_t_assign", _wrap_vector_pair_double_t_assign, METH_VARARGS, "vector_pair_double_t_assign(vector_pair_double_t self, std::vector< std::pair< double,double > >::size_type n, pair_double_t x)"},
- { "vector_pair_double_t_resize", _wrap_vector_pair_double_t_resize, METH_VARARGS, "\n"
- "vector_pair_double_t_resize(vector_pair_double_t self, std::vector< std::pair< double,double > >::size_type new_size)\n"
- "vector_pair_double_t_resize(vector_pair_double_t self, std::vector< std::pair< double,double > >::size_type new_size, pair_double_t x)\n"
- ""},
- { "vector_pair_double_t_insert", _wrap_vector_pair_double_t_insert, METH_VARARGS, "\n"
- "vector_pair_double_t_insert(vector_pair_double_t self, std::vector< std::pair< double,double > >::iterator pos, pair_double_t x) -> std::vector< std::pair< double,double > >::iterator\n"
- "vector_pair_double_t_insert(vector_pair_double_t self, std::vector< std::pair< double,double > >::iterator pos, std::vector< std::pair< double,double > >::size_type n, pair_double_t x)\n"
- ""},
- { "vector_pair_double_t_reserve", _wrap_vector_pair_double_t_reserve, METH_VARARGS, "vector_pair_double_t_reserve(vector_pair_double_t self, std::vector< std::pair< double,double > >::size_type n)"},
- { "vector_pair_double_t_capacity", _wrap_vector_pair_double_t_capacity, METH_O, "vector_pair_double_t_capacity(vector_pair_double_t self) -> std::vector< std::pair< double,double > >::size_type"},
- { "delete_vector_pair_double_t", _wrap_delete_vector_pair_double_t, METH_O, "delete_vector_pair_double_t(vector_pair_double_t self)"},
- { "vector_pair_double_t_swigregister", vector_pair_double_t_swigregister, METH_O, NULL},
- { "vector_pair_double_t_swiginit", vector_pair_double_t_swiginit, METH_VARARGS, NULL},
+ { "vector_pvacuum_double_t_begin", _wrap_vector_pvacuum_double_t_begin, METH_O, "vector_pvacuum_double_t_begin(vector_pvacuum_double_t self) -> std::vector< std::pair< double,double > >::iterator"},
+ { "vector_pvacuum_double_t_end", _wrap_vector_pvacuum_double_t_end, METH_O, "vector_pvacuum_double_t_end(vector_pvacuum_double_t self) -> std::vector< std::pair< double,double > >::iterator"},
+ { "vector_pvacuum_double_t_rbegin", _wrap_vector_pvacuum_double_t_rbegin, METH_O, "vector_pvacuum_double_t_rbegin(vector_pvacuum_double_t self) -> std::vector< std::pair< double,double > >::reverse_iterator"},
+ { "vector_pvacuum_double_t_rend", _wrap_vector_pvacuum_double_t_rend, METH_O, "vector_pvacuum_double_t_rend(vector_pvacuum_double_t self) -> std::vector< std::pair< double,double > >::reverse_iterator"},
+ { "vector_pvacuum_double_t_clear", _wrap_vector_pvacuum_double_t_clear, METH_O, "vector_pvacuum_double_t_clear(vector_pvacuum_double_t self)"},
+ { "vector_pvacuum_double_t_get_allocator", _wrap_vector_pvacuum_double_t_get_allocator, METH_O, "vector_pvacuum_double_t_get_allocator(vector_pvacuum_double_t self) -> std::vector< std::pair< double,double > >::allocator_type"},
+ { "vector_pvacuum_double_t_pop_back", _wrap_vector_pvacuum_double_t_pop_back, METH_O, "vector_pvacuum_double_t_pop_back(vector_pvacuum_double_t self)"},
+ { "vector_pvacuum_double_t_erase", _wrap_vector_pvacuum_double_t_erase, METH_VARARGS, "\n"
+ "vector_pvacuum_double_t_erase(vector_pvacuum_double_t self, std::vector< std::pair< double,double > >::iterator pos) -> std::vector< std::pair< double,double > >::iterator\n"
+ "vector_pvacuum_double_t_erase(vector_pvacuum_double_t self, std::vector< std::pair< double,double > >::iterator first, std::vector< std::pair< double,double > >::iterator last) -> std::vector< std::pair< double,double > >::iterator\n"
+ ""},
+ { "new_vector_pvacuum_double_t", _wrap_new_vector_pvacuum_double_t, METH_VARARGS, "\n"
+ "vector_pvacuum_double_t()\n"
+ "vector_pvacuum_double_t(vector_pvacuum_double_t other)\n"
+ "vector_pvacuum_double_t(std::vector< std::pair< double,double > >::size_type size)\n"
+ "new_vector_pvacuum_double_t(std::vector< std::pair< double,double > >::size_type size, pvacuum_double_t value) -> vector_pvacuum_double_t\n"
+ ""},
+ { "vector_pvacuum_double_t_push_back", _wrap_vector_pvacuum_double_t_push_back, METH_VARARGS, "vector_pvacuum_double_t_push_back(vector_pvacuum_double_t self, pvacuum_double_t x)"},
+ { "vector_pvacuum_double_t_front", _wrap_vector_pvacuum_double_t_front, METH_O, "vector_pvacuum_double_t_front(vector_pvacuum_double_t self) -> pvacuum_double_t"},
+ { "vector_pvacuum_double_t_back", _wrap_vector_pvacuum_double_t_back, METH_O, "vector_pvacuum_double_t_back(vector_pvacuum_double_t self) -> pvacuum_double_t"},
+ { "vector_pvacuum_double_t_assign", _wrap_vector_pvacuum_double_t_assign, METH_VARARGS, "vector_pvacuum_double_t_assign(vector_pvacuum_double_t self, std::vector< std::pair< double,double > >::size_type n, pvacuum_double_t x)"},
+ { "vector_pvacuum_double_t_resize", _wrap_vector_pvacuum_double_t_resize, METH_VARARGS, "\n"
+ "vector_pvacuum_double_t_resize(vector_pvacuum_double_t self, std::vector< std::pair< double,double > >::size_type new_size)\n"
+ "vector_pvacuum_double_t_resize(vector_pvacuum_double_t self, std::vector< std::pair< double,double > >::size_type new_size, pvacuum_double_t x)\n"
+ ""},
+ { "vector_pvacuum_double_t_insert", _wrap_vector_pvacuum_double_t_insert, METH_VARARGS, "\n"
+ "vector_pvacuum_double_t_insert(vector_pvacuum_double_t self, std::vector< std::pair< double,double > >::iterator pos, pvacuum_double_t x) -> std::vector< std::pair< double,double > >::iterator\n"
+ "vector_pvacuum_double_t_insert(vector_pvacuum_double_t self, std::vector< std::pair< double,double > >::iterator pos, std::vector< std::pair< double,double > >::size_type n, pvacuum_double_t x)\n"
+ ""},
+ { "vector_pvacuum_double_t_reserve", _wrap_vector_pvacuum_double_t_reserve, METH_VARARGS, "vector_pvacuum_double_t_reserve(vector_pvacuum_double_t self, std::vector< std::pair< double,double > >::size_type n)"},
+ { "vector_pvacuum_double_t_capacity", _wrap_vector_pvacuum_double_t_capacity, METH_O, "vector_pvacuum_double_t_capacity(vector_pvacuum_double_t self) -> std::vector< std::pair< double,double > >::size_type"},
+ { "delete_vector_pvacuum_double_t", _wrap_delete_vector_pvacuum_double_t, METH_O, "delete_vector_pvacuum_double_t(vector_pvacuum_double_t self)"},
+ { "vector_pvacuum_double_t_swigregister", vector_pvacuum_double_t_swigregister, METH_O, NULL},
+ { "vector_pvacuum_double_t_swiginit", vector_pvacuum_double_t_swiginit, METH_VARARGS, NULL},
{ "swig_dummy_type_axisinfo_vector_iterator", _wrap_swig_dummy_type_axisinfo_vector_iterator, METH_O, "swig_dummy_type_axisinfo_vector_iterator(swig_dummy_type_axisinfo_vector self) -> SwigPyIterator"},
{ "swig_dummy_type_axisinfo_vector___nonzero__", _wrap_swig_dummy_type_axisinfo_vector___nonzero__, METH_O, "swig_dummy_type_axisinfo_vector___nonzero__(swig_dummy_type_axisinfo_vector self) -> bool"},
{ "swig_dummy_type_axisinfo_vector___bool__", _wrap_swig_dummy_type_axisinfo_vector___bool__, METH_O, "swig_dummy_type_axisinfo_vector___bool__(swig_dummy_type_axisinfo_vector self) -> bool"},
@@ -126382,7 +126382,7 @@ static PyMethodDef SwigMethods[] = {
"\n"
""},
{ "IFTDecayFunction2D_boundingReciprocalLatticeCoordinates", _wrap_IFTDecayFunction2D_boundingReciprocalLatticeCoordinates, METH_VARARGS, "\n"
- "IFTDecayFunction2D_boundingReciprocalLatticeCoordinates(IFTDecayFunction2D self, double qX, double qY, double a, double b, double alpha) -> pair_double_t\n"
+ "IFTDecayFunction2D_boundingReciprocalLatticeCoordinates(IFTDecayFunction2D self, double qX, double qY, double a, double b, double alpha) -> pvacuum_double_t\n"
"std::pair< double, double > IFTDecayFunction2D::boundingReciprocalLatticeCoordinates(double qX, double qY, double a, double b, double alpha) const\n"
"\n"
"transform back to a*, b* basis:\n"
@@ -130812,7 +130812,7 @@ static PyMethodDef SwigMethods[] = {
"\n"
""},
{ "DefaultMaterialProfileLimits", _wrap_DefaultMaterialProfileLimits, METH_O, "\n"
- "DefaultMaterialProfileLimits(MultiLayer multilayer) -> pair_double_t\n"
+ "DefaultMaterialProfileLimits(MultiLayer multilayer) -> pvacuum_double_t\n"
"std::pair<double, double> DefaultMaterialProfileLimits(const MultiLayer &multilayer)\n"
"\n"
"Get default z limits for generating a material profile. \n"
@@ -132527,7 +132527,7 @@ static PyMethodDef SwigMethods[] = {
{ "SimulationResult_swigregister", SimulationResult_swigregister, METH_O, NULL},
{ "SimulationResult_swiginit", SimulationResult_swiginit, METH_VARARGS, NULL},
{ "FindPeaks", _wrap_FindPeaks, METH_VARARGS, "\n"
- "FindPeaks(Histogram2D hist, double sigma=2, std::string const & option={}, double threshold=0.05) -> vector_pair_double_t\n"
+ "FindPeaks(Histogram2D hist, double sigma=2, std::string const & option={}, double threshold=0.05) -> vector_pvacuum_double_t\n"
"std::vector< std::pair< double, double > > SpectrumUtils::FindPeaks(const Histogram2D &hist, double sigma=2, const std::string &option={}, double threshold=0.05)\n"
"\n"
""},
--
GitLab