test: remove subfolder structure ang. dist. tests

ComPWA · Jan 5, 2021 · 21c6ab8 · 21c6ab8
1 parent c89a11c
commit 21c6ab8
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 8 deletions.
diff --git a/tests/physics/helicity_formalism/angular_distributions/.gitignore b/tests/physics/helicity_formalism/angular_distributions/.gitignore
@@ -0,0 +1 @@
+!*.yml
diff --git a/tests/physics/helicity_formalism/angular_distributions/d1_to_d0_pi_pi_decay/__init__.py b/tests/physics/helicity_formalism/angular_distributions/d1_to_d0_pi_pi_decay/__init__.py
diff --git a/tests/physics/helicity_formalism/angular_distributions/epem_to_dm_d0_pip_decay/__init__.py b/tests/physics/helicity_formalism/angular_distributions/epem_to_dm_d0_pip_decay/__init__.py
diff --git a/...1_to_d0_pi_pi_decay/test_distributions.py → ...ular_distributions/test_d1_to_d0_pi_pi.py b/...1_to_d0_pi_pi_decay/test_distributions.py → ...ular_distributions/test_d1_to_d0_pi_pi.py
@@ -7,6 +7,10 @@
 import numpy as np
 import pytest
 
+SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
+SCRIPT_NAME = os.path.basename(__file__)
+SCRIPT_NAME = os.path.splitext(SCRIPT_NAME)[0]
+
 
 # Use this function to reproduce the model file.
 # Note the normalization part has been removed!
@@ -27,7 +31,7 @@ def generate_model() -> None:
     generator = HelicityAmplitudeGenerator()
     amplitude_model = generator.generate(result)
     amplitude_model.dynamics.set_non_dynamic("D*(2010)+")
-    write(amplitude_model, "model.yml")
+    write(amplitude_model, f"{SCRIPT_NAME}.yml")
 
 
 # Use this function to reproduce the theoretical predictions.
@@ -98,9 +102,8 @@ def calculate_integral(
 def intensity_dataset(
     generate_dataset: Callable,
 ) -> np.ndarray:
-    thisdirectory = os.path.dirname(os.path.realpath(__file__))
     return generate_dataset(
-        model_filename=thisdirectory + "/model.yml",
+        model_filename=f"{SCRIPT_DIR}/{SCRIPT_NAME}.yml",
         events=30000,
     )
 

diff --git a/...tributions/d1_to_d0_pi_pi_decay/model.yml → ...lar_distributions/test_d1_to_d0_pi_pi.yml b/...tributions/d1_to_d0_pi_pi_decay/model.yml → ...lar_distributions/test_d1_to_d0_pi_pi.yml
diff --git a/..._to_dm_d0_pip_decay/test_distributions.py → ...r_distributions/test_epem_to_dm_d0_pip.py b/..._to_dm_d0_pip_decay/test_distributions.py → ...r_distributions/test_epem_to_dm_d0_pip.py
@@ -8,6 +8,10 @@
 import numpy as np
 import pytest
 
+SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
+SCRIPT_NAME = os.path.basename(__file__)
+SCRIPT_NAME = os.path.splitext(SCRIPT_NAME)[0]
+
 
 # Use this function to reproduce the model file.
 # Note the normalization part has been removed!
@@ -41,7 +45,7 @@ def generate_model() -> None:
     generator = HelicityAmplitudeGenerator()
     amplitude_model = generator.generate(result)
     amplitude_model.dynamics.set_non_dynamic("D(2)*(2460)+")
-    write(amplitude_model, "model.yml")
+    write(amplitude_model, f"{SCRIPT_NAME}.yml")
 
 
 # Use this function to reproduce the theoretical predictions.
@@ -110,9 +114,8 @@ def calculate_integral(
 def intensity_dataset(
     generate_dataset: Callable,
 ) -> np.ndarray:
-    thisdirectory = os.path.dirname(os.path.realpath(__file__))
     return generate_dataset(
-        model_filename=thisdirectory + "/model.yml",
+        model_filename=f"{SCRIPT_DIR}/{SCRIPT_NAME}.yml",
         events=50000,
     )
 

diff --git a/...butions/epem_to_dm_d0_pip_decay/model.yml → ..._distributions/test_epem_to_dm_d0_pip.yml b/...butions/epem_to_dm_d0_pip_decay/model.yml → ..._distributions/test_epem_to_dm_d0_pip.yml