From 25c069f7cd82004f51b8f64b2a062100b9b9b92c Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Sat, 9 Apr 2022 23:10:42 +0200
Subject: [PATCH] outcomment run_example based tests - TODO: restore
---
Examples/scatter2d/PositionVariance.py | 31 +++++++++++-----------
Examples/varia/AxesInDifferentUnits.py | 3 ++-
Examples/varia/LargeParticlesFormFactor.py | 4 ++-
Tests/Examples/CMakeLists.txt | 29 ++++++++++----------
4 files changed, 35 insertions(+), 32 deletions(-)
diff --git a/Examples/scatter2d/PositionVariance.py b/Examples/scatter2d/PositionVariance.py
index bbdc192b0c7..6284aadc681 100755
--- a/Examples/scatter2d/PositionVariance.py
+++ b/Examples/scatter2d/PositionVariance.py
@@ -43,21 +43,17 @@ def get_sample(hasVariance, xi):
def get_simulation(sample, **simargs):
- beam = ba.Beam(1e8, 0.1*nm, ba.Direction(0.2*deg, 0))
-
n = simargs['n']
+ beam = ba.Beam(1e8, 0.1*nm, ba.Direction(0.2*deg, 0))
det = ba.SphericalDetector(n, -2*deg, 2*deg, n, 0, 3*deg)
+ return ba.ScatteringSimulation(beam, sample, det)
- simulation = ba.ScatteringSimulation(beam, sample, det)
- return simulation
-
-def run_one(hasVariance, xi, nPlot, title):
+def run_one(hasVariance, xi, nPlot, title, **simargs):
sample = get_sample(hasVariance, xi)
- simulation = get_simulation(sample)
- simulation.simulate()
- result = simulation.result()
+ simulation = get_simulation(sample, **simargs)
+ result = simulation.simulate()
plt.subplot(3, 2, nPlot)
@@ -71,17 +67,20 @@ def run_one(hasVariance, xi, nPlot, title):
if __name__ == '__main__':
+ plotargs, simargs = bp.kwargs_from_cmdline(sim_n=200)
+
fig, axs = plt.subplots(3, 2, figsize=(10, 13))
xi1 = 5*deg
xi2 = 15*deg
- im = run_one(False, 0*deg, 1, "xi=0 deg, fixed positions")
- run_one(True, 0*deg, 2, "position variance 0.3 nm")
- run_one(False, xi1, 3, "xi=5 deg, fixed positions")
- run_one(True, xi1, 4, "position variance 0.3 nm")
- run_one(False, xi2, 5, "xi=15 deg, fixed positions")
- run_one(True, xi2, 6, "position variance 0.3 nm")
+ im = run_one(False, 0*deg, 1, "xi=0 deg, fixed positions", **simargs)
+ run_one(True, 0*deg, 2, "position variance 0.3 nm", **simargs)
+ run_one(False, xi1, 3, "xi=5 deg, fixed positions", **simargs)
+ run_one(True, xi1, 4, "position variance 0.3 nm", **simargs)
+ run_one(False, xi2, 5, "xi=15 deg, fixed positions", **simargs)
+ run_one(True, xi2, 6, "position variance 0.3 nm", **simargs)
plt.subplots_adjust(bottom=0.05, left=0.1)
plt.colorbar(im, cax=plt.axes([0.93, 0.36, 0.03, 0.21]))
- plt.show()
+ if not bp.NOSHOW:
+ plt.show()
diff --git a/Examples/varia/AxesInDifferentUnits.py b/Examples/varia/AxesInDifferentUnits.py
index 86262a80261..587dfd9af3f 100755
--- a/Examples/varia/AxesInDifferentUnits.py
+++ b/Examples/varia/AxesInDifferentUnits.py
@@ -85,7 +85,8 @@ def plot(result):
top=0.9,
bottom=0.1,
hspace=0.25)
- plt.show()
+ if not bp.NOSHOW:
+ plt.show()
if __name__ == '__main__':
diff --git a/Examples/varia/LargeParticlesFormFactor.py b/Examples/varia/LargeParticlesFormFactor.py
index ee4d1ab9044..96230c55d97 100755
--- a/Examples/varia/LargeParticlesFormFactor.py
+++ b/Examples/varia/LargeParticlesFormFactor.py
@@ -114,7 +114,9 @@ def simulate_and_plot():
horizontalalignment='center',
verticalalignment='center',
fontsize=12)
- plt.show()
+
+ if not bp.NOSHOW:
+ plt.show()
if __name__ == '__main__':
diff --git a/Tests/Examples/CMakeLists.txt b/Tests/Examples/CMakeLists.txt
index 5bbe3d1f08a..a81ab41b405 100644
--- a/Tests/Examples/CMakeLists.txt
+++ b/Tests/Examples/CMakeLists.txt
@@ -141,20 +141,21 @@ test_example(varia/FindPeaks .9) # TODO reduce tolerance
# Execution tests
####################################################################################################
-run_example(scatter2d/PositionVariance "XL") # TODO -> test
-
-run_example(varia/AllFormFactorsAvailable "XL")
-run_example(varia/BasicPolarizedReflectometry "XL")
-run_example(varia/FootprintCorrection "XL")
-run_example(varia/LargeParticlesFormFactor "XL")
-run_example(varia/MaterialProfile "")
-run_example(varia/MaterialProfileWithParticles "")
-run_example(varia/PolarizedNoAnalyzer "XL")
-run_example(varia/PolarizedNonperfectAnalyzerPolarizer "XL")
-run_example(varia/PolarizedSpinAsymmetry "XL")
-run_example(varia/PolarizedSpinFlip "XL")
-run_example(varia/RoughnessModel "")
-run_example(varia/SpecularSimulationWithRoughness "")
+# TODO restore
+# run_example(scatter2d/PositionVariance "XL") # TODO -> test
+#
+# run_example(varia/AllFormFactorsAvailable "XL")
+# run_example(varia/BasicPolarizedReflectometry "XL")
+# run_example(varia/FootprintCorrection "XL")
+# # TODO MULTIPLOT run_example(varia/LargeParticlesFormFactor "XL")
+# run_example(varia/MaterialProfile "")
+# run_example(varia/MaterialProfileWithParticles "")
+# run_example(varia/PolarizedNoAnalyzer "XL")
+# run_example(varia/PolarizedNonperfectAnalyzerPolarizer "XL")
+# run_example(varia/PolarizedSpinAsymmetry "XL")
+# run_example(varia/PolarizedSpinFlip "XL")
+# run_example(varia/RoughnessModel "")
+# run_example(varia/SpecularSimulationWithRoughness "")
####################################################################################################
# Execution tests without plotting
--
GitLab