diff --git a/Examples/python/simulation/ex06_Reflectometry/TimeOfFlightReflectometry.py b/Examples/python/simulation/ex06_Reflectometry/TimeOfFlightReflectometry.py index 41e3111f50602fecdfb5b8b0ffa646dd243c9dde..75d997344e7203531cb87ee2a0a6f6f61d23e490 100644 --- a/Examples/python/simulation/ex06_Reflectometry/TimeOfFlightReflectometry.py +++ b/Examples/python/simulation/ex06_Reflectometry/TimeOfFlightReflectometry.py @@ -13,8 +13,6 @@ import numpy as np import bornagain as ba from bornagain import angstrom -qzs = np.linspace(0.01, 1.0, 500, dtype=float) # qz-values - def get_sample(): """ @@ -44,27 +42,29 @@ def get_sample(): return multi_layer -def get_simulation(): +def get_simulation(scan_size=500): """ Defines and returns specular simulation with a qz-defined beam """ + qzs = np.linspace(0.01, 1.0, scan_size, dtype=float) # qz-values scan = ba.QSpecScan(qzs) simulation = ba.SpecularSimulation() simulation.setScan(scan) return simulation -def run_simulation(simulation): +def run_simulation(): """ Runs simulation and returns its result. """ sample = get_sample() + simulation = get_simulation() simulation.setSample(sample) simulation.runSimulation() return simulation.result() if __name__ == '__main__': - result = run_simulation(get_simulation()) + result = run_simulation() ba.plot_simulation_result(result) diff --git a/Tests/Functional/Python/PyPersistence/CMakeLists.txt b/Tests/Functional/Python/PyPersistence/CMakeLists.txt index 18c2b8530fcd7f6877124ea7c5511f2c24327d2c..90b26b4371c7cdd6bccceab7c114992c3102e005 100644 --- a/Tests/Functional/Python/PyPersistence/CMakeLists.txt +++ b/Tests/Functional/Python/PyPersistence/CMakeLists.txt @@ -59,6 +59,7 @@ test_example("simulation/ex05_BeamAndDetector/ConstantBackground" 2e-10) test_example("simulation/ex06_Reflectometry/BasicSpecularSimulation" 2e-10) test_example("simulation/ex06_Reflectometry/BeamAngularDivergence" 2e-10) test_example("simulation/ex06_Reflectometry/BeamFullDivergence" 2e-10) +test_example("simulation/ex06_Reflectometry/TimeOfFlightReflectometry" 2e-10) test_example("simulation/ex07_Miscellaneous/CylindersInAverageLayer" 2e-10) test_example("simulation/ex07_Miscellaneous/DepthProbe" 2e-10) diff --git a/Tests/ReferenceData/Python/TimeOfFlightReflectometry.int.gz b/Tests/ReferenceData/Python/TimeOfFlightReflectometry.int.gz new file mode 100644 index 0000000000000000000000000000000000000000..14cf9685e10e264b8d7ec060602e2637428e1ceb Binary files /dev/null and b/Tests/ReferenceData/Python/TimeOfFlightReflectometry.int.gz differ