Merge pull request #508 from OpenCOMPES/src_layout

Src layout
OpenCOMPES · Nov 12, 2024 · 1b7b926 · 1b7b926
2 parents d26654b + 0d1b805
commit 1b7b926
Show file tree

Hide file tree

Showing 74 changed files with 68 additions and 66 deletions.
diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
@@ -5,7 +5,7 @@ on:
     branches: [ main ]
     tags: [ v* ]
     paths:
-      - sed/**/*
+      - src/sed/**/*
       - tutorial/**
       - .github/workflows/documentation.yml
   # Allows you to run this workflow manually from the Actions tab
@@ -50,7 +50,7 @@ jobs:
       - name: copy tutorial files to docs
         run: |
           cp -r $GITHUB_WORKSPACE/tutorial $GITHUB_WORKSPACE/docs/
-          cp -r $GITHUB_WORKSPACE/sed/config $GITHUB_WORKSPACE/docs/sed
+          cp -r $GITHUB_WORKSPACE/config $GITHUB_WORKSPACE/docs/
 
       - name: download RAW data
         # if: steps.cache-primes.outputs.cache-hit != 'true'

diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml
@@ -25,15 +25,15 @@ jobs:
       # Linting steps, execute all linters even if one fails
       - name: ruff
         run:
-          poetry run ruff sed tests
+          poetry run ruff src/sed tests
       - name: ruff formatting
         if: ${{ always() }}
         run:
-          poetry run ruff format --check sed tests
+          poetry run ruff format --check src/sed tests
       - name: mypy
         if: ${{ always() }}
         run:
-          poetry run mypy sed tests
+          poetry run mypy src/sed tests
       - name: spellcheck
         if: ${{ always() }}
         uses: streetsidesoftware/cspell-action@v6

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -13,7 +13,7 @@ on:
     tags:
       - v[0-9]+.[0-9]+.[0-9]+
     paths:
-      - sed/**/*
+      - src/sed/**/*
       - .github/workflows/release.yml
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:

diff --git a/benchmarks/benchmark_sed.py b/benchmarks/benchmark_sed.py
@@ -35,7 +35,7 @@
 test_data_dir = os.path.join(package_dir, "..", "tests", "data")
 runs = {"generic": None, "mpes": ["30", "50"], "flash": ["43878"], "sxp": ["0016"]}
 
-targets = load_config(package_dir + "/../benchmarks/benchmark_targets.yaml")
+targets = load_config(package_dir + "/../../benchmarks/benchmark_targets.yaml")
 
 
 def test_binning_1d() -> None:
@@ -59,7 +59,7 @@ def test_binning_1d() -> None:
     if np.mean(result) < 0.8 * targets["binning_1d"]:
         print(f"Updating targets for 'binning_1d' to {float(np.mean(result))}")
         targets["binning_1d"] = float(np.mean(result))
-        save_config(targets, package_dir + "/../benchmarks/benchmark_targets.yaml")
+        save_config(targets, package_dir + "/../../benchmarks/benchmark_targets.yaml")
 
 
 def test_binning_4d() -> None:
@@ -83,14 +83,14 @@ def test_binning_4d() -> None:
     if np.mean(result) < 0.8 * targets["binning_4d"]:
         print(f"Updating targets for 'binning_4d' to {float(np.mean(result))}")
         targets["binning_4d"] = float(np.mean(result))
-        save_config(targets, package_dir + "/../benchmarks/benchmark_targets.yaml")
+        save_config(targets, package_dir + "/../../benchmarks/benchmark_targets.yaml")
 
 
 def test_splinewarp() -> None:
     """Run a benchmark for the generation of the inverse dfield correction"""
     processor = SedProcessor(
         dataframe=dataframe.copy(),
-        config=package_dir + "/config/mpes_example_config.yaml",
+        config=package_dir + "/../../config/mpes_example_config.yaml",
         folder_config={},
         user_config={},
         system_config={},
@@ -109,14 +109,14 @@ def test_splinewarp() -> None:
     if np.mean(result) < 0.8 * targets["inv_dfield"]:
         print(f"Updating targets for 'inv_dfield' to {float(np.mean(result))}")
         targets["inv_dfield"] = float(np.mean(result))
-        save_config(targets, package_dir + "/../benchmarks/benchmark_targets.yaml")
+        save_config(targets, package_dir + "/../../benchmarks/benchmark_targets.yaml")
 
 
 def test_workflow_1d() -> None:
     """Run a benchmark for 1d binning of converted data"""
     processor = SedProcessor(
         dataframe=dataframe.copy(),
-        config=package_dir + "/config/mpes_example_config.yaml",
+        config=package_dir + "/../../config/mpes_example_config.yaml",
         folder_config={},
         user_config={},
         system_config={},
@@ -145,14 +145,14 @@ def test_workflow_1d() -> None:
     if np.mean(result) < 0.8 * targets["workflow_1d"]:
         print(f"Updating targets for 'workflow_1d' to {float(np.mean(result))}")
         targets["workflow_1d"] = float(np.mean(result))
-        save_config(targets, package_dir + "/../benchmarks/benchmark_targets.yaml")
+        save_config(targets, package_dir + "/../../benchmarks/benchmark_targets.yaml")
 
 
 def test_workflow_4d() -> None:
     """Run a benchmark for 4d binning of converted data"""
     processor = SedProcessor(
         dataframe=dataframe.copy(),
-        config=package_dir + "/config/mpes_example_config.yaml",
+        config=package_dir + "/../../config/mpes_example_config.yaml",
         folder_config={},
         user_config={},
         system_config={},
@@ -181,7 +181,7 @@ def test_workflow_4d() -> None:
     if np.mean(result) < 0.8 * targets["workflow_4d"]:
         print(f"Updating targets for 'workflow_4d' to {float(np.mean(result))}")
         targets["workflow_4d"] = float(np.mean(result))
-        save_config(targets, package_dir + "/../benchmarks/benchmark_targets.yaml")
+        save_config(targets, package_dir + "/../../benchmarks/benchmark_targets.yaml")
 
 
 @pytest.mark.parametrize("loader", get_all_loaders())
@@ -210,4 +210,4 @@ def test_loader_compute(loader: BaseLoader) -> None:
                 f"to {float(np.mean(result))}",
             )
             targets[f"loader_compute_{loader_name}"] = float(np.mean(result))
-            save_config(targets, package_dir + "/../benchmarks/benchmark_targets.yaml")
+            save_config(targets, package_dir + "/../../benchmarks/benchmark_targets.yaml")
diff --git a/sed/config/NXmpes_config.json → config/NXmpes_config.json b/sed/config/NXmpes_config.json → config/NXmpes_config.json
diff --git a/sed/dataset/datasets.json → config/datasets.json b/sed/dataset/datasets.json → config/datasets.json
diff --git a/sed/config/default.yaml → config/default.yaml b/sed/config/default.yaml → config/default.yaml
diff --git a/sed/config/flash_example_config.yaml → config/flash_example_config.yaml b/sed/config/flash_example_config.yaml → config/flash_example_config.yaml
diff --git a/sed/config/mpes_example_config.yaml → config/mpes_example_config.yaml b/sed/config/mpes_example_config.yaml → config/mpes_example_config.yaml
@@ -310,4 +310,4 @@ nexus:
   definition: "NXmpes"
   # List containing additional input files to be handed to the pynxtools converter tool,
   # e.g. containing a configuration file, and additional metadata.
-  input_files: ["../sed/config/NXmpes_config.json"]
+  input_files: ["../config/NXmpes_config.json"]
diff --git a/sed/config/sxp_example_config.yaml → config/sxp_example_config.yaml b/sed/config/sxp_example_config.yaml → config/sxp_example_config.yaml
diff --git a/docs/scripts/build_flash_parquets.py b/docs/scripts/build_flash_parquets.py
@@ -1,10 +1,12 @@
-from pathlib import Path
+import os
+from importlib.util import find_spec
 
-import sed
 from sed import SedProcessor
 from sed.dataset import dataset
 
-config_file = Path(sed.__file__).parent / "config/flash_example_config.yaml"
+package_dir = os.path.dirname(find_spec("sed").origin)
+
+config_file = package_dir + "/../../config/flash_example_config.yaml"
 
 dataset.get("Gd_W110", root_dir="./tutorial")
 data_path = dataset.dir

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,8 +1,7 @@
 [tool.poetry]
 name = "sed-processor"
-packages = [
-    {include = "sed"}
-]
+packages = [{include = "sed", from = "src"}]
+include = ["config"]
 version = "1.0.0a0"
 description = "Single Event Data Frame Processor: Backend to handle photoelectron resolved datastreams"
 authors = ["OpenCOMPES team <[email protected]>"]
@@ -84,7 +83,7 @@ omit = [
 ]
 
 [tool.ruff]
-include = ["sed/*.py", "tests/*.py"]
+include = ["src/*.py", "tests/*.py"]
 lint.select = [
     "E", # pycodestyle
     "W", # pycodestyle

diff --git a/sed/__init__.py → src/sed/__init__.py b/sed/__init__.py → src/sed/__init__.py
diff --git a/sed/binning/__init__.py → src/sed/binning/__init__.py b/sed/binning/__init__.py → src/sed/binning/__init__.py
diff --git a/sed/binning/binning.py → src/sed/binning/binning.py b/sed/binning/binning.py → src/sed/binning/binning.py
diff --git a/sed/binning/numba_bin.py → src/sed/binning/numba_bin.py b/sed/binning/numba_bin.py → src/sed/binning/numba_bin.py
diff --git a/sed/binning/utils.py → src/sed/binning/utils.py b/sed/binning/utils.py → src/sed/binning/utils.py
diff --git a/sed/calibrator/__init__.py → src/sed/calibrator/__init__.py b/sed/calibrator/__init__.py → src/sed/calibrator/__init__.py
diff --git a/sed/calibrator/delay.py → src/sed/calibrator/delay.py b/sed/calibrator/delay.py → src/sed/calibrator/delay.py
diff --git a/sed/calibrator/energy.py → src/sed/calibrator/energy.py b/sed/calibrator/energy.py → src/sed/calibrator/energy.py
diff --git a/sed/calibrator/momentum.py → src/sed/calibrator/momentum.py b/sed/calibrator/momentum.py → src/sed/calibrator/momentum.py
diff --git a/sed/core/__init__.py → src/sed/core/__init__.py b/sed/core/__init__.py → src/sed/core/__init__.py
diff --git a/sed/core/config.py → src/sed/core/config.py b/sed/core/config.py → src/sed/core/config.py
@@ -12,7 +12,7 @@
 import yaml
 from platformdirs import user_config_path
 
-from sed.config.config_model import ConfigModel
+from sed.core.config_model import ConfigModel
 from sed.core.logging import setup_logging
 
 package_dir = os.path.dirname(find_spec("sed").origin)
@@ -28,7 +28,7 @@ def parse_config(
     folder_config: dict | str = None,
     user_config: dict | str = None,
     system_config: dict | str = None,
-    default_config: (dict | str) = f"{package_dir}/config/default.yaml",
+    default_config: (dict | str) = f"{package_dir}/../../config/default.yaml",
     verbose: bool = True,
     verify_config: bool = True,
 ) -> dict:

diff --git a/sed/config/config_model.py → src/sed/core/config_model.py b/sed/config/config_model.py → src/sed/core/config_model.py
diff --git a/sed/core/dfops.py → src/sed/core/dfops.py b/sed/core/dfops.py → src/sed/core/dfops.py
diff --git a/sed/core/logging.py → src/sed/core/logging.py b/sed/core/logging.py → src/sed/core/logging.py
diff --git a/sed/core/metadata.py → src/sed/core/metadata.py b/sed/core/metadata.py → src/sed/core/metadata.py
diff --git a/sed/core/processor.py → src/sed/core/processor.py b/sed/core/processor.py → src/sed/core/processor.py
diff --git a/sed/dataset/__init__.py → src/sed/dataset/__init__.py b/sed/dataset/__init__.py → src/sed/dataset/__init__.py
diff --git a/sed/dataset/dataset.py → src/sed/dataset/dataset.py b/sed/dataset/dataset.py → src/sed/dataset/dataset.py
@@ -32,7 +32,7 @@ class DatasetsManager:
     FILENAME = NAME + ".json"
     json_path = {}
     json_path["user"] = os.path.join(USER_CONFIG_PATH, FILENAME)
-    json_path["module"] = os.path.join(os.path.dirname(__file__), FILENAME)
+    json_path["module"] = os.path.join(os.path.dirname(__file__), "../../../config", FILENAME)
     json_path["folder"] = "./" + FILENAME
 
     @staticmethod

diff --git a/sed/diagnostics.py → src/sed/diagnostics.py b/sed/diagnostics.py → src/sed/diagnostics.py
diff --git a/sed/io/__init__.py → src/sed/io/__init__.py b/sed/io/__init__.py → src/sed/io/__init__.py
diff --git a/sed/io/hdf5.py → src/sed/io/hdf5.py b/sed/io/hdf5.py → src/sed/io/hdf5.py
diff --git a/sed/io/nexus.py → src/sed/io/nexus.py b/sed/io/nexus.py → src/sed/io/nexus.py
diff --git a/sed/io/tiff.py → src/sed/io/tiff.py b/sed/io/tiff.py → src/sed/io/tiff.py
diff --git a/sed/loader/__init__.py → src/sed/loader/__init__.py b/sed/loader/__init__.py → src/sed/loader/__init__.py
diff --git a/sed/loader/base/README.md → src/sed/loader/base/README.md b/sed/loader/base/README.md → src/sed/loader/base/README.md
diff --git a/sed/loader/base/__init__.py → src/sed/loader/base/__init__.py b/sed/loader/base/__init__.py → src/sed/loader/base/__init__.py
diff --git a/sed/loader/base/loader.py → src/sed/loader/base/loader.py b/sed/loader/base/loader.py → src/sed/loader/base/loader.py
diff --git a/sed/loader/flash/__init__.py → src/sed/loader/flash/__init__.py b/sed/loader/flash/__init__.py → src/sed/loader/flash/__init__.py
diff --git a/sed/loader/flash/buffer_handler.py → src/sed/loader/flash/buffer_handler.py b/sed/loader/flash/buffer_handler.py → src/sed/loader/flash/buffer_handler.py
diff --git a/sed/loader/flash/dataframe.py → src/sed/loader/flash/dataframe.py b/sed/loader/flash/dataframe.py → src/sed/loader/flash/dataframe.py
diff --git a/sed/loader/flash/instruments.py → src/sed/loader/flash/instruments.py b/sed/loader/flash/instruments.py → src/sed/loader/flash/instruments.py
diff --git a/sed/loader/flash/loader.py → src/sed/loader/flash/loader.py b/sed/loader/flash/loader.py → src/sed/loader/flash/loader.py
diff --git a/sed/loader/flash/metadata.py → src/sed/loader/flash/metadata.py b/sed/loader/flash/metadata.py → src/sed/loader/flash/metadata.py
diff --git a/sed/loader/flash/utils.py → src/sed/loader/flash/utils.py b/sed/loader/flash/utils.py → src/sed/loader/flash/utils.py
diff --git a/sed/loader/generic/__init__.py → src/sed/loader/generic/__init__.py b/sed/loader/generic/__init__.py → src/sed/loader/generic/__init__.py
diff --git a/sed/loader/generic/loader.py → src/sed/loader/generic/loader.py b/sed/loader/generic/loader.py → src/sed/loader/generic/loader.py
diff --git a/sed/loader/loader_interface.py → src/sed/loader/loader_interface.py b/sed/loader/loader_interface.py → src/sed/loader/loader_interface.py
diff --git a/sed/loader/mirrorutil.py → src/sed/loader/mirrorutil.py b/sed/loader/mirrorutil.py → src/sed/loader/mirrorutil.py
diff --git a/sed/loader/mpes/__init__.py → src/sed/loader/mpes/__init__.py b/sed/loader/mpes/__init__.py → src/sed/loader/mpes/__init__.py
diff --git a/sed/loader/mpes/loader.py → src/sed/loader/mpes/loader.py b/sed/loader/mpes/loader.py → src/sed/loader/mpes/loader.py
diff --git a/sed/loader/sxp/__init__.py → src/sed/loader/sxp/__init__.py b/sed/loader/sxp/__init__.py → src/sed/loader/sxp/__init__.py
diff --git a/sed/loader/sxp/loader.py → src/sed/loader/sxp/loader.py b/sed/loader/sxp/loader.py → src/sed/loader/sxp/loader.py
diff --git a/sed/loader/utils.py → src/sed/loader/utils.py b/sed/loader/utils.py → src/sed/loader/utils.py
diff --git a/tests/calibrator/test_delay.py b/tests/calibrator/test_delay.py
@@ -16,7 +16,7 @@
 from sed.loader.loader_interface import get_loader
 
 package_dir = os.path.dirname(find_spec("sed").origin)
-file = package_dir + "/../tests/data/loader/mpes/Scan0030_2.h5"
+file = package_dir + "/../../tests/data/loader/mpes/Scan0030_2.h5"
 
 
 def test_delay_parameters_from_file() -> None:

diff --git a/tests/calibrator/test_energy.py b/tests/calibrator/test_energy.py
@@ -22,8 +22,8 @@
 from sed.loader.loader_interface import get_loader
 
 package_dir = os.path.dirname(find_spec("sed").origin)
-df_folder = package_dir + "/../tests/data/loader/mpes/"
-folder = package_dir + "/../tests/data/calibrator/"
+df_folder = package_dir + "/../../tests/data/loader/mpes/"
+folder = package_dir + "/../../tests/data/calibrator/"
 files = glob.glob(df_folder + "*.h5")
 
 traces_list = []

diff --git a/tests/calibrator/test_momentum.py b/tests/calibrator/test_momentum.py
@@ -18,8 +18,8 @@
 
 # pylint: disable=duplicate-code
 package_dir = os.path.dirname(find_spec("sed").origin)
-df_folder = package_dir + "/../tests/data/loader/mpes/"
-folder = package_dir + "/../tests/data/calibrator/"
+df_folder = package_dir + "/../../tests/data/loader/mpes/"
+folder = package_dir + "/../../tests/data/calibrator/"
 files = glob.glob(df_folder + "*.h5")
 
 momentum_map_list = []

diff --git a/tests/loader/flash/conftest.py b/tests/loader/flash/conftest.py
@@ -11,7 +11,7 @@
 from sed.core.config import parse_config
 
 package_dir = os.path.dirname(find_spec("sed").origin)
-config_path = os.path.join(package_dir, "../tests/data/loader/flash/config.yaml")
+config_path = os.path.join(package_dir, "../../tests/data/loader/flash/config.yaml")
 H5_PATH = "FLASH1_USER3_stream_2_run43878_file1_20230130T153807.1.h5"
 H5_PATHS = [H5_PATH, "FLASH1_USER3_stream_2_run43879_file1_20230130T153807.1.h5"]
 
@@ -45,7 +45,7 @@ def fixture_h5_file() -> h5py.File:
     Returns:
         h5py.File: The open h5 file.
     """
-    return h5py.File(os.path.join(package_dir, f"../tests/data/loader/flash/{H5_PATH}"), "r")
+    return h5py.File(os.path.join(package_dir, f"../../tests/data/loader/flash/{H5_PATH}"), "r")
 
 
 @pytest.fixture(name="h5_file_copy")
@@ -56,7 +56,7 @@ def fixture_h5_file_copy(tmp_path: Path) -> h5py.File:
         h5py.File: The open h5 file copy.
     """
     # Create a copy of the h5 file in a temporary directory
-    original_file_path = os.path.join(package_dir, f"../tests/data/loader/flash/{H5_PATH}")
+    original_file_path = os.path.join(package_dir, f"../../tests/data/loader/flash/{H5_PATH}")
     copy_file_path = tmp_path / "copy.h5"
     shutil.copyfile(original_file_path, copy_file_path)
 
@@ -72,7 +72,7 @@ def fixture_h5_file2_copy(tmp_path: Path) -> h5py.File:
         h5py.File: The open h5 file copy.
     """
     # Create a copy of the h5 file in a temporary directory
-    original_file_path = os.path.join(package_dir, f"../tests/data/loader/flash/{H5_PATHS[1]}")
+    original_file_path = os.path.join(package_dir, f"../../tests/data/loader/flash/{H5_PATHS[1]}")
     copy_file_path = tmp_path / "copy2.h5"
     shutil.copyfile(original_file_path, copy_file_path)
 
@@ -88,5 +88,6 @@ def fixture_h5_paths() -> list[Path]:
         list: A list of h5 file paths.
     """
     return [
-        Path(os.path.join(package_dir, f"../tests/data/loader/flash/{path}")) for path in H5_PATHS
+        Path(os.path.join(package_dir, f"../../tests/data/loader/flash/{path}"))
+        for path in H5_PATHS
     ]
diff --git a/tests/loader/mpes/test_mpes_loader.py b/tests/loader/mpes/test_mpes_loader.py
@@ -13,7 +13,7 @@
 
 package_dir = os.path.dirname(find_spec("sed").origin)
 
-test_data_dir = os.path.join(package_dir, "..", "tests", "data", "loader", "mpes")
+test_data_dir = os.path.join(package_dir, "../../tests/data/loader/mpes")
 
 config = parse_config(
     os.path.join(test_data_dir, "config.yaml"),

diff --git a/tests/loader/sxp/test_sxp_loader.py b/tests/loader/sxp/test_sxp_loader.py
@@ -11,7 +11,7 @@
 from sed.loader.sxp.loader import SXPLoader
 
 package_dir = os.path.dirname(find_spec("sed").origin)
-config_path = os.path.join(package_dir, "../tests/data/loader/sxp/config.yaml")
+config_path = os.path.join(package_dir, "../../tests/data/loader/sxp/config.yaml")
 H5_PATH = "RAW-R0016-DA03-S00000.h5"
 
 

diff --git a/tests/loader/test_loaders.py b/tests/loader/test_loaders.py
@@ -21,7 +21,7 @@
 
 package_dir = os.path.dirname(find_spec("sed").origin)
 
-test_data_dir = os.path.join(package_dir, "..", "tests", "data")
+test_data_dir = os.path.join(package_dir, "../../tests/data")
 
 read_types = ["one_file", "files", "one_folder", "folders", "one_run", "runs"]
 runs = {"generic": None, "mpes": ["30", "50"], "flash": ["43878", "43878"], "sxp": ["0016", "0016"]}

diff --git a/tests/loader/test_mirrorutil.py b/tests/loader/test_mirrorutil.py
@@ -16,9 +16,9 @@
 
 
 package_dir = os.path.dirname(find_spec("sed").origin)
-source_folder = package_dir + "/../"
-folder = package_dir + "/../tests/data/loader/mpes"
-file = package_dir + "/../tests/data/loader/mpes/Scan0030_2.h5"
+source_folder = package_dir + "/../../"
+folder = package_dir + "/../../tests/data/loader/mpes"
+file = package_dir + "/../../tests/data/loader/mpes/Scan0030_2.h5"
 
 
 def test_copy_tool_folder() -> None:

diff --git a/tests/test_config.py b/tests/test_config.py
@@ -92,18 +92,18 @@ def test_load_does_not_modify() -> None:
 def test_load_config() -> None:
     """Test if the config loader can handle json and yaml files."""
     config_json = load_config(
-        f"{package_dir}/../tests/data/config/config.json",
+        f"{package_dir}/../../tests/data/config/config.json",
     )
     config_yaml = load_config(
-        f"{package_dir}/../tests/data/config/config.yaml",
+        f"{package_dir}/../../tests/data/config/config.yaml",
     )
     assert config_json == config_yaml
 
 
 def test_load_config_raise() -> None:
     """Test if the config loader raises an error for a wrong file type."""
     with pytest.raises(TypeError):
-        load_config(f"{package_dir}/../README.md")
+        load_config(f"{package_dir}/../../README.md")
 
 
 def test_complete_dictionary() -> None:

diff --git a/tests/test_dataset.py b/tests/test_dataset.py
@@ -15,7 +15,7 @@
 from sed.dataset import DatasetsManager as dm
 
 package_dir = os.path.dirname(find_spec("sed").origin)
-json_path = os.path.join(package_dir, "datasets.json")
+json_path = os.path.join(package_dir, "../../config/datasets.json")
 
 
 @pytest.fixture
@@ -120,7 +120,7 @@ def test_rearrange_data(zip_file):  # noqa: ARG001
     ds._rearrange_data()
     assert os.path.exists("test/datasets/Test/test_file.txt")
     assert os.path.exists("test/datasets/Test/test_subdir.txt")
-    assert ~os.path.exists("test/datasets/Test/subdir")
+    assert not os.path.exists("test/datasets/Test/subdir")
 
     with pytest.raises(FileNotFoundError):
         ds._subdirs = ["non_existing_subdir"]

diff --git a/tests/test_diagnostics.py b/tests/test_diagnostics.py
@@ -15,11 +15,11 @@
 
 #  pylint: disable=duplicate-code
 package_dir = os.path.dirname(find_spec("sed").origin)
-df_folder = package_dir + "/../tests/data/loader/mpes/"
-folder = package_dir + "/../tests/data/calibrator/"
+df_folder = package_dir + "/../../tests/data/loader/mpes/"
+folder = package_dir + "/../../tests/data/calibrator/"
 files = glob.glob(df_folder + "*.h5")
 config = parse_config(
-    package_dir + "/../tests/data/loader/mpes/config.yaml",
+    package_dir + "/../../tests/data/loader/mpes/config.yaml",
     folder_config={},
     user_config={},
     system_config={},