From b20dd5c41c419799ab70aaaaeefcbddcecae2bd5 Mon Sep 17 00:00:00 2001
From: Mikhail Svechnikov <svechnikovmv@gmail.com>
Date: Thu, 20 Mar 2025 11:04:16 +0100
Subject: [PATCH] adjust examples
---
auto/Examples/fit/specular/Honeycomb_fit.py | 10 +++++-----
auto/Examples/fit/specular/PolarizedSpinAsymmetry.py | 4 ++--
auto/Examples/fit/specular/Pt_layer_fit.py | 4 ++--
auto/Examples/fit/specular/TREFF_Ni_film.py | 4 ++--
auto/Examples/specular/MagneticLayerImperfect.py | 2 +-
auto/Examples/specular/PolarizedSpinAsymmetry.py | 4 ++--
auto/Examples/specular/RoughnessModel.py | 2 +-
.../specular/SpecularSimulationWithRoughness.py | 2 +-
auto/FigExamples/fit/specular/Honeycomb_fit.py | 10 +++++-----
.../FigExamples/fit/specular/PolarizedSpinAsymmetry.py | 4 ++--
auto/FigExamples/fit/specular/Pt_layer_fit.py | 4 ++--
auto/FigExamples/fit/specular/TREFF_Ni_film.py | 4 ++--
auto/FigExamples/specular/MagneticLayerImperfect.py | 2 +-
auto/FigExamples/specular/PolarizedSpinAsymmetry.py | 4 ++--
auto/FigExamples/specular/RoughnessModel.py | 2 +-
.../specular/SpecularSimulationWithRoughness.py | 2 +-
auto/MiniExamples/fit/specular/Honeycomb_fit.py | 10 +++++-----
.../fit/specular/PolarizedSpinAsymmetry.py | 4 ++--
auto/MiniExamples/fit/specular/Pt_layer_fit.py | 4 ++--
auto/MiniExamples/fit/specular/TREFF_Ni_film.py | 4 ++--
auto/MiniExamples/specular/MagneticLayerImperfect.py | 2 +-
auto/MiniExamples/specular/PolarizedSpinAsymmetry.py | 4 ++--
auto/MiniExamples/specular/RoughnessModel.py | 2 +-
.../specular/SpecularSimulationWithRoughness.py | 2 +-
rawEx/fit/specular/Honeycomb_fit.py | 10 +++++-----
rawEx/fit/specular/PolarizedSpinAsymmetry.py | 4 ++--
rawEx/fit/specular/Pt_layer_fit.py | 4 ++--
rawEx/fit/specular/TREFF_Ni_film.py | 4 ++--
rawEx/specular/MagneticLayerImperfect.py | 2 +-
rawEx/specular/PolarizedSpinAsymmetry.py | 4 ++--
rawEx/specular/RoughnessModel.py | 2 +-
rawEx/specular/SpecularSimulationWithRoughness.py | 2 +-
32 files changed, 64 insertions(+), 64 deletions(-)
diff --git a/auto/Examples/fit/specular/Honeycomb_fit.py b/auto/Examples/fit/specular/Honeycomb_fit.py
index 4aa383b2c1e..9d26b3a6253 100755
--- a/auto/Examples/fit/specular/Honeycomb_fit.py
+++ b/auto/Examples/fit/specular/Honeycomb_fit.py
@@ -46,11 +46,11 @@ def get_sample(P, sign, T):
interlayer_model = ba.ErfInterlayer()
- rPyOx_autocorr = ba.K_CorrelationModel(P["rPyOx"]*angstrom)
- rPy2_autocorr = ba.K_CorrelationModel(P["rPy2"]*angstrom)
- rPy1_autocorr = ba.K_CorrelationModel(P["rPy1"]*angstrom)
- rSiO2_autocorr = ba.K_CorrelationModel(P["rSiO2"]*angstrom)
- rSi_autocorr = ba.K_CorrelationModel(P["rSi"]*angstrom)
+ rPyOx_autocorr = ba.K_CorrelationModel(P["rPyOx"]*angstrom, 0.7, 250*angstrom)
+ rPy2_autocorr = ba.K_CorrelationModel(P["rPy2"]*angstrom, 0.7, 250*angstrom)
+ rPy1_autocorr = ba.K_CorrelationModel(P["rPy1"]*angstrom, 0.7, 250*angstrom)
+ rSiO2_autocorr = ba.K_CorrelationModel(P["rSiO2"]*angstrom, 0.7, 250*angstrom)
+ rSi_autocorr = ba.K_CorrelationModel(P["rSi"]*angstrom, 0.7, 250*angstrom)
rPyOx = ba.LayerRoughness(rPyOx_autocorr, interlayer_model)
rPy2 = ba.LayerRoughness(rPy2_autocorr, interlayer_model)
diff --git a/auto/Examples/fit/specular/PolarizedSpinAsymmetry.py b/auto/Examples/fit/specular/PolarizedSpinAsymmetry.py
index 620160d0ad1..6267f7414dd 100755
--- a/auto/Examples/fit/specular/PolarizedSpinAsymmetry.py
+++ b/auto/Examples/fit/specular/PolarizedSpinAsymmetry.py
@@ -46,8 +46,8 @@ def get_sample(P):
material_layer = ba.MaterialBySLD("(Mg,Al,Fe)3O4", P["rho_Mafo"]*1e-6, 0, B)
material_substrate = ba.MaterialBySLD("MgAl2O4", *sldMao)
- r_Mafo_autocorr = ba.K_CorrelationModel(P["r_Mafo"]*angstrom)
- r_substrate_autocorr = ba.K_CorrelationModel(P["r_Mao"]*angstrom)
+ r_Mafo_autocorr = ba.K_CorrelationModel(P["r_Mafo"]*angstrom, 0.7, 250*angstrom)
+ r_substrate_autocorr = ba.K_CorrelationModel(P["r_Mao"]*angstrom, 0.7, 250*angstrom)
interlayer = ba.TanhInterlayer()
diff --git a/auto/Examples/fit/specular/Pt_layer_fit.py b/auto/Examples/fit/specular/Pt_layer_fit.py
index 56edceb5767..b23bb1c3eb3 100755
--- a/auto/Examples/fit/specular/Pt_layer_fit.py
+++ b/auto/Examples/fit/specular/Pt_layer_fit.py
@@ -32,8 +32,8 @@ def get_sample(P):
interlayer = ba.TanhInterlayer()
- si_autocorr = ba.K_CorrelationModel(P["r_si/nm"])
- pt_autocorr = ba.K_CorrelationModel(P["r_pt/nm"])
+ si_autocorr = ba.K_CorrelationModel(P["r_si/nm"], 0.7, 250*angstrom)
+ pt_autocorr = ba.K_CorrelationModel(P["r_pt/nm"], 0.7, 250*angstrom)
r_si = ba.LayerRoughness(si_autocorr, interlayer)
r_pt = ba.LayerRoughness(pt_autocorr, interlayer)
diff --git a/auto/Examples/fit/specular/TREFF_Ni_film.py b/auto/Examples/fit/specular/TREFF_Ni_film.py
index 2a613fc1e43..682511f59b1 100755
--- a/auto/Examples/fit/specular/TREFF_Ni_film.py
+++ b/auto/Examples/fit/specular/TREFF_Ni_film.py
@@ -28,10 +28,10 @@ def get_sample(P):
# Layers and interfaces
interlayer = ba.TanhInterlayer()
- Ni_autocorr = ba.K_CorrelationModel(P["sigma_Ni"])
+ Ni_autocorr = ba.K_CorrelationModel(P["sigma_Ni"], 0.7, 25*nm)
roughness_Ni = ba.LayerRoughness(Ni_autocorr, interlayer)
- sub_autocorr = ba.K_CorrelationModel(P["sigma_Substrate"])
+ sub_autocorr = ba.K_CorrelationModel(P["sigma_Substrate"], 0.7, 25*nm)
roughness_Substrate = ba.LayerRoughness(sub_autocorr, interlayer)
layer_Ni = ba.Layer(material_Ni_58, P["thickness"], roughness_Ni)
diff --git a/auto/Examples/specular/MagneticLayerImperfect.py b/auto/Examples/specular/MagneticLayerImperfect.py
index 918c4dca34c..5c605b80740 100755
--- a/auto/Examples/specular/MagneticLayerImperfect.py
+++ b/auto/Examples/specular/MagneticLayerImperfect.py
@@ -19,7 +19,7 @@ def get_sample():
material_Fe = ba.MaterialBySLD("Fe", 8.0241e-06, 6.0448e-10, B)
material_substrate = ba.MaterialBySLD("MgO", 5.9803e-06, 9.3996e-12)
- autocorr = ba.K_CorrelationModel(20*angstrom)
+ autocorr = ba.K_CorrelationModel(20*angstrom, 0.7, 250*angstrom)
interlayer = ba.TanhInterlayer()
roughness = ba.LayerRoughness(autocorr, interlayer)
diff --git a/auto/Examples/specular/PolarizedSpinAsymmetry.py b/auto/Examples/specular/PolarizedSpinAsymmetry.py
index 2410578dc11..a5ba638a5e8 100755
--- a/auto/Examples/specular/PolarizedSpinAsymmetry.py
+++ b/auto/Examples/specular/PolarizedSpinAsymmetry.py
@@ -47,8 +47,8 @@ def get_sample(P):
material_layer = ba.MaterialBySLD("(Mg,Al,Fe)3O4", P["rho_Mafo"]*1e-6, 0, B)
material_substrate = ba.MaterialBySLD("MgAl2O4", *sldMao)
- r_Mafo_autocorr = ba.K_CorrelationModel(P["r_Mafo"]*angstrom)
- r_sub_autocorr = ba.K_CorrelationModel(P["r_Mao"]*angstrom)
+ r_Mafo_autocorr = ba.K_CorrelationModel(P["r_Mafo"]*angstrom, 0.7, 250*angstrom)
+ r_sub_autocorr = ba.K_CorrelationModel(P["r_Mao"]*angstrom, 0.7, 250*angstrom)
interlayer = ba.TanhInterlayer()
diff --git a/auto/Examples/specular/RoughnessModel.py b/auto/Examples/specular/RoughnessModel.py
index df5342a2bc9..23a23fd6290 100755
--- a/auto/Examples/specular/RoughnessModel.py
+++ b/auto/Examples/specular/RoughnessModel.py
@@ -16,7 +16,7 @@ def get_sample(interlayer):
material_substrate = ba.MaterialBySLD("SiSubstrate", 2.0704e-06, 0)
# Roughness
- autocorr = ba.K_CorrelationModel(10*angstrom)
+ autocorr = ba.K_CorrelationModel(10*angstrom, 0.7, 250*angstrom)
roughness = ba.LayerRoughness(autocorr, interlayer)
# create layers
diff --git a/auto/Examples/specular/SpecularSimulationWithRoughness.py b/auto/Examples/specular/SpecularSimulationWithRoughness.py
index 845bd4f47ee..9a525198abd 100755
--- a/auto/Examples/specular/SpecularSimulationWithRoughness.py
+++ b/auto/Examples/specular/SpecularSimulationWithRoughness.py
@@ -16,7 +16,7 @@ def get_sample():
material_substrate = ba.MaterialBySLD("SiSubstrate", 2.0704e-06, 0)
# roughness
- autocorr = ba.K_CorrelationModel(1*nm)
+ autocorr = ba.K_CorrelationModel(1*nm, 0.7, 25*nm)
interlayer = ba.TanhInterlayer()
roughness = ba.LayerRoughness(autocorr, interlayer)
diff --git a/auto/FigExamples/fit/specular/Honeycomb_fit.py b/auto/FigExamples/fit/specular/Honeycomb_fit.py
index fee2317e035..d27a4e4c77b 100755
--- a/auto/FigExamples/fit/specular/Honeycomb_fit.py
+++ b/auto/FigExamples/fit/specular/Honeycomb_fit.py
@@ -46,11 +46,11 @@ def get_sample(P, sign, T):
interlayer_model = ba.ErfInterlayer()
- rPyOx_autocorr = ba.K_CorrelationModel(P["rPyOx"]*angstrom)
- rPy2_autocorr = ba.K_CorrelationModel(P["rPy2"]*angstrom)
- rPy1_autocorr = ba.K_CorrelationModel(P["rPy1"]*angstrom)
- rSiO2_autocorr = ba.K_CorrelationModel(P["rSiO2"]*angstrom)
- rSi_autocorr = ba.K_CorrelationModel(P["rSi"]*angstrom)
+ rPyOx_autocorr = ba.K_CorrelationModel(P["rPyOx"]*angstrom, 0.7, 250*angstrom)
+ rPy2_autocorr = ba.K_CorrelationModel(P["rPy2"]*angstrom, 0.7, 250*angstrom)
+ rPy1_autocorr = ba.K_CorrelationModel(P["rPy1"]*angstrom, 0.7, 250*angstrom)
+ rSiO2_autocorr = ba.K_CorrelationModel(P["rSiO2"]*angstrom, 0.7, 250*angstrom)
+ rSi_autocorr = ba.K_CorrelationModel(P["rSi"]*angstrom, 0.7, 250*angstrom)
rPyOx = ba.LayerRoughness(rPyOx_autocorr, interlayer_model)
rPy2 = ba.LayerRoughness(rPy2_autocorr, interlayer_model)
diff --git a/auto/FigExamples/fit/specular/PolarizedSpinAsymmetry.py b/auto/FigExamples/fit/specular/PolarizedSpinAsymmetry.py
index b80b6280d02..5ac5dc8e239 100755
--- a/auto/FigExamples/fit/specular/PolarizedSpinAsymmetry.py
+++ b/auto/FigExamples/fit/specular/PolarizedSpinAsymmetry.py
@@ -46,8 +46,8 @@ def get_sample(P):
material_layer = ba.MaterialBySLD("(Mg,Al,Fe)3O4", P["rho_Mafo"]*1e-6, 0, B)
material_substrate = ba.MaterialBySLD("MgAl2O4", *sldMao)
- r_Mafo_autocorr = ba.K_CorrelationModel(P["r_Mafo"]*angstrom)
- r_substrate_autocorr = ba.K_CorrelationModel(P["r_Mao"]*angstrom)
+ r_Mafo_autocorr = ba.K_CorrelationModel(P["r_Mafo"]*angstrom, 0.7, 250*angstrom)
+ r_substrate_autocorr = ba.K_CorrelationModel(P["r_Mao"]*angstrom, 0.7, 250*angstrom)
interlayer = ba.TanhInterlayer()
diff --git a/auto/FigExamples/fit/specular/Pt_layer_fit.py b/auto/FigExamples/fit/specular/Pt_layer_fit.py
index 24bf5f3aa85..b1edb462396 100755
--- a/auto/FigExamples/fit/specular/Pt_layer_fit.py
+++ b/auto/FigExamples/fit/specular/Pt_layer_fit.py
@@ -32,8 +32,8 @@ def get_sample(P):
interlayer = ba.TanhInterlayer()
- si_autocorr = ba.K_CorrelationModel(P["r_si/nm"])
- pt_autocorr = ba.K_CorrelationModel(P["r_pt/nm"])
+ si_autocorr = ba.K_CorrelationModel(P["r_si/nm"], 0.7, 250*angstrom)
+ pt_autocorr = ba.K_CorrelationModel(P["r_pt/nm"], 0.7, 250*angstrom)
r_si = ba.LayerRoughness(si_autocorr, interlayer)
r_pt = ba.LayerRoughness(pt_autocorr, interlayer)
diff --git a/auto/FigExamples/fit/specular/TREFF_Ni_film.py b/auto/FigExamples/fit/specular/TREFF_Ni_film.py
index 69b801eabc7..8f47984d128 100755
--- a/auto/FigExamples/fit/specular/TREFF_Ni_film.py
+++ b/auto/FigExamples/fit/specular/TREFF_Ni_film.py
@@ -28,10 +28,10 @@ def get_sample(P):
# Layers and interfaces
interlayer = ba.TanhInterlayer()
- Ni_autocorr = ba.K_CorrelationModel(P["sigma_Ni"])
+ Ni_autocorr = ba.K_CorrelationModel(P["sigma_Ni"], 0.7, 25*nm)
roughness_Ni = ba.LayerRoughness(Ni_autocorr, interlayer)
- sub_autocorr = ba.K_CorrelationModel(P["sigma_Substrate"])
+ sub_autocorr = ba.K_CorrelationModel(P["sigma_Substrate"], 0.7, 25*nm)
roughness_Substrate = ba.LayerRoughness(sub_autocorr, interlayer)
layer_Ni = ba.Layer(material_Ni_58, P["thickness"], roughness_Ni)
diff --git a/auto/FigExamples/specular/MagneticLayerImperfect.py b/auto/FigExamples/specular/MagneticLayerImperfect.py
index edced923301..d4d8bacb20f 100755
--- a/auto/FigExamples/specular/MagneticLayerImperfect.py
+++ b/auto/FigExamples/specular/MagneticLayerImperfect.py
@@ -19,7 +19,7 @@ def get_sample():
material_Fe = ba.MaterialBySLD("Fe", 8.0241e-06, 6.0448e-10, B)
material_substrate = ba.MaterialBySLD("MgO", 5.9803e-06, 9.3996e-12)
- autocorr = ba.K_CorrelationModel(20*angstrom)
+ autocorr = ba.K_CorrelationModel(20*angstrom, 0.7, 250*angstrom)
interlayer = ba.TanhInterlayer()
roughness = ba.LayerRoughness(autocorr, interlayer)
diff --git a/auto/FigExamples/specular/PolarizedSpinAsymmetry.py b/auto/FigExamples/specular/PolarizedSpinAsymmetry.py
index 51a7201e6ba..2fb6c6ce985 100755
--- a/auto/FigExamples/specular/PolarizedSpinAsymmetry.py
+++ b/auto/FigExamples/specular/PolarizedSpinAsymmetry.py
@@ -47,8 +47,8 @@ def get_sample(P):
material_layer = ba.MaterialBySLD("(Mg,Al,Fe)3O4", P["rho_Mafo"]*1e-6, 0, B)
material_substrate = ba.MaterialBySLD("MgAl2O4", *sldMao)
- r_Mafo_autocorr = ba.K_CorrelationModel(P["r_Mafo"]*angstrom)
- r_sub_autocorr = ba.K_CorrelationModel(P["r_Mao"]*angstrom)
+ r_Mafo_autocorr = ba.K_CorrelationModel(P["r_Mafo"]*angstrom, 0.7, 250*angstrom)
+ r_sub_autocorr = ba.K_CorrelationModel(P["r_Mao"]*angstrom, 0.7, 250*angstrom)
interlayer = ba.TanhInterlayer()
diff --git a/auto/FigExamples/specular/RoughnessModel.py b/auto/FigExamples/specular/RoughnessModel.py
index 72a3a1342d1..b7b7c4efca7 100755
--- a/auto/FigExamples/specular/RoughnessModel.py
+++ b/auto/FigExamples/specular/RoughnessModel.py
@@ -16,7 +16,7 @@ def get_sample(interlayer):
material_substrate = ba.MaterialBySLD("SiSubstrate", 2.0704e-06, 0)
# Roughness
- autocorr = ba.K_CorrelationModel(10*angstrom)
+ autocorr = ba.K_CorrelationModel(10*angstrom, 0.7, 250*angstrom)
roughness = ba.LayerRoughness(autocorr, interlayer)
# create layers
diff --git a/auto/FigExamples/specular/SpecularSimulationWithRoughness.py b/auto/FigExamples/specular/SpecularSimulationWithRoughness.py
index 92323c2379a..8d9cc70eca2 100755
--- a/auto/FigExamples/specular/SpecularSimulationWithRoughness.py
+++ b/auto/FigExamples/specular/SpecularSimulationWithRoughness.py
@@ -16,7 +16,7 @@ def get_sample():
material_substrate = ba.MaterialBySLD("SiSubstrate", 2.0704e-06, 0)
# roughness
- autocorr = ba.K_CorrelationModel(1*nm)
+ autocorr = ba.K_CorrelationModel(1*nm, 0.7, 25*nm)
interlayer = ba.TanhInterlayer()
roughness = ba.LayerRoughness(autocorr, interlayer)
diff --git a/auto/MiniExamples/fit/specular/Honeycomb_fit.py b/auto/MiniExamples/fit/specular/Honeycomb_fit.py
index fee2317e035..d27a4e4c77b 100755
--- a/auto/MiniExamples/fit/specular/Honeycomb_fit.py
+++ b/auto/MiniExamples/fit/specular/Honeycomb_fit.py
@@ -46,11 +46,11 @@ def get_sample(P, sign, T):
interlayer_model = ba.ErfInterlayer()
- rPyOx_autocorr = ba.K_CorrelationModel(P["rPyOx"]*angstrom)
- rPy2_autocorr = ba.K_CorrelationModel(P["rPy2"]*angstrom)
- rPy1_autocorr = ba.K_CorrelationModel(P["rPy1"]*angstrom)
- rSiO2_autocorr = ba.K_CorrelationModel(P["rSiO2"]*angstrom)
- rSi_autocorr = ba.K_CorrelationModel(P["rSi"]*angstrom)
+ rPyOx_autocorr = ba.K_CorrelationModel(P["rPyOx"]*angstrom, 0.7, 250*angstrom)
+ rPy2_autocorr = ba.K_CorrelationModel(P["rPy2"]*angstrom, 0.7, 250*angstrom)
+ rPy1_autocorr = ba.K_CorrelationModel(P["rPy1"]*angstrom, 0.7, 250*angstrom)
+ rSiO2_autocorr = ba.K_CorrelationModel(P["rSiO2"]*angstrom, 0.7, 250*angstrom)
+ rSi_autocorr = ba.K_CorrelationModel(P["rSi"]*angstrom, 0.7, 250*angstrom)
rPyOx = ba.LayerRoughness(rPyOx_autocorr, interlayer_model)
rPy2 = ba.LayerRoughness(rPy2_autocorr, interlayer_model)
diff --git a/auto/MiniExamples/fit/specular/PolarizedSpinAsymmetry.py b/auto/MiniExamples/fit/specular/PolarizedSpinAsymmetry.py
index b80b6280d02..5ac5dc8e239 100755
--- a/auto/MiniExamples/fit/specular/PolarizedSpinAsymmetry.py
+++ b/auto/MiniExamples/fit/specular/PolarizedSpinAsymmetry.py
@@ -46,8 +46,8 @@ def get_sample(P):
material_layer = ba.MaterialBySLD("(Mg,Al,Fe)3O4", P["rho_Mafo"]*1e-6, 0, B)
material_substrate = ba.MaterialBySLD("MgAl2O4", *sldMao)
- r_Mafo_autocorr = ba.K_CorrelationModel(P["r_Mafo"]*angstrom)
- r_substrate_autocorr = ba.K_CorrelationModel(P["r_Mao"]*angstrom)
+ r_Mafo_autocorr = ba.K_CorrelationModel(P["r_Mafo"]*angstrom, 0.7, 250*angstrom)
+ r_substrate_autocorr = ba.K_CorrelationModel(P["r_Mao"]*angstrom, 0.7, 250*angstrom)
interlayer = ba.TanhInterlayer()
diff --git a/auto/MiniExamples/fit/specular/Pt_layer_fit.py b/auto/MiniExamples/fit/specular/Pt_layer_fit.py
index 24bf5f3aa85..b1edb462396 100755
--- a/auto/MiniExamples/fit/specular/Pt_layer_fit.py
+++ b/auto/MiniExamples/fit/specular/Pt_layer_fit.py
@@ -32,8 +32,8 @@ def get_sample(P):
interlayer = ba.TanhInterlayer()
- si_autocorr = ba.K_CorrelationModel(P["r_si/nm"])
- pt_autocorr = ba.K_CorrelationModel(P["r_pt/nm"])
+ si_autocorr = ba.K_CorrelationModel(P["r_si/nm"], 0.7, 250*angstrom)
+ pt_autocorr = ba.K_CorrelationModel(P["r_pt/nm"], 0.7, 250*angstrom)
r_si = ba.LayerRoughness(si_autocorr, interlayer)
r_pt = ba.LayerRoughness(pt_autocorr, interlayer)
diff --git a/auto/MiniExamples/fit/specular/TREFF_Ni_film.py b/auto/MiniExamples/fit/specular/TREFF_Ni_film.py
index ed8088a84f7..6ac5f481d56 100755
--- a/auto/MiniExamples/fit/specular/TREFF_Ni_film.py
+++ b/auto/MiniExamples/fit/specular/TREFF_Ni_film.py
@@ -28,10 +28,10 @@ def get_sample(P):
# Layers and interfaces
interlayer = ba.TanhInterlayer()
- Ni_autocorr = ba.K_CorrelationModel(P["sigma_Ni"])
+ Ni_autocorr = ba.K_CorrelationModel(P["sigma_Ni"], 0.7, 25*nm)
roughness_Ni = ba.LayerRoughness(Ni_autocorr, interlayer)
- sub_autocorr = ba.K_CorrelationModel(P["sigma_Substrate"])
+ sub_autocorr = ba.K_CorrelationModel(P["sigma_Substrate"], 0.7, 25*nm)
roughness_Substrate = ba.LayerRoughness(sub_autocorr, interlayer)
layer_Ni = ba.Layer(material_Ni_58, P["thickness"], roughness_Ni)
diff --git a/auto/MiniExamples/specular/MagneticLayerImperfect.py b/auto/MiniExamples/specular/MagneticLayerImperfect.py
index edced923301..d4d8bacb20f 100755
--- a/auto/MiniExamples/specular/MagneticLayerImperfect.py
+++ b/auto/MiniExamples/specular/MagneticLayerImperfect.py
@@ -19,7 +19,7 @@ def get_sample():
material_Fe = ba.MaterialBySLD("Fe", 8.0241e-06, 6.0448e-10, B)
material_substrate = ba.MaterialBySLD("MgO", 5.9803e-06, 9.3996e-12)
- autocorr = ba.K_CorrelationModel(20*angstrom)
+ autocorr = ba.K_CorrelationModel(20*angstrom, 0.7, 250*angstrom)
interlayer = ba.TanhInterlayer()
roughness = ba.LayerRoughness(autocorr, interlayer)
diff --git a/auto/MiniExamples/specular/PolarizedSpinAsymmetry.py b/auto/MiniExamples/specular/PolarizedSpinAsymmetry.py
index 51a7201e6ba..2fb6c6ce985 100755
--- a/auto/MiniExamples/specular/PolarizedSpinAsymmetry.py
+++ b/auto/MiniExamples/specular/PolarizedSpinAsymmetry.py
@@ -47,8 +47,8 @@ def get_sample(P):
material_layer = ba.MaterialBySLD("(Mg,Al,Fe)3O4", P["rho_Mafo"]*1e-6, 0, B)
material_substrate = ba.MaterialBySLD("MgAl2O4", *sldMao)
- r_Mafo_autocorr = ba.K_CorrelationModel(P["r_Mafo"]*angstrom)
- r_sub_autocorr = ba.K_CorrelationModel(P["r_Mao"]*angstrom)
+ r_Mafo_autocorr = ba.K_CorrelationModel(P["r_Mafo"]*angstrom, 0.7, 250*angstrom)
+ r_sub_autocorr = ba.K_CorrelationModel(P["r_Mao"]*angstrom, 0.7, 250*angstrom)
interlayer = ba.TanhInterlayer()
diff --git a/auto/MiniExamples/specular/RoughnessModel.py b/auto/MiniExamples/specular/RoughnessModel.py
index 49deb3d398e..9b89abd8212 100755
--- a/auto/MiniExamples/specular/RoughnessModel.py
+++ b/auto/MiniExamples/specular/RoughnessModel.py
@@ -16,7 +16,7 @@ def get_sample(interlayer):
material_substrate = ba.MaterialBySLD("SiSubstrate", 2.0704e-06, 0)
# Roughness
- autocorr = ba.K_CorrelationModel(10*angstrom)
+ autocorr = ba.K_CorrelationModel(10*angstrom, 0.7, 250*angstrom)
roughness = ba.LayerRoughness(autocorr, interlayer)
# create layers
diff --git a/auto/MiniExamples/specular/SpecularSimulationWithRoughness.py b/auto/MiniExamples/specular/SpecularSimulationWithRoughness.py
index 5c4fc002d63..f022e089360 100755
--- a/auto/MiniExamples/specular/SpecularSimulationWithRoughness.py
+++ b/auto/MiniExamples/specular/SpecularSimulationWithRoughness.py
@@ -16,7 +16,7 @@ def get_sample():
material_substrate = ba.MaterialBySLD("SiSubstrate", 2.0704e-06, 0)
# roughness
- autocorr = ba.K_CorrelationModel(1*nm)
+ autocorr = ba.K_CorrelationModel(1*nm, 0.7, 25*nm)
interlayer = ba.TanhInterlayer()
roughness = ba.LayerRoughness(autocorr, interlayer)
diff --git a/rawEx/fit/specular/Honeycomb_fit.py b/rawEx/fit/specular/Honeycomb_fit.py
index bcf4127182c..c440577bca2 100755
--- a/rawEx/fit/specular/Honeycomb_fit.py
+++ b/rawEx/fit/specular/Honeycomb_fit.py
@@ -46,11 +46,11 @@ def get_sample(P, sign, T):
interlayer_model = ba.ErfInterlayer()
- rPyOx_autocorr = ba.K_CorrelationModel(P["rPyOx"]*angstrom)
- rPy2_autocorr = ba.K_CorrelationModel(P["rPy2"]*angstrom)
- rPy1_autocorr = ba.K_CorrelationModel(P["rPy1"]*angstrom)
- rSiO2_autocorr = ba.K_CorrelationModel(P["rSiO2"]*angstrom)
- rSi_autocorr = ba.K_CorrelationModel(P["rSi"]*angstrom)
+ rPyOx_autocorr = ba.K_CorrelationModel(P["rPyOx"]*angstrom, 0.7, 250*angstrom)
+ rPy2_autocorr = ba.K_CorrelationModel(P["rPy2"]*angstrom, 0.7, 250*angstrom)
+ rPy1_autocorr = ba.K_CorrelationModel(P["rPy1"]*angstrom, 0.7, 250*angstrom)
+ rSiO2_autocorr = ba.K_CorrelationModel(P["rSiO2"]*angstrom, 0.7, 250*angstrom)
+ rSi_autocorr = ba.K_CorrelationModel(P["rSi"]*angstrom, 0.7, 250*angstrom)
rPyOx = ba.LayerRoughness(rPyOx_autocorr, interlayer_model)
rPy2 = ba.LayerRoughness(rPy2_autocorr, interlayer_model)
diff --git a/rawEx/fit/specular/PolarizedSpinAsymmetry.py b/rawEx/fit/specular/PolarizedSpinAsymmetry.py
index ebde5a32c15..fa9d0cdea72 100755
--- a/rawEx/fit/specular/PolarizedSpinAsymmetry.py
+++ b/rawEx/fit/specular/PolarizedSpinAsymmetry.py
@@ -46,8 +46,8 @@ def get_sample(P):
material_layer = ba.MaterialBySLD("(Mg,Al,Fe)3O4", P["rho_Mafo"]*1e-6, 0, B)
material_substrate = ba.MaterialBySLD("MgAl2O4", *sldMao)
- r_Mafo_autocorr = ba.K_CorrelationModel(P["r_Mafo"]*angstrom)
- r_substrate_autocorr = ba.K_CorrelationModel(P["r_Mao"]*angstrom)
+ r_Mafo_autocorr = ba.K_CorrelationModel(P["r_Mafo"]*angstrom, 0.7, 250*angstrom)
+ r_substrate_autocorr = ba.K_CorrelationModel(P["r_Mao"]*angstrom, 0.7, 250*angstrom)
interlayer = ba.TanhInterlayer()
diff --git a/rawEx/fit/specular/Pt_layer_fit.py b/rawEx/fit/specular/Pt_layer_fit.py
index 76da673f481..a29bc69a088 100755
--- a/rawEx/fit/specular/Pt_layer_fit.py
+++ b/rawEx/fit/specular/Pt_layer_fit.py
@@ -32,8 +32,8 @@ def get_sample(P):
interlayer = ba.TanhInterlayer()
- si_autocorr = ba.K_CorrelationModel(P["r_si/nm"])
- pt_autocorr = ba.K_CorrelationModel(P["r_pt/nm"])
+ si_autocorr = ba.K_CorrelationModel(P["r_si/nm"], 0.7, 250*angstrom)
+ pt_autocorr = ba.K_CorrelationModel(P["r_pt/nm"], 0.7, 250*angstrom)
r_si = ba.LayerRoughness(si_autocorr, interlayer)
r_pt = ba.LayerRoughness(pt_autocorr, interlayer)
diff --git a/rawEx/fit/specular/TREFF_Ni_film.py b/rawEx/fit/specular/TREFF_Ni_film.py
index d99dc2b8a9d..5f437c91d8b 100755
--- a/rawEx/fit/specular/TREFF_Ni_film.py
+++ b/rawEx/fit/specular/TREFF_Ni_film.py
@@ -28,10 +28,10 @@ def get_sample(P):
# Layers and interfaces
interlayer = ba.TanhInterlayer()
- Ni_autocorr = ba.K_CorrelationModel(P["sigma_Ni"])
+ Ni_autocorr = ba.K_CorrelationModel(P["sigma_Ni"], 0.7, 25*nm)
roughness_Ni = ba.LayerRoughness(Ni_autocorr, interlayer)
- sub_autocorr = ba.K_CorrelationModel(P["sigma_Substrate"])
+ sub_autocorr = ba.K_CorrelationModel(P["sigma_Substrate"], 0.7, 25*nm)
roughness_Substrate = ba.LayerRoughness(sub_autocorr, interlayer)
layer_Ni = ba.Layer(material_Ni_58, P["thickness"], roughness_Ni)
diff --git a/rawEx/specular/MagneticLayerImperfect.py b/rawEx/specular/MagneticLayerImperfect.py
index 892cddd1269..7a227be4b33 100755
--- a/rawEx/specular/MagneticLayerImperfect.py
+++ b/rawEx/specular/MagneticLayerImperfect.py
@@ -19,7 +19,7 @@ def get_sample():
material_Fe = ba.MaterialBySLD("Fe", 8.0241e-06, 6.0448e-10, B)
material_substrate = ba.MaterialBySLD("MgO", 5.9803e-06, 9.3996e-12)
- autocorr = ba.K_CorrelationModel(20*angstrom)
+ autocorr = ba.K_CorrelationModel(20*angstrom, 0.7, 250*angstrom)
interlayer = ba.TanhInterlayer()
roughness = ba.LayerRoughness(autocorr, interlayer)
diff --git a/rawEx/specular/PolarizedSpinAsymmetry.py b/rawEx/specular/PolarizedSpinAsymmetry.py
index 1297a8969d9..5e6e92c3aed 100755
--- a/rawEx/specular/PolarizedSpinAsymmetry.py
+++ b/rawEx/specular/PolarizedSpinAsymmetry.py
@@ -47,8 +47,8 @@ def get_sample(P):
material_layer = ba.MaterialBySLD("(Mg,Al,Fe)3O4", P["rho_Mafo"]*1e-6, 0, B)
material_substrate = ba.MaterialBySLD("MgAl2O4", *sldMao)
- r_Mafo_autocorr = ba.K_CorrelationModel(P["r_Mafo"]*angstrom)
- r_sub_autocorr = ba.K_CorrelationModel(P["r_Mao"]*angstrom)
+ r_Mafo_autocorr = ba.K_CorrelationModel(P["r_Mafo"]*angstrom, 0.7, 250*angstrom)
+ r_sub_autocorr = ba.K_CorrelationModel(P["r_Mao"]*angstrom, 0.7, 250*angstrom)
interlayer = ba.TanhInterlayer()
diff --git a/rawEx/specular/RoughnessModel.py b/rawEx/specular/RoughnessModel.py
index 90905aa67c6..3267f3b02d9 100755
--- a/rawEx/specular/RoughnessModel.py
+++ b/rawEx/specular/RoughnessModel.py
@@ -16,7 +16,7 @@ def get_sample(interlayer):
material_substrate = ba.MaterialBySLD("SiSubstrate", 2.0704e-06, 0)
# Roughness
- autocorr = ba.K_CorrelationModel(10*angstrom)
+ autocorr = ba.K_CorrelationModel(10*angstrom, 0.7, 250*angstrom)
roughness = ba.LayerRoughness(autocorr, interlayer)
# create layers
diff --git a/rawEx/specular/SpecularSimulationWithRoughness.py b/rawEx/specular/SpecularSimulationWithRoughness.py
index 1cd1319c263..3ebda63f5ab 100755
--- a/rawEx/specular/SpecularSimulationWithRoughness.py
+++ b/rawEx/specular/SpecularSimulationWithRoughness.py
@@ -16,7 +16,7 @@ def get_sample():
material_substrate = ba.MaterialBySLD("SiSubstrate", 2.0704e-06, 0)
# roughness
- autocorr = ba.K_CorrelationModel(1*nm)
+ autocorr = ba.K_CorrelationModel(1*nm, 0.7, 25*nm)
interlayer = ba.TanhInterlayer()
roughness = ba.LayerRoughness(autocorr, interlayer)
--
GitLab