normalize scatter2d: use ba.run_and_plot

Examples/scatter2d/ApproximationDA.py

@@ -51,20 +51,12 @@ def get_sample():
     return sample
 
 
-def get_simulation():
+def get_simulation(sample):
     beam = ba.Beam(1.0, 0.1*nm, ba.Direction(0.2*deg, 0*deg))
     detector = ba.SphericalDetector(200, 2*deg, 1*deg, 1*deg)
-
-    simulation = ba.GISASSimulation(beam, get_sample(), detector)
+    simulation = ba.GISASSimulation(beam, sample, detector)
     return simulation
 
 
-def run_simulation():
-    simulation = get_simulation()
-    simulation.runSimulation()
-    return simulation.result()
-
-
 if __name__ == '__main__':
-    result = run_simulation()
-    ba.plot_simulation_result(result)
+    ba.run_and_plot(get_simulation(get_sample()))

Examples/scatter2d/ApproximationLMA.py

@@ -59,20 +59,12 @@ def get_sample():
     return sample
 
 
-def get_simulation():
+def get_simulation(sample):
     beam = ba.Beam(1.0, 0.1*nm, ba.Direction(0.2*deg, 0*deg))
     detector = ba.SphericalDetector(200, 2*deg, 1*deg, 1*deg)
-
-    simulation = ba.GISASSimulation(beam, get_sample(), detector)
+    simulation = ba.GISASSimulation(beam, sample, detector)
     return simulation
 
 
-def run_simulation():
-    simulation = get_simulation()
-    simulation.runSimulation()
-    return simulation.result()
-
-
 if __name__ == '__main__':
-    result = run_simulation()
-    ba.plot_simulation_result(result)
+    ba.run_and_plot(get_simulation(get_sample()))

Examples/scatter2d/ApproximationSSCA.py

@@ -52,20 +52,12 @@ def get_sample():
     return sample
 
 
-def get_simulation():
+def get_simulation(sample):
     beam = ba.Beam(1.0, 0.1*nm, ba.Direction(0.2*deg, 0*deg))
     detector = ba.SphericalDetector(200, 2*deg, 1*deg, 1*deg)
-
-    simulation = ba.GISASSimulation(beam, get_sample(), detector)
+    simulation = ba.GISASSimulation(beam, sample, detector)
     return simulation
 
 
-def run_simulation():
-    simulation = get_simulation()
-    simulation.runSimulation()
-    return simulation.result()
-
-
 if __name__ == '__main__':
-    result = run_simulation()
-    ba.plot_simulation_result(result)
+    ba.run_and_plot(get_simulation(get_sample()))

Examples/scatter2d/BeamDivergence.py

@@ -41,11 +41,10 @@ def get_sample():
     return sample
 
 
-def get_simulation():
+def get_simulation(sample):
     beam = ba.Beam(1.0, 0.1*nm, ba.Direction(0.2*deg, 0*deg))
     detector = ba.SphericalDetector(100, 2*deg, 1*deg, 1*deg)
-
-    simulation = ba.GISASSimulation(beam, get_sample(), detector)
+    simulation = ba.GISASSimulation(beam, sample, detector)
     distr_1 = ba.DistributionLogNormal(0.1*nm, 0.1)
     simulation.addParameterDistribution("*/Beam/Wavelength", distr_1, 5, 0.0)
     distr_2 = ba.DistributionGaussian(0.2*deg, 0.1*deg)
@@ -57,12 +56,5 @@ def get_simulation():
     return simulation
 
 
-def run_simulation():
-    simulation = get_simulation()
-    simulation.runSimulation()
-    return simulation.result()
-
-
 if __name__ == '__main__':
-    result = run_simulation()
-    ba.plot_simulation_result(result)
+    ba.run_and_plot(get_simulation(get_sample()))

Examples/scatter2d/BiMaterialCylinders.py

@@ -57,20 +57,12 @@ def get_sample():
     return sample
 
 
-def get_simulation():
+def get_simulation(sample):
     beam = ba.Beam(100000000.0, 0.1*nm, ba.Direction(0.2*deg, 0*deg))
     detector = ba.SphericalDetector(100, 2*deg, 0*deg, 1*deg)
-
-    simulation = ba.GISASSimulation(beam, get_sample(), detector)
+    simulation = ba.GISASSimulation(beam, sample, detector)
     return simulation
 
 
-def run_simulation():
-    simulation = get_simulation()
-    simulation.runSimulation()
-    return simulation.result()
-
-
 if __name__ == '__main__':
-    result = run_simulation()
-    ba.plot_simulation_result(result)
+    ba.run_and_plot(get_simulation(get_sample()))

Examples/scatter2d/BoxesWithSpecularPeak.py

@@ -50,22 +50,14 @@ def get_sample():
     return sample
 
 
-def get_simulation():
+def get_simulation(sample):
     beam = ba.Beam(1.0, 0.1*nm, ba.Direction(0.2*deg, 0*deg))
     detector = ba.SphericalDetector(101, -2*deg, 2*deg, 101, 0*deg, 2*deg)
-
-    simulation = ba.GISASSimulation(beam, get_sample(), detector)
+    simulation = ba.GISASSimulation(beam, sample, detector)
     simulation.getOptions().setUseAvgMaterials(True)
     simulation.getOptions().setIncludeSpecular(True)
     return simulation
 
 
-def run_simulation():
-    simulation = get_simulation()
-    simulation.runSimulation()
-    return simulation.result()
-
-
 if __name__ == '__main__':
-    result = run_simulation()
-    ba.plot_simulation_result(result)
+    ba.run_and_plot(get_simulation(get_sample()))

Examples/scatter2d/BuriedParticles.py

@@ -48,20 +48,12 @@ def get_sample():
     return sample
 
 
-def get_simulation():
+def get_simulation(sample):
     beam = ba.Beam(1.0, 0.15*nm, ba.Direction(0.15*deg, 0*deg))
     detector = ba.SphericalDetector(200, 2*deg, 0*deg, 1*deg)
-
-    simulation = ba.GISASSimulation(beam, get_sample(), detector)
+    simulation = ba.GISASSimulation(beam, sample, detector)
     return simulation
 
 
-def run_simulation():
-    simulation = get_simulation()
-    simulation.runSimulation()
-    return simulation.result()
-
-
 if __name__ == '__main__':
-    result = run_simulation()
-    ba.plot_simulation_result(result)
+    ba.run_and_plot(get_simulation(get_sample()))

Examples/scatter2d/ConstantBackground.py

@@ -41,22 +41,14 @@ def get_sample():
     return sample
 
 
-def get_simulation():
+def get_simulation(sample):
     beam = ba.Beam(1000000.0, 0.1*nm, ba.Direction(0.2*deg, 0*deg))
     detector = ba.SphericalDetector(100, 2*deg, 1*deg, 1*deg)
-
-    simulation = ba.GISASSimulation(beam, get_sample(), detector)
+    simulation = ba.GISASSimulation(beam, sample, detector)
     background = ba.ConstantBackground(1.0e+03)
     simulation.setBackground(background)
     return simulation
 
 
-def run_simulation():
-    simulation = get_simulation()
-    simulation.runSimulation()
-    return simulation.result()
-
-
 if __name__ == '__main__':
-    result = run_simulation()
-    ba.plot_simulation_result(result)
+    ba.run_and_plot(get_simulation(get_sample()))

Examples/scatter2d/CoreShellNanoparticles.py

@@ -48,20 +48,12 @@ def get_sample():
     return sample
 
 
-def get_simulation():
+def get_simulation(sample):
     beam = ba.Beam(1.0, 0.1*nm, ba.Direction(0.2*deg, 0*deg))
     detector = ba.SphericalDetector(200, 2*deg, 0*deg, 1*deg)
-
-    simulation = ba.GISASSimulation(beam, get_sample(), detector)
+    simulation = ba.GISASSimulation(beam, sample, detector)
     return simulation
 
 
-def run_simulation():
-    simulation = get_simulation()
-    simulation.runSimulation()
-    return simulation.result()
-
-
 if __name__ == '__main__':
-    result = run_simulation()
-    ba.plot_simulation_result(result)
+    ba.run_and_plot(get_simulation(get_sample()))

Examples/scatter2d/CorrelatedRoughness.py

@@ -43,20 +43,12 @@ def get_sample():
     return my_sample
 
 
-def get_simulation():
+def get_simulation(sample):
     beam = ba.Beam(500000000000.0, 0.1*nm, ba.Direction(0.2*deg, 0*deg))
     detector = ba.SphericalDetector(200, 1*deg, 0*deg, 0.5*deg)
-
-    simulation = ba.GISASSimulation(beam, get_sample(), detector)
+    simulation = ba.GISASSimulation(beam, sample, detector)
     return simulation
 
 
-def run_simulation():
-    simulation = get_simulation()
-    simulation.runSimulation()
-    return simulation.result()
-
-
 if __name__ == '__main__':
-    result = run_simulation()
-    ba.plot_simulation_result(result)
+    ba.run_and_plot(get_simulation(get_sample()))

Examples/scatter2d/CosineRipplesAtRectLattice.py

@@ -51,20 +51,12 @@ def get_sample():
     return sample
 
 
-def get_simulation():
+def get_simulation(sample):
     beam = ba.Beam(1.0, 0.16*nm, ba.Direction(0.3*deg, 0*deg))
     detector = ba.SphericalDetector(100, -1.5*deg, 1.5*deg, 100, 0*deg, 2.5*deg)
-
-    simulation = ba.GISASSimulation(beam, get_sample(), detector)
+    simulation = ba.GISASSimulation(beam, sample, detector)
     return simulation
 
 
-def run_simulation():
-    simulation = get_simulation()
-    simulation.runSimulation()
-    return simulation.result()
-
-
 if __name__ == '__main__':
-    result = run_simulation()
-    ba.plot_simulation_result(result)
+    ba.run_and_plot(get_simulation(get_sample()))

Examples/scatter2d/CylindersAndPrisms.py

@@ -48,20 +48,12 @@ def get_sample():
     return sample
 
 
-def get_simulation():
+def get_simulation(sample):
     beam = ba.Beam(1.0, 0.1*nm, ba.Direction(0.2*deg, 0*deg))
     detector = ba.SphericalDetector(100, 2*deg, 0*deg, 1*deg)
-
-    simulation = ba.GISASSimulation(beam, get_sample(), detector)
+    simulation = ba.GISASSimulation(beam, sample, detector)
     return simulation
 
 
-def run_simulation():
-    simulation = get_simulation()
-    simulation.runSimulation()
-    return simulation.result()
-
-
 if __name__ == '__main__':
-    result = run_simulation()
-    ba.plot_simulation_result(result)
+    ba.run_and_plot(get_simulation(get_sample()))

Examples/scatter2d/CylindersInAverageLayer.py

@@ -42,21 +42,13 @@ def get_sample(cyl_height=5*nm):
     return multi_layer
 
 
-def get_simulation():
+def get_simulation(sample):
     beam = ba.Beam(1.0, 0.1*nm, ba.Direction(0.2*deg, 0*deg))
     detector = ba.SphericalDetector(100, -2*deg, 2*deg, 100, 0*deg, 2*deg)
-
-    simulation = ba.GISASSimulation(beam, get_sample(), detector)
+    simulation = ba.GISASSimulation(beam, sample, detector)
     simulation.getOptions().setUseAvgMaterials(True)
     return simulation
 
 
-def run_simulation():
-    simulation = get_simulation()
-    simulation.runSimulation()
-    return simulation.result()
-
-
 if __name__ == '__main__':
-    result = run_simulation()
-    ba.plot_simulation_result(result)
+    ba.run_and_plot(get_simulation(get_sample()))

Examples/scatter2d/CylindersInBA.py

@@ -39,20 +39,12 @@ def get_sample():
     return sample
 
 
-def get_simulation():
+def get_simulation(sample):
     beam = ba.Beam(1.0, 0.1*nm, ba.Direction(0.2*deg, 0*deg))
     detector = ba.SphericalDetector(200, -2*deg, 2*deg, 200, 0*deg, 2*deg)
-
-    simulation = ba.GISASSimulation(beam, get_sample(), detector)
+    simulation = ba.GISASSimulation(beam, sample, detector)
     return simulation
 
 
-def run_simulation():
-    simulation = get_simulation()
-    simulation.runSimulation()
-    return simulation.result()
-
-
 if __name__ == '__main__':
-    result = run_simulation()
-    ba.plot_simulation_result(result)
+    ba.run_and_plot(get_simulation(get_sample()))

Examples/scatter2d/CylindersInDWBA.py

@@ -41,20 +41,12 @@ def get_sample():
     return sample
 
 
-def get_simulation():
+def get_simulation(sample):
     beam = ba.Beam(1.0, 0.1*nm, ba.Direction(0.2*deg, 0*deg))
     detector = ba.SphericalDetector(200, -2*deg, 2*deg, 200, 0*deg, 2*deg)
-
-    simulation = ba.GISASSimulation(beam, get_sample(), detector)
+    simulation = ba.GISASSimulation(beam, sample, detector)
     return simulation
 
 
-def run_simulation():
-    simulation = get_simulation()
-    simulation.runSimulation()
-    return simulation.result()
-
-
 if __name__ == '__main__':
-    result = run_simulation()
-    ba.plot_simulation_result(result)
+    ba.run_and_plot(get_simulation(get_sample()))

Examples/scatter2d/CylindersWithSizeDistribution.py

@@ -45,20 +45,12 @@ def get_sample():
     return sample
 
 
-def get_simulation():
+def get_simulation(sample):
     beam = ba.Beam(1.0, 0.1*nm, ba.Direction(0.2*deg, 0*deg))
     detector = ba.SphericalDetector(200, 2*deg, 1*deg, 1*deg)
-
-    simulation = ba.GISASSimulation(beam, get_sample(), detector)
+    simulation = ba.GISASSimulation(beam, sample, detector)
     return simulation
 
 
-def run_simulation():
-    simulation = get_simulation()
-    simulation.runSimulation()
-    return simulation.result()
-
-
 if __name__ == '__main__':
-    result = run_simulation()
-    ba.plot_simulation_result(result)
+    ba.run_and_plot(get_simulation(get_sample()))

Examples/scatter2d/DetectorResolutionFunction.py

@@ -41,22 +41,14 @@ def get_sample():
     return sample
 
 
-def get_simulation():
+def get_simulation(sample):
     beam = ba.Beam(1.0, 0.1*nm, ba.Direction(0.2*deg, 0*deg))
     detector = ba.SphericalDetector(100, 2*deg, 1*deg, 1*deg)
-
-    simulation = ba.GISASSimulation(beam, get_sample(), detector)
+    simulation = ba.GISASSimulation(beam, sample, detector)
     simulation.setDetectorResolutionFunction(
         ba.ResolutionFunction2DGaussian(0.02*deg, 0.02*deg))
     return simulation
 
 
-def run_simulation():
-    simulation = get_simulation()
-    simulation.runSimulation()
-    return simulation.result()
-
-
 if __name__ == '__main__':
-    result = run_simulation()
-    ba.plot_simulation_result(result)
+    ba.run_and_plot(get_simulation(get_sample()))

Examples/scatter2d/HalfSpheresInAverageTopLayer.py

@@ -52,21 +52,13 @@ def get_sample():
     return sample
 
 
-def get_simulation():
+def get_simulation(sample):
     beam = ba.Beam(1.0, 0.1*nm, ba.Direction(0.2*deg, 0*deg))
     detector = ba.SphericalDetector(100, -2*deg, 2*deg, 100, 0*deg, 2*deg)
-
-    simulation = ba.GISASSimulation(beam, get_sample(), detector)
+    simulation = ba.GISASSimulation(beam, sample, detector)
     simulation.getOptions().setUseAvgMaterials(True)
     return simulation
 
 
-def run_simulation():
-    simulation = get_simulation()
-    simulation.runSimulation()
-    return simulation.result()
-
-
 if __name__ == '__main__':
-    result = run_simulation()
-    ba.plot_simulation_result(result)
+    ba.run_and_plot(get_simulation(get_sample()))

Examples/scatter2d/HexagonalLatticesWithBasis.py

@@ -60,20 +60,12 @@ def get_sample():
     return sample
 
 
-def get_simulation():
+def get_simulation(sample):
     beam = ba.Beam(1.0, 0.1*nm, ba.Direction(0.2*deg, 0*deg))
     detector = ba.SphericalDetector(200, -1*deg, 1*deg, 200, 0*deg, 1*deg)
-
-    simulation = ba.GISASSimulation(beam, get_sample(), detector)
+    simulation = ba.GISASSimulation(beam, sample, detector)
     return simulation
 
 
-def run_simulation():
-    simulation = get_simulation()
-    simulation.runSimulation()
-    return simulation.result()
-
-
 if __name__ == '__main__':
-    result = run_simulation()
-    ba.plot_simulation_result(result)
+    ba.run_and_plot(get_simulation(get_sample()))

Examples/scatter2d/Interference1DRadialParaCrystal.py

@@ -47,20 +47,12 @@ def get_sample():
     return sample
 
 
-def get_simulation():
+def get_simulation(sample):
     beam = ba.Beam(1.0, 0.1*nm, ba.Direction(0.2*deg, 0*deg))
     detector = ba.SphericalDetector(200, -2*deg, 2*deg, 200, 0*deg, 2*deg)
-
-    simulation = ba.GISASSimulation(beam, get_sample(), detector)
+    simulation = ba.GISASSimulation(beam, sample, detector)
     return simulation
 
 
-def run_simulation():
-    simulation = get_simulation()
-    simulation.runSimulation()
-    return simulation.result()
-
-
 if __name__ == '__main__':
-    result = run_simulation()
-    ba.plot_simulation_result(result)
+    ba.run_and_plot(get_simulation(get_sample()))