From ebaaa2217fbe014b6b58562ed242bc52c8ac21be Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Tue, 8 Dec 2020 11:49:33 +0100
Subject: [PATCH] Use quadratic SphericalDetector in 16 examples
---
Examples/Python/sim01_Particles/CylindersAndPrisms.py | 3 +--
.../Python/sim01_Particles/CylindersWithSizeDistribution.py | 3 +--
.../sim01_Particles/TwoTypesOfCylindersWithSizeDistribution.py | 3 +--
Examples/Python/sim02_Complexes/BiMaterialCylinders.py | 3 +--
Examples/Python/sim02_Complexes/CoreShellNanoparticles.py | 3 +--
Examples/Python/sim02_Complexes/ParticlesCrossingInterface.py | 3 +--
Examples/Python/sim03_Structures/ApproximationDA.py | 3 +--
Examples/Python/sim03_Structures/ApproximationLMA.py | 3 +--
Examples/Python/sim03_Structures/ApproximationSSCA.py | 3 +--
.../sim03_Structures/Interference2DLatticeSumOfRotated.py | 3 +--
Examples/Python/sim04_Multilayers/BuriedParticles.py | 3 +--
Examples/Python/sim04_Multilayers/CorrelatedRoughness.py | 3 +--
Examples/Python/sim05_Magnetism/MagneticSpheres.py | 3 +--
Examples/Python/sim11_Device/BeamDivergence.py | 3 +--
Examples/Python/sim11_Device/ConstantBackground.py | 3 +--
Examples/Python/sim11_Device/DetectorResolutionFunction.py | 3 +--
16 files changed, 16 insertions(+), 32 deletions(-)
diff --git a/Examples/Python/sim01_Particles/CylindersAndPrisms.py b/Examples/Python/sim01_Particles/CylindersAndPrisms.py
index f6fe8987c66..e2c13192a9c 100644
--- a/Examples/Python/sim01_Particles/CylindersAndPrisms.py
+++ b/Examples/Python/sim01_Particles/CylindersAndPrisms.py
@@ -50,8 +50,7 @@ def get_sample():
def get_simulation():
beam = ba.Beam(1.0, 0.1*nm, ba.Direction(0.2*deg, 0.0*deg))
- detector = ba.SphericalDetector(100, -1.0*deg, 1.0*deg, 100, 0.0*deg,
- 2.0*deg)
+ detector = ba.SphericalDetector(100, 2.0*deg, 0.0*deg, 1.0*deg)
simulation = ba.GISASSimulation(beam, get_sample(), detector)
return simulation
diff --git a/Examples/Python/sim01_Particles/CylindersWithSizeDistribution.py b/Examples/Python/sim01_Particles/CylindersWithSizeDistribution.py
index 1407410ce6f..b825706563d 100644
--- a/Examples/Python/sim01_Particles/CylindersWithSizeDistribution.py
+++ b/Examples/Python/sim01_Particles/CylindersWithSizeDistribution.py
@@ -47,8 +47,7 @@ def get_sample():
def get_simulation():
beam = ba.Beam(1.0, 0.1*nm, ba.Direction(0.2*deg, 0.0*deg))
- detector = ba.SphericalDetector(200, 0.0*deg, 2.0*deg, 200, 0.0*deg,
- 2.0*deg)
+ detector = ba.SphericalDetector(200, 2.0*deg, 1.0*deg, 1.0*deg)
simulation = ba.GISASSimulation(beam, get_sample(), detector)
return simulation
diff --git a/Examples/Python/sim01_Particles/TwoTypesOfCylindersWithSizeDistribution.py b/Examples/Python/sim01_Particles/TwoTypesOfCylindersWithSizeDistribution.py
index 3bb2f240db4..1894c7a5aa2 100644
--- a/Examples/Python/sim01_Particles/TwoTypesOfCylindersWithSizeDistribution.py
+++ b/Examples/Python/sim01_Particles/TwoTypesOfCylindersWithSizeDistribution.py
@@ -56,8 +56,7 @@ def get_sample():
def get_simulation():
beam = ba.Beam(1.0, 0.1*nm, ba.Direction(0.2*deg, 0.0*deg))
- detector = ba.SphericalDetector(200, 0.0*deg, 2.0*deg, 200, 0.0*deg,
- 2.0*deg)
+ detector = ba.SphericalDetector(200, 2.0*deg, 1.0*deg, 1.0*deg)
simulation = ba.GISASSimulation(beam, get_sample(), detector)
return simulation
diff --git a/Examples/Python/sim02_Complexes/BiMaterialCylinders.py b/Examples/Python/sim02_Complexes/BiMaterialCylinders.py
index 14b770a15d0..3f7fbc62f61 100644
--- a/Examples/Python/sim02_Complexes/BiMaterialCylinders.py
+++ b/Examples/Python/sim02_Complexes/BiMaterialCylinders.py
@@ -59,8 +59,7 @@ def get_sample():
def get_simulation():
beam = ba.Beam(100000000.0, 0.1*nm, ba.Direction(0.2*deg, 0.0*deg))
- detector = ba.SphericalDetector(100, -1.0*deg, 1.0*deg, 100, 0.0*deg,
- 2.0*deg)
+ detector = ba.SphericalDetector(100, 2.0*deg, 0.0*deg, 1.0*deg)
simulation = ba.GISASSimulation(beam, get_sample(), detector)
return simulation
diff --git a/Examples/Python/sim02_Complexes/CoreShellNanoparticles.py b/Examples/Python/sim02_Complexes/CoreShellNanoparticles.py
index 8fab24ca4b6..bae3d599ae3 100644
--- a/Examples/Python/sim02_Complexes/CoreShellNanoparticles.py
+++ b/Examples/Python/sim02_Complexes/CoreShellNanoparticles.py
@@ -50,8 +50,7 @@ def get_sample():
def get_simulation():
beam = ba.Beam(1.0, 0.1*nm, ba.Direction(0.2*deg, 0.0*deg))
- detector = ba.SphericalDetector(200, -1.0*deg, 1.0*deg, 200, 0.0*deg,
- 2.0*deg)
+ detector = ba.SphericalDetector(200, 2.0*deg, 0.0*deg, 1.0*deg)
simulation = ba.GISASSimulation(beam, get_sample(), detector)
return simulation
diff --git a/Examples/Python/sim02_Complexes/ParticlesCrossingInterface.py b/Examples/Python/sim02_Complexes/ParticlesCrossingInterface.py
index 43fe5da2928..3f84a0ee061 100644
--- a/Examples/Python/sim02_Complexes/ParticlesCrossingInterface.py
+++ b/Examples/Python/sim02_Complexes/ParticlesCrossingInterface.py
@@ -69,8 +69,7 @@ def get_sample():
def get_simulation():
beam = ba.Beam(1.0, 0.1*nm, ba.Direction(0.2*deg, 0.0*deg))
- detector = ba.SphericalDetector(100, -1.0*deg, 1.0*deg, 100, 0.0*deg,
- 2.0*deg)
+ detector = ba.SphericalDetector(100, 2.0*deg, 0.0*deg, 1.0*deg)
simulation = ba.GISASSimulation(beam, get_sample(), detector)
return simulation
diff --git a/Examples/Python/sim03_Structures/ApproximationDA.py b/Examples/Python/sim03_Structures/ApproximationDA.py
index 2af0151cdde..41feff79dc3 100644
--- a/Examples/Python/sim03_Structures/ApproximationDA.py
+++ b/Examples/Python/sim03_Structures/ApproximationDA.py
@@ -53,8 +53,7 @@ def get_sample():
def get_simulation():
beam = ba.Beam(1.0, 0.1*nm, ba.Direction(0.2*deg, 0.0*deg))
- detector = ba.SphericalDetector(200, 0.0*deg, 2.0*deg, 200, 0.0*deg,
- 2.0*deg)
+ detector = ba.SphericalDetector(200, 2.0*deg, 1.0*deg, 1.0*deg)
simulation = ba.GISASSimulation(beam, get_sample(), detector)
return simulation
diff --git a/Examples/Python/sim03_Structures/ApproximationLMA.py b/Examples/Python/sim03_Structures/ApproximationLMA.py
index b054a61abab..85dab0a77e1 100644
--- a/Examples/Python/sim03_Structures/ApproximationLMA.py
+++ b/Examples/Python/sim03_Structures/ApproximationLMA.py
@@ -61,8 +61,7 @@ def get_sample():
def get_simulation():
beam = ba.Beam(1.0, 0.1*nm, ba.Direction(0.2*deg, 0.0*deg))
- detector = ba.SphericalDetector(200, 0.0*deg, 2.0*deg, 200, 0.0*deg,
- 2.0*deg)
+ detector = ba.SphericalDetector(200, 2.0*deg, 1.0*deg, 1.0*deg)
simulation = ba.GISASSimulation(beam, get_sample(), detector)
return simulation
diff --git a/Examples/Python/sim03_Structures/ApproximationSSCA.py b/Examples/Python/sim03_Structures/ApproximationSSCA.py
index f8346585db4..790ac4aea4f 100644
--- a/Examples/Python/sim03_Structures/ApproximationSSCA.py
+++ b/Examples/Python/sim03_Structures/ApproximationSSCA.py
@@ -54,8 +54,7 @@ def get_sample():
def get_simulation():
beam = ba.Beam(1.0, 0.1*nm, ba.Direction(0.2*deg, 0.0*deg))
- detector = ba.SphericalDetector(200, 0.0*deg, 2.0*deg, 200, 0.0*deg,
- 2.0*deg)
+ detector = ba.SphericalDetector(200, 2.0*deg, 1.0*deg, 1.0*deg)
simulation = ba.GISASSimulation(beam, get_sample(), detector)
return simulation
diff --git a/Examples/Python/sim03_Structures/Interference2DLatticeSumOfRotated.py b/Examples/Python/sim03_Structures/Interference2DLatticeSumOfRotated.py
index 7ef1948867e..4b7b35ae00a 100644
--- a/Examples/Python/sim03_Structures/Interference2DLatticeSumOfRotated.py
+++ b/Examples/Python/sim03_Structures/Interference2DLatticeSumOfRotated.py
@@ -38,8 +38,7 @@ def get_sample():
def get_simulation():
beam = ba.Beam(1.0, 0.1*nm, ba.Direction(0.2*deg, 0.0*deg))
- detector = ba.SphericalDetector(100, 0.0*deg, 2.0*deg, 100, 0.0*deg,
- 2.0*deg)
+ detector = ba.SphericalDetector(100, 2.0*deg, 1.0*deg, 1.0*deg)
simulation = ba.GISASSimulation(beam, get_sample(), detector)
distr_1 = ba.DistributionGate(0.0*deg, 240.0*deg)
diff --git a/Examples/Python/sim04_Multilayers/BuriedParticles.py b/Examples/Python/sim04_Multilayers/BuriedParticles.py
index 0d3dfe0e880..5e847140bf2 100644
--- a/Examples/Python/sim04_Multilayers/BuriedParticles.py
+++ b/Examples/Python/sim04_Multilayers/BuriedParticles.py
@@ -50,8 +50,7 @@ def get_sample():
def get_simulation():
beam = ba.Beam(1.0, 0.15*nm, ba.Direction(0.15*deg, 0.0*deg))
- detector = ba.SphericalDetector(200, -1.0*deg, 1.0*deg, 200, 0.0*deg,
- 2.0*deg)
+ detector = ba.SphericalDetector(200, 2.0*deg, 0.0*deg, 1.0*deg)
simulation = ba.GISASSimulation(beam, get_sample(), detector)
return simulation
diff --git a/Examples/Python/sim04_Multilayers/CorrelatedRoughness.py b/Examples/Python/sim04_Multilayers/CorrelatedRoughness.py
index 32b9d86210e..4e8c4d0f1e1 100644
--- a/Examples/Python/sim04_Multilayers/CorrelatedRoughness.py
+++ b/Examples/Python/sim04_Multilayers/CorrelatedRoughness.py
@@ -47,8 +47,7 @@ def get_sample():
def get_simulation():
beam = ba.Beam(500000000000.0, 0.1*nm, ba.Direction(0.2*deg, 0.0*deg))
- detector = ba.SphericalDetector(200, -0.5*deg, 0.5*deg, 200, 0.0*deg,
- 1.0*deg)
+ detector = ba.SphericalDetector(200, 1.0*deg, 0.0*deg, 0.5*deg)
simulation = ba.GISASSimulation(beam, get_sample(), detector)
return simulation
diff --git a/Examples/Python/sim05_Magnetism/MagneticSpheres.py b/Examples/Python/sim05_Magnetism/MagneticSpheres.py
index fc5b64a85c8..8702457988a 100644
--- a/Examples/Python/sim05_Magnetism/MagneticSpheres.py
+++ b/Examples/Python/sim05_Magnetism/MagneticSpheres.py
@@ -49,8 +49,7 @@ def get_simulation():
beam = ba.Beam(1e+12, 0.1*nm, ba.Direction(0.5*deg, 0.0*deg))
beam_polarization = kvector_t(0.0, 0.0, 1.0)
beam.setPolarization(beam_polarization)
- detector = ba.SphericalDetector(200, -3.0*deg, 3.0*deg, 200, 0.0*deg,
- 6.0*deg)
+ detector = ba.SphericalDetector(200, 6.0*deg, 0.0*deg, 3.0*deg)
simulation = ba.GISASSimulation(beam, get_sample(), detector)
analyzer_direction = kvector_t(0.0, 0.0, -1.0)
diff --git a/Examples/Python/sim11_Device/BeamDivergence.py b/Examples/Python/sim11_Device/BeamDivergence.py
index dbcf9cd66a0..619354ded4b 100644
--- a/Examples/Python/sim11_Device/BeamDivergence.py
+++ b/Examples/Python/sim11_Device/BeamDivergence.py
@@ -43,8 +43,7 @@ def get_sample():
def get_simulation():
beam = ba.Beam(1.0, 0.1*nm, ba.Direction(0.2*deg, 0.0*deg))
- detector = ba.SphericalDetector(100, 0.0*deg, 2.0*deg, 100, 0.0*deg,
- 2.0*deg)
+ detector = ba.SphericalDetector(100, 2.0*deg, 1.0*deg, 1.0*deg)
simulation = ba.GISASSimulation(beam, get_sample(), detector)
distr_1 = ba.DistributionLogNormal(0.1*nm, 0.1)
diff --git a/Examples/Python/sim11_Device/ConstantBackground.py b/Examples/Python/sim11_Device/ConstantBackground.py
index b3bb577106e..3b327dc23c0 100644
--- a/Examples/Python/sim11_Device/ConstantBackground.py
+++ b/Examples/Python/sim11_Device/ConstantBackground.py
@@ -43,8 +43,7 @@ def get_sample():
def get_simulation():
beam = ba.Beam(1000000.0, 0.1*nm, ba.Direction(0.2*deg, 0.0*deg))
- detector = ba.SphericalDetector(100, 0.0*deg, 2.0*deg, 100, 0.0*deg,
- 2.0*deg)
+ detector = ba.SphericalDetector(100, 2.0*deg, 1.0*deg, 1.0*deg)
simulation = ba.GISASSimulation(beam, get_sample(), detector)
background = ba.ConstantBackground(1.0e+03)
diff --git a/Examples/Python/sim11_Device/DetectorResolutionFunction.py b/Examples/Python/sim11_Device/DetectorResolutionFunction.py
index 1142a1e9c8a..6db37134890 100644
--- a/Examples/Python/sim11_Device/DetectorResolutionFunction.py
+++ b/Examples/Python/sim11_Device/DetectorResolutionFunction.py
@@ -43,8 +43,7 @@ def get_sample():
def get_simulation():
beam = ba.Beam(1.0, 0.1*nm, ba.Direction(0.2*deg, 0.0*deg))
- detector = ba.SphericalDetector(100, 0.0*deg, 2.0*deg, 100, 0.0*deg,
- 2.0*deg)
+ detector = ba.SphericalDetector(100, 2.0*deg, 1.0*deg, 1.0*deg)
simulation = ba.GISASSimulation(beam, get_sample(), detector)
simulation.setDetectorResolutionFunction(
--
GitLab