+ new demo scatter2d/RoughAndSpecular.py

auto/Examples/fit/scatter2d/expfit_galaxi.py

@@ -96,7 +96,7 @@ def create_detector(beam):
     """
     nx = pilatus_npx
     ny = pilatus_npy
-    return ba.Detector2D(3.4*deg, 1.84*deg, nx, ny, 0, 0.92*deg)
+    return ba.Detector2D(3.4*deg, 1.84*deg, nx, ny, 0, 0.32*deg)
 
 
 def create_simulation(P):

auto/Examples/scatter2d/RoughAndSpecular.py

+#!/usr/bin/env python3
+import bornagain as ba
+from bornagain import ba_plot as bp, deg, nm
+
+def get_sample():
+    # Define materials
+    material_HMDSO = ba.RefractiveMaterial("HMDSO", 2.0888e-06, 1.3261e-08)
+    material_PTFE = ba.RefractiveMaterial("PTFE", 5.20509e-06, 1.9694e-08)
+    material_Si = ba.RefractiveMaterial("Si", 5.7816e-06, 1.0229e-07)
+    material_Vacuum = ba.RefractiveMaterial("Vacuum", 0.0, 0.0)
+
+    # Define roughness
+    roughness_1 = ba.LayerRoughness(1.1, 0.3, 5*nm)
+    roughness_2 = ba.LayerRoughness(2.3, 0.3, 5*nm)
+
+    # Define layers
+    layer_1 = ba.Layer(material_Vacuum)
+    layer_2 = ba.Layer(material_HMDSO, 18.5*nm)
+    layer_3 = ba.Layer(material_PTFE, 22.1*nm)
+    layer_4 = ba.Layer(material_Si)
+
+    # Define sample
+    sample = ba.MultiLayer()
+    sample.addLayer(layer_1)
+    sample.addLayerWithTopRoughness(layer_2, roughness_1)
+    sample.addLayerWithTopRoughness(layer_3, roughness_2)
+    sample.addLayer(layer_4)
+
+    return sample
+
+
+def get_simulation(sample):
+    beam = ba.Beam(1e9, 0.1*nm, 0.4*deg)
+    n = 200
+    detector = ba.Detector2D(4*deg, 2*deg, n, n, 0, .4*deg)
+    detector.setResolutionFunction(
+        ba.ResolutionFunction2DGaussian(0.02*deg, 0.02*deg))
+    simulation = ba.ScatteringSimulation(beam, sample, detector)
+    simulation.options().setUseAvgMaterials(True)
+    simulation.options().setIncludeSpecular(True)
+    return simulation
+
+
+if __name__ == '__main__':
+    sample = get_sample()
+    simulation = get_simulation(sample)
+    result = simulation.simulate()
+    bp.plot_simulation_result(result)
+    bp.show_or_export()

auto/MiniExamples/fit/scatter2d/expfit_galaxi.py

@@ -96,7 +96,7 @@ def create_detector(beam):
     """
     nx = pilatus_npx
     ny = pilatus_npy
-    return ba.Detector2D(3.4*deg, 1.84*deg, nx, ny, 0, 0.92*deg)
+    return ba.Detector2D(3.4*deg, 1.84*deg, nx, ny, 0, 0.32*deg)
 
 
 def create_simulation(P):

auto/MiniExamples/scatter2d/RoughAndSpecular.py

+#!/usr/bin/env python3
+import bornagain as ba
+from bornagain import ba_plot as bp, deg, nm
+
+def get_sample():
+    # Define materials
+    material_HMDSO = ba.RefractiveMaterial("HMDSO", 2.0888e-06, 1.3261e-08)
+    material_PTFE = ba.RefractiveMaterial("PTFE", 5.20509e-06, 1.9694e-08)
+    material_Si = ba.RefractiveMaterial("Si", 5.7816e-06, 1.0229e-07)
+    material_Vacuum = ba.RefractiveMaterial("Vacuum", 0.0, 0.0)
+
+    # Define roughness
+    roughness_1 = ba.LayerRoughness(1.1, 0.3, 5*nm)
+    roughness_2 = ba.LayerRoughness(2.3, 0.3, 5*nm)
+
+    # Define layers
+    layer_1 = ba.Layer(material_Vacuum)
+    layer_2 = ba.Layer(material_HMDSO, 18.5*nm)
+    layer_3 = ba.Layer(material_PTFE, 22.1*nm)
+    layer_4 = ba.Layer(material_Si)
+
+    # Define sample
+    sample = ba.MultiLayer()
+    sample.addLayer(layer_1)
+    sample.addLayerWithTopRoughness(layer_2, roughness_1)
+    sample.addLayerWithTopRoughness(layer_3, roughness_2)
+    sample.addLayer(layer_4)
+
+    return sample
+
+
+def get_simulation(sample):
+    beam = ba.Beam(1e9, 0.1*nm, 0.4*deg)
+    n = 11
+    detector = ba.Detector2D(4*deg, 2*deg, n, n, 0, .4*deg)
+    detector.setResolutionFunction(
+        ba.ResolutionFunction2DGaussian(0.02*deg, 0.02*deg))
+    simulation = ba.ScatteringSimulation(beam, sample, detector)
+    simulation.options().setUseAvgMaterials(True)
+    simulation.options().setIncludeSpecular(True)
+    return simulation
+
+
+if __name__ == '__main__':
+    sample = get_sample()
+    simulation = get_simulation(sample)
+    result = simulation.simulate()
+    bp.plot_simulation_result(result)
+    bp.show_or_export()

rawEx/scatter2d/RoughAndSpecular.py

+#!/usr/bin/env python3
+import bornagain as ba
+from bornagain import ba_plot as bp, deg, nm
+
+def get_sample():
+    # Define materials
+    material_HMDSO = ba.RefractiveMaterial("HMDSO", 2.0888e-06, 1.3261e-08)
+    material_PTFE = ba.RefractiveMaterial("PTFE", 5.20509e-06, 1.9694e-08)
+    material_Si = ba.RefractiveMaterial("Si", 5.7816e-06, 1.0229e-07)
+    material_Vacuum = ba.RefractiveMaterial("Vacuum", 0.0, 0.0)
+
+    # Define roughness
+    roughness_1 = ba.LayerRoughness(1.1, 0.3, 5*nm)
+    roughness_2 = ba.LayerRoughness(2.3, 0.3, 5*nm)
+
+    # Define layers
+    layer_1 = ba.Layer(material_Vacuum)
+    layer_2 = ba.Layer(material_HMDSO, 18.5*nm)
+    layer_3 = ba.Layer(material_PTFE, 22.1*nm)
+    layer_4 = ba.Layer(material_Si)
+
+    # Define sample
+    sample = ba.MultiLayer()
+    sample.addLayer(layer_1)
+    sample.addLayerWithTopRoughness(layer_2, roughness_1)
+    sample.addLayerWithTopRoughness(layer_3, roughness_2)
+    sample.addLayer(layer_4)
+
+    return sample
+
+
+def get_simulation(sample):
+    beam = ba.Beam(1e9, 0.1*nm, 0.4*deg)
+    n = <%= sm ? 11 : 200 %>
+    detector = ba.Detector2D(4*deg, 2*deg, n, n, 0, .4*deg)
+    detector.setResolutionFunction(
+        ba.ResolutionFunction2DGaussian(0.02*deg, 0.02*deg))
+    simulation = ba.ScatteringSimulation(beam, sample, detector)
+    simulation.options().setUseAvgMaterials(True)
+    simulation.options().setIncludeSpecular(True)
+    return simulation
+
+
+if __name__ == '__main__':
+    sample = get_sample()
+    simulation = get_simulation(sample)
+    result = simulation.simulate()
+    bp.plot_simulation_result(result)
+    bp.show_or_export()