From 327ce91b05652c59904577d31cb7c1f459e9769b Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Thu, 10 Dec 2020 13:07:53 +0100
Subject: [PATCH] corrections after renaming of examples => PASS
---
.../{varia => specular}/BasicSpecularSimulation.py | 0
.../{varia => specular}/BeamAngularDivergence.py | 0
.../{varia => specular}/BeamFullDivergence.py | 0
.../{varia => specular}/TOFRWithResolution.py | 0
.../TimeOfFlightReflectometry.py | 0
.../genx_angular_divergence.dat.gz | Bin
Tests/Functional/Python/PyExamples/CMakeLists.txt | 3 ++-
.../Functional/Python/PyPersistence/CMakeLists.txt | 11 ++++++-----
.../Python/PyPersistence/PyPersistence.py.in | 2 +-
9 files changed, 9 insertions(+), 7 deletions(-)
rename Examples/Python/{varia => specular}/BasicSpecularSimulation.py (100%)
rename Examples/Python/{varia => specular}/BeamAngularDivergence.py (100%)
rename Examples/Python/{varia => specular}/BeamFullDivergence.py (100%)
rename Examples/Python/{varia => specular}/TOFRWithResolution.py (100%)
rename Examples/Python/{varia => specular}/TimeOfFlightReflectometry.py (100%)
rename Examples/Python/{varia => specular}/genx_angular_divergence.dat.gz (100%)
diff --git a/Examples/Python/varia/BasicSpecularSimulation.py b/Examples/Python/specular/BasicSpecularSimulation.py
similarity index 100%
rename from Examples/Python/varia/BasicSpecularSimulation.py
rename to Examples/Python/specular/BasicSpecularSimulation.py
diff --git a/Examples/Python/varia/BeamAngularDivergence.py b/Examples/Python/specular/BeamAngularDivergence.py
similarity index 100%
rename from Examples/Python/varia/BeamAngularDivergence.py
rename to Examples/Python/specular/BeamAngularDivergence.py
diff --git a/Examples/Python/varia/BeamFullDivergence.py b/Examples/Python/specular/BeamFullDivergence.py
similarity index 100%
rename from Examples/Python/varia/BeamFullDivergence.py
rename to Examples/Python/specular/BeamFullDivergence.py
diff --git a/Examples/Python/varia/TOFRWithResolution.py b/Examples/Python/specular/TOFRWithResolution.py
similarity index 100%
rename from Examples/Python/varia/TOFRWithResolution.py
rename to Examples/Python/specular/TOFRWithResolution.py
diff --git a/Examples/Python/varia/TimeOfFlightReflectometry.py b/Examples/Python/specular/TimeOfFlightReflectometry.py
similarity index 100%
rename from Examples/Python/varia/TimeOfFlightReflectometry.py
rename to Examples/Python/specular/TimeOfFlightReflectometry.py
diff --git a/Examples/Python/varia/genx_angular_divergence.dat.gz b/Examples/Python/specular/genx_angular_divergence.dat.gz
similarity index 100%
rename from Examples/Python/varia/genx_angular_divergence.dat.gz
rename to Examples/Python/specular/genx_angular_divergence.dat.gz
diff --git a/Tests/Functional/Python/PyExamples/CMakeLists.txt b/Tests/Functional/Python/PyExamples/CMakeLists.txt
index 36e00632eb0..2889530f354 100644
--- a/Tests/Functional/Python/PyExamples/CMakeLists.txt
+++ b/Tests/Functional/Python/PyExamples/CMakeLists.txt
@@ -10,11 +10,12 @@ file(MAKE_DIRECTORY ${output_dir})
file(GLOB examples
${PY_EXAMPLES_DIR}/scatter2d/*.py
+ ${PY_EXAMPLES_DIR}/specular/*.py
${PY_EXAMPLES_DIR}/varia/*.py
${PY_EXAMPLES_DIR}/fit55_Specular/FitSpecularBasics.py)
if (WIN32)
# Convergence problem in Gauss-Kronrod integration
- list(REMOVE_ITEM examples ${PY_EXAMPLES_DIR}/sim03_Structures/Interference2DParaCrystal.py)
+ list(REMOVE_ITEM examples ${PY_EXAMPLES_DIR}/scatter2d/Interference2DParaCrystal.py)
endif()
set(test_script ${TOOL_DIR}/code-tools/batch-plot.py)
diff --git a/Tests/Functional/Python/PyPersistence/CMakeLists.txt b/Tests/Functional/Python/PyPersistence/CMakeLists.txt
index 4df473168a4..f1405493439 100644
--- a/Tests/Functional/Python/PyPersistence/CMakeLists.txt
+++ b/Tests/Functional/Python/PyPersistence/CMakeLists.txt
@@ -52,13 +52,14 @@ test_example(scatter2d/SpheresAtHexLattice 2e-10)
test_example(scatter2d/TriangularRipple 2e-10)
test_example(scatter2d/TwoTypesOfCylindersWithSizeDistribution 2e-10)
-test_example(varia/BasicSpecularSimulation 2e-10)
-test_example(varia/BeamAngularDivergence 2e-10)
-test_example(varia/BeamFullDivergence 2e-10)
+test_example(specular/BasicSpecularSimulation 2e-10)
+test_example(specular/BeamAngularDivergence 2e-10)
+test_example(specular/BeamFullDivergence 2e-10)
+test_example(specular/TOFRWithResolution 2e-10)
+test_example(specular/TimeOfFlightReflectometry 2e-10)
+
test_example(varia/CustomFormFactor 2e-10)
test_example(varia/DepthProbe 2e-10)
test_example(varia/Interference1DLattice 1.5)
test_example(varia/OffSpecularSimulation 2e-10)
test_example(varia/SimulationParameters 2e-10)
-test_example(varia/TOFRWithResolution 2e-10)
-test_example(varia/TimeOfFlightReflectometry 2e-10)
diff --git a/Tests/Functional/Python/PyPersistence/PyPersistence.py.in b/Tests/Functional/Python/PyPersistence/PyPersistence.py.in
index a2b1d365be5..6db266e67f9 100644
--- a/Tests/Functional/Python/PyPersistence/PyPersistence.py.in
+++ b/Tests/Functional/Python/PyPersistence/PyPersistence.py.in
@@ -78,7 +78,7 @@ def get_minified_simulation():
"""
Returns a simulation constructed from example simulation with smaller detector.
"""
- if "sim21_Reflectometry" in EXAMPLE_DIR:
+ if "specular" in EXAMPLE_DIR:
return get_simulation_SpecularSimulation()
elif EXAMPLE_NAME == "RectangularGrating":
--
GitLab