From 8f69886dd1dbc281fba5954bcd8a6d850ffa7d4a Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (o)" <j.wuttke@fz-juelich.de>
Date: Mon, 23 May 2022 12:28:50 +0200
Subject: [PATCH] rm setPolFilters from py examples
---
Examples/scatter2d/MagneticCylinders2.py | 5 +++--
Examples/scatter2d/MagneticSpheres.py | 4 ++--
Examples/scatter2d/PolarizedSANS.py | 5 ++---
Examples/specular/PolarizedNonperfectAnalyzerPolarizer.py | 6 ++----
Examples/specular/PolarizedSpinAsymmetry.py | 4 ++--
Examples/specular/PolarizedSpinFlip.py | 4 ++--
6 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/Examples/scatter2d/MagneticCylinders2.py b/Examples/scatter2d/MagneticCylinders2.py
index 32fd6298f48..45894e6c5c9 100755
--- a/Examples/scatter2d/MagneticCylinders2.py
+++ b/Examples/scatter2d/MagneticCylinders2.py
@@ -34,12 +34,13 @@ def get_sample():
return sample
def get_simulation(sample, pol_dir, efficiency):
+ z_up = R3(0, 0, 1)
n = bp.simargs['n']
beam = ba.Beam(1e9, 0.1*nm, ba.Direction(0.2*deg, 0))
+ beam.setPolarization(pol_dir)
detector = ba.SphericalDetector(n, -1*deg, 1*deg, n, 0, 2*deg)
+ detector.setAnalyzer(z_up, efficiency, 0.5)
simulation = ba.ScatteringSimulation(beam, sample, detector)
- z_up = R3(0, 0, 1)
- simulation.instrument().setPolFilters(pol_dir, z_up, efficiency, 0.5)
return simulation
def simulate(title, pol_dir, efficiency):
diff --git a/Examples/scatter2d/MagneticSpheres.py b/Examples/scatter2d/MagneticSpheres.py
index 8e674cfca47..c1483742f71 100755
--- a/Examples/scatter2d/MagneticSpheres.py
+++ b/Examples/scatter2d/MagneticSpheres.py
@@ -53,8 +53,8 @@ def get_simulation(sample):
polarizer_dir = R3(0, 0, 1)
analyzer_dir = R3(0, 0, -1)
- simulation.instrument().setPolFilters(polarizer_dir, analyzer_dir, 1,
- 0.5)
+ simulation.beam().setPolarization(polarizer_dir)
+ simulation.detector().setAnalyzer(analyzer_dir, 1, 0.5)
return simulation
diff --git a/Examples/scatter2d/PolarizedSANS.py b/Examples/scatter2d/PolarizedSANS.py
index 5de7d1174fa..2a3206773ff 100755
--- a/Examples/scatter2d/PolarizedSANS.py
+++ b/Examples/scatter2d/PolarizedSANS.py
@@ -57,17 +57,16 @@ def get_simulation(sample):
# Beam from above (perpendicular to sample):
beam = ba.Beam(1, 0.4*nm, ba.Direction(90*deg, 0))
+ beam.setPolarization(R3(0, 1, 0))
# Detector opposite to source:
detPos = 2000 # distance from sample center to detector in mm
detWid = 500 # detector width in mm
det = ba.RectangularDetector(n, detWid, n, detWid)
det.setPerpendicularToDirectBeam(detPos, detWid/2, detWid/2)
-
+ det.setAnalyzer(R3(0, -1, 0), 1, 0.5)
sim = ba.ScatteringSimulation(beam, sample, det)
- sim.instrument().setPolFilters(R3(0, 1, 0), R3(0, -1, 0), 1, 0.5)
-
return sim
diff --git a/Examples/specular/PolarizedNonperfectAnalyzerPolarizer.py b/Examples/specular/PolarizedNonperfectAnalyzerPolarizer.py
index cb363700922..86ae7c0fa68 100755
--- a/Examples/specular/PolarizedNonperfectAnalyzerPolarizer.py
+++ b/Examples/specular/PolarizedNonperfectAnalyzerPolarizer.py
@@ -80,10 +80,8 @@ def run_simulation(*,
sample = get_sample()
simulation = get_simulation(sample)
- simulation.instrument().setPolFilters(
- polarizer_dir*polarizer_efficiency, analyzer_dir,
- analyzer_efficiency, 0.5)
-
+ simulation.beam().setPolarization(polarizer_dir*polarizer_efficiency)
+ simulation.detector().setAnalyzer(analyzer_dir, analyzer_efficiency, 0.5)
simulation.setBackground(ba.ConstantBackground(1e-7))
return simulation.simulate()
diff --git a/Examples/specular/PolarizedSpinAsymmetry.py b/Examples/specular/PolarizedSpinAsymmetry.py
index 0f0200419b0..aa40ca18d42 100755
--- a/Examples/specular/PolarizedSpinAsymmetry.py
+++ b/Examples/specular/PolarizedSpinAsymmetry.py
@@ -80,8 +80,8 @@ def get_simulation(q_axis, parameters, polarizer_dir, analyzer_dir):
distr = ba.RangedDistributionGaussian(n_samples, n_sig)
scan.setAbsoluteQResolution(distr, parameters["q_res"])
- simulation.instrument().setPolFilters(polarizer_dir, analyzer_dir, 1,
- 0.5)
+ simulation.beam().setPolarization(polarizer_dir)
+ simulation.detector().setAnalyzer(analyzer_dir, 1, 0.5)
simulation.setScan(scan)
return simulation
diff --git a/Examples/specular/PolarizedSpinFlip.py b/Examples/specular/PolarizedSpinFlip.py
index e4c4b4a1357..3bc5cdb4704 100755
--- a/Examples/specular/PolarizedSpinFlip.py
+++ b/Examples/specular/PolarizedSpinFlip.py
@@ -55,8 +55,8 @@ def run_simulation(polarizer_dir=ba.R3(0, 1, 0),
sample = get_sample()
simulation = get_simulation(sample)
- simulation.instrument().setPolFilters(polarizer_dir, analyzer_dir, 1,
- 0.5)
+ simulation.beam().setPolarization(polarizer_dir)
+ simulation.detector().setAnalyzer(analyzer_dir, 1, 0.5)
return simulation.simulate()
--
GitLab