nabu 2024.2.14__py3-none-any.whl → 2025.1.0__py3-none-any.whl

nabu/io/tests/test_remove_volume.py

@@ -0,0 +1,152 @@
+from pathlib import Path
+from os import path, mkdir, rename
+import numpy as np
+import pytest
+from tomoscan.esrf.volume import (
+    EDFVolume,
+    HDF5Volume,
+    JP2KVolume,
+    MultiTIFFVolume,
+    TIFFVolume,
+)
+from tomoscan.esrf.volume.jp2kvolume import has_glymur
+from nabu.io.writer import merge_hdf5_files
+from nabu.io.cast_volume import remove_volume
+
+
+def test_remove_single_frame_volume(tmpdir):
+    """
+    Test volume removal for tiff, jp2 and EDF
+    """
+    # Have to use a not-too-small size because of jp2k
+    data = np.arange(10 * 40 * 50, dtype="f").reshape((10, 40, 50))
+
+    volume_classes = [EDFVolume, TIFFVolume, JP2KVolume]
+    if not (has_glymur):
+        volume_classes.pop()
+    for volume_cls in volume_classes:
+        ext = volume_cls.DEFAULT_DATA_EXTENSION
+        folder = path.join(tmpdir, f"{ext}_vol")
+        volume_basename = f"{ext}_basename"
+
+        vol_writer = volume_cls(folder=folder, volume_basename=volume_basename, overwrite=True, start_index=0)
+        vol_writer.data = data
+        vol_writer.save()
+
+        vol_reader = volume_cls(folder=folder, volume_basename=volume_basename)
+        assert path.isdir(folder), f"Expected to find a folder f{folder}"
+        remove_volume(vol_reader)
+        assert not (path.isdir(folder)), f"Expected to have removed the folder f{folder}"
+
+        vol_writer.save()
+        vol_reader = volume_cls(folder=folder, volume_basename=volume_basename)
+        Path(path.join(folder, f"unexpected.{ext}")).touch()
+        with pytest.raises(RuntimeError) as exc:
+            remove_volume(vol_reader, check=True)
+        assert "Unexpected files present" in str(exc.value), "Expected check to find extraneous files"
+
+
+def test_remove_multiframe_volume(tmpdir):
+    """
+    Test volume removal for "multiframe" formats (HDF5, tiff3D)
+    The HDF5 files considered in this test do not have virtual sources
+    """
+    data = np.arange(3 * 4 * 5, dtype="f").reshape((3, 4, 5))
+
+    for ext, volume_cls in {"h5": HDF5Volume, "tiff": MultiTIFFVolume}.items():
+        file_path = path.join(tmpdir, f"{ext}_vol.{ext}")
+
+        init_kwargs = {"file_path": file_path}
+        if ext == "h5":
+            init_kwargs["data_path"] = "entry"
+        vol_writer = volume_cls(**init_kwargs)
+        vol_writer.data = data
+        vol_writer.save()
+
+        vol_reader = volume_cls(**init_kwargs)
+        assert path.isfile(file_path), f"Expected to find a {ext} volume at {file_path}"
+        remove_volume(vol_reader)
+        assert not (path.isfile(file_path)), f"Expected to have removed f{file_path}"
+
+
+def test_remove_hdf5_multiple_entries(tmpdir):
+    data = np.arange(3 * 4 * 5, dtype="f").reshape((3, 4, 5))
+    file_path = path.join(tmpdir, "h5_vol.h5")
+    vol_writer_1 = HDF5Volume(file_path=file_path, data_path="entry0000")
+    vol_writer_1.data = data
+    vol_writer_1.save()
+    vol_writer_2 = HDF5Volume(file_path=file_path, data_path="entry0001")
+    vol_writer_2.data = data + 10
+    vol_writer_2.save()
+    vol_reader = HDF5Volume(file_path=file_path, data_path="entry0000")
+    with pytest.raises(NotImplementedError) as exc:
+        remove_volume(vol_reader, check=True)
+    assert "Removing a HDF5 volume with more than one entry is not supported" in str(
+        exc.value
+    ), "Expected an error message"
+
+
+def test_remove_nabu_hdf5_reconstruction(tmpdir):
+    """
+    Test removal of HDF5 reconstruction generated by nabu (i.e with virtual sources)
+    """
+
+    entry = "entry"
+    process_name = "reconstruction"
+
+    master_file_path = path.join(tmpdir, "sample_naburec.hdf5")
+    associated_dir = path.join(tmpdir, "sample_naburec")
+    if not (path.isdir(associated_dir)):
+        mkdir(associated_dir)
+
+    n_chunks = 5
+    local_files = []
+    for i in range(n_chunks):
+        fname = "sample_naburec_%06d.h5" % i
+        partial_rec_abspath = path.join(associated_dir, fname)
+        local_files.append(f"sample_naburec/{fname}")
+        # local_files.append(fname)
+        vol = HDF5Volume(partial_rec_abspath, data_path=f"{entry}/{process_name}")
+        vol.data = np.arange(3 * 4 * 5, dtype="f").reshape((3, 4, 5))
+        vol.save()
+
+    h5_path = f"{entry}/{process_name}/results/data"
+
+    merge_hdf5_files(
+        local_files,
+        h5_path,
+        master_file_path,
+        process_name,
+        output_entry=entry,
+        output_filemode="a",
+        processing_index=0,
+        config=None,
+        base_dir=path.dirname(associated_dir),
+        axis=0,
+        overwrite=True,
+    )
+
+    assert path.isfile(master_file_path), f"Expected to find the master file at {master_file_path}"
+    assert path.isdir(associated_dir)
+    for local_file in local_files:
+        partial_rec_file = path.join(tmpdir, local_file)
+        assert path.isfile(partial_rec_file), f"Expected to find partial file number {i} at {partial_rec_file}"
+
+    # Check that the virtual links are handled properly
+    #  sample_rec.hdf5   should reference sample_rec/sample_rec_{i}.h5
+    renamed_master_file_path = (
+        path.join(path.dirname(master_file_path), path.basename(master_file_path).split(".")[0]) + "_renamed" + ".h5"
+    )
+    rename(master_file_path, renamed_master_file_path)
+    h5_vol = HDF5Volume(file_path=renamed_master_file_path, data_path=f"{entry}/{process_name}")
+    with pytest.raises(ValueError) as exc:
+        remove_volume(h5_vol)
+    expected_error_message = f"The virtual sources in {renamed_master_file_path}:{process_name}/results/data reference the directory sample_naburec, but expected was sample_naburec_renamed"
+    assert str(exc.value) == expected_error_message
+
+    # Check removal in normal circumstances
+    rename(renamed_master_file_path, master_file_path)
+    h5_vol = HDF5Volume(file_path=master_file_path, data_path=f"{entry}/{process_name}")
+    remove_volume(h5_vol)
+    assert not (path.isfile(master_file_path)), f"Expected to find the master file at {master_file_path}"
+    assert not (path.isdir(associated_dir))

nabu/io/tests/test_writers.py

@@ -80,7 +80,7 @@ class TestNXWriter:
         writer.write(self.data, "test_no_overwrite")
 
         writer2 = NXProcessWriter(fname, entry="entry0000", overwrite=False)
-        with pytest.raises((RuntimeError, OSError)) as ex:
+        with pytest.raises((RuntimeError, OSError)):
             writer2.write(self.data, "test_no_overwrite")
 
-        message = "Error should have been raised for trying to overwrite, but got the following: %s" % str(ex.value)
+        # message = "Error should have been raised for trying to overwrite, but got the following: %s" % str(ex.value)

nabu/io/utils.py

@@ -8,6 +8,8 @@ from tomoscan.volumebase import VolumeBase
 from tomoscan.esrf import EDFVolume, HDF5Volume, TIFFVolume, JP2KVolume, MultiTIFFVolume
 from tomoscan.io import HDF5File
 
+from nabu.utils import first_generator_item
+
 
 # This function might be moved elsewhere
 def get_compacted_dataslices(urls, subsampling=None, begin=0):
@@ -100,7 +102,7 @@ def get_compacted_dataslices(urls, subsampling=None, begin=0):
 
 def get_first_hdf5_entry(fname):
     with HDF5File(fname, "r") as fid:
-        entry = list(fid.keys())[0]
+        entry = first_generator_item(fid.keys())
     return entry
 
 
@@ -189,7 +191,7 @@ class _BaseReader(contextlib.AbstractContextManager):
         if url.scheme() not in ("silx", "h5py"):
             raise ValueError("Valid scheme are silx and h5py")
         if url.data_slice() is not None:
-            raise ValueError("Data slices are not managed. Data path should " "point to a bliss node (h5py.Group)")
+            raise ValueError("Data slices are not managed. Data path should point to a bliss node (h5py.Group)")
         self._url = url
         self._file_handler = None
 
@@ -207,7 +209,7 @@ class EntryReader(_BaseReader):
         else:
             entry = self._file_handler[self._url.data_path()]
         if not isinstance(entry, h5py.Group):
-            raise ValueError("Data path should point to a bliss node (h5py.Group)")
+            raise TypeError("Data path should point to a bliss node (h5py.Group)")
         return entry
 
 
@@ -218,7 +220,7 @@ class DatasetReader(_BaseReader):
         self._file_handler = HDF5File(self._url.file_path(), mode="r")
         entry = self._file_handler[self._url.data_path()]
         if not isinstance(entry, h5py.Dataset):
-            raise ValueError("Data path ({}) should point to a dataset (h5py.Dataset)".format(self._url.path()))
+            raise TypeError(f"Data path ({self._url.path()}) should point to a dataset (h5py.Dataset)")
         return entry
 
 
@@ -261,3 +263,5 @@ def get_output_volume(location: str, file_prefix: Optional[str], file_format: st
             return MultiTIFFVolume(file_path=location)
         else:
             return TIFFVolume(folder=location, volume_basename=file_prefix)
+    else:
+        raise ValueError

nabu/io/writer.py

@@ -13,7 +13,6 @@ try:
 except:
     from h5py import File as HDF5File
 from tomoscan.esrf import RawVolume
-from tomoscan.esrf.volume.jp2kvolume import has_glymur as __have_jp2k__
 from .. import version as nabu_version
 from ..utils import merged_shape
 from .utils import convert_dict_values
@@ -183,7 +182,7 @@ class NXVolVolume(NXProcessWriter):
         volume_basename = file_prefix = kwargs.get("volume_basename", None)
         start_index = kwargs.get("start_index", None)
         overwrite = kwargs.get("overwrite", False)
-        data_path = entry = kwargs.get("data_path", None)
+        entry = kwargs.get("data_path", None)
         self._process_name = kwargs.get("process_name", "reconstruction")
         if any([param is None for param in [folder, volume_basename, start_index, entry]]):
             raise ValueError("Need the following parameters: folder, volume_basename, start_index, data_path")

nabu/misc/fftshift.py

@@ -1,4 +1,4 @@
-from ..processing.fftshift import *
+from ..processing.fftshift import *  # noqa: F403
 from ..utils import deprecation_warning
 
 deprecation_warning(

nabu/misc/fourier_filters.py

@@ -1,7 +1,7 @@
-# -*- coding: utf-8 -*-
 """
 Fourier filters.
 """
+
 from functools import lru_cache
 import numpy as np
 import scipy.special as spspe

nabu/misc/histogram.py

@@ -1,4 +1,4 @@
-from ..processing.histogram import *
+from ..processing.histogram import *  # noqa: F403
 from ..utils import deprecation_warning
 
 deprecation_warning(

nabu/misc/histogram_cuda.py

@@ -1,4 +1,4 @@
-from ..processing.histogram_cuda import *
+from ..processing.histogram_cuda import *  # noqa: F403
 from ..utils import deprecation_warning
 
 deprecation_warning(

nabu/misc/padding_base.py

@@ -1,4 +1,4 @@
-from ..processing.padding_base import *
+from ..processing.padding_base import *  # noqa: F403
 from ..utils import deprecation_warning
 
 deprecation_warning(

nabu/misc/rotation.py

@@ -1,4 +1,4 @@
-from ..processing.rotation import *
+from ..processing.rotation import *  # noqa: F403
 from ..utils import deprecation_warning
 
 deprecation_warning(

nabu/misc/rotation_cuda.py

@@ -1,4 +1,4 @@
-from ..processing.rotation_cuda import *
+from ..processing.rotation_cuda import *  # noqa: F403
 from ..utils import deprecation_warning
 
 deprecation_warning(

nabu/misc/tests/test_binning.py

@@ -1,7 +1,7 @@
 from itertools import product
 import numpy as np
 import pytest
-from nabu.misc.binning import *
+from nabu.misc.binning import binning
 
 
 @pytest.fixture(scope="class")

nabu/misc/transpose.py

@@ -1,4 +1,4 @@
-from ..processing.transpose import *
+from ..processing.transpose import *  # noqa: F403
 from ..utils import deprecation_warning
 
 deprecation_warning(

nabu/misc/unsharp.py

@@ -1,4 +1,4 @@
-from ..processing.unsharp import *
+from ..processing.unsharp import *  # noqa: F403
 from ..utils import deprecation_warning
 
 deprecation_warning("nabu.misc.unsharp has been moved to nabu.processing.unsharp", do_print=True, func_name="unsharp")

nabu/misc/unsharp_cuda.py

@@ -1,4 +1,4 @@
-from ..processing.unsharp_cuda import *
+from ..processing.unsharp_cuda import *  # noqa: F403
 from ..utils import deprecation_warning
 
 deprecation_warning(

nabu/misc/unsharp_opencl.py

@@ -1,4 +1,4 @@
-from ..processing.unsharp_opencl import *
+from ..processing.unsharp_opencl import *  # noqa: F403
 from ..utils import deprecation_warning
 
 deprecation_warning(

nabu/misc/utils.py

@@ -41,7 +41,7 @@ def psnr(img1, img2):
 #
 
 
-class ConvolutionInfos(object):
+class ConvolutionInfos:
     allowed_axes = {
         "1D": [None],
         "separable_2D_1D_2D": [None, (0, 1), (1, 0)],

nabu/opencl/fft.py

@@ -1,4 +1,4 @@
-from ..processing.fft_opencl import *
+from ..processing.fft_opencl import *  # noqa: F403
 from ..utils import deprecation_warning
 
 deprecation_warning(

nabu/opencl/padding.py

@@ -1,4 +1,4 @@
-from ..processing.padding_opencl import *
+from ..processing.padding_opencl import *  # noqa: F403
 from ..utils import deprecation_warning
 
 deprecation_warning(

nabu/opencl/src/backproj.cl

@@ -14,7 +14,7 @@ static inline int is_in_circle(float x, float y, float center_x, float center_y,
   This will return arr[y][x] where y is an int (exact access) and x is a float (linear interp horizontally)
 */
 static inline float linear_interpolation(global float* arr, int Nx, float x, int y) {
-    if (x < 0 || x >= Nx) return 0.0f; // texture address mode CLAMP_TO_EDGE
+    if (x < -0.5f || x > Nx - 0.5f) return 0.0f; // texture address mode BORDER (CLAMP_TO_EDGE continues with edge)
     int xm = (int) floor(x);
     int xp = (int) ceil(x);
     if ((xm == xp) || (xp >= Nx)) return arr[y*Nx+xm];
@@ -53,7 +53,7 @@ kernel void backproj(
     uint Gy = get_global_size(1);
 
     #ifdef USE_TEXTURES
-    const sampler_t sampler = CLK_NORMALIZED_COORDS_FALSE | CLK_ADDRESS_CLAMP_TO_EDGE | CLK_FILTER_LINEAR;
+    const sampler_t sampler = CLK_NORMALIZED_COORDS_FALSE | CLK_ADDRESS_CLAMP | CLK_FILTER_LINEAR;
     #endif
 
     // (xr, yr)    (xrp, yr)
@@ -111,10 +111,10 @@ kernel void backproj(
         #endif
 
         #ifdef USE_TEXTURES
-        if (h1 >= 0 && h1 < num_bins) sum1 += read_imagef(d_sino, sampler, (float2) (h1 +0.5f,proj +0.5f)).x;
-        if (h2 >= 0 && h2 < num_bins) sum2 += read_imagef(d_sino, sampler, (float2) (h2 +0.5f,proj +0.5f)).x;
-        if (h3 >= 0 && h3 < num_bins) sum3 += read_imagef(d_sino, sampler, (float2) (h3 +0.5f,proj +0.5f)).x;
-        if (h4 >= 0 && h4 < num_bins) sum4 += read_imagef(d_sino, sampler, (float2) (h4 +0.5f,proj +0.5f)).x;
+        sum1 += read_imagef(d_sino, sampler, (float2) (h1 +0.5f,proj +0.5f)).x;
+        sum2 += read_imagef(d_sino, sampler, (float2) (h2 +0.5f,proj +0.5f)).x;
+        sum3 += read_imagef(d_sino, sampler, (float2) (h3 +0.5f,proj +0.5f)).x;
+        sum4 += read_imagef(d_sino, sampler, (float2) (h4 +0.5f,proj +0.5f)).x;
         #else
         if (h1 >= 0 && h1 < num_bins) sum1 += linear_interpolation(d_sino, num_bins, h1, proj);
         if (h2 >= 0 && h2 < num_bins) sum2 += linear_interpolation(d_sino, num_bins, h2, proj);

nabu/opencl/utils.py

@@ -1,5 +1,5 @@
 import numpy as np
-from ..utils import check_supported
+from ..utils import check_supported, first_generator_item
 
 try:
     import pyopencl as cl
@@ -138,11 +138,11 @@ def collect_opencl_gpus():
     Return a dictionary of platforms and brief description of each OpenCL-compatible
     GPU with a few fields
     """
-    gpus, error_msg = detect_opencl_gpus()
+    gpus_detected, error_msg = detect_opencl_gpus()
     if error_msg is not None:
         return None
     opencl_gpus = {}
-    for platform, gpus in gpus.items():
+    for platform, gpus in gpus_detected.items():
         for gpu_id, gpu in gpus.items():
             if platform not in opencl_gpus:
                 opencl_gpus[platform] = {}
@@ -215,22 +215,22 @@ def pick_opencl_cpu_platform(opencl_cpus):
         raise ValueError("No CPU to pick")
     name2device = {}
     for platform, devices in opencl_cpus.items():
-        for device_id, device_desc in devices.items():
+        for device_id, device_desc in devices.items():  # noqa: PERF102
             name2device.setdefault(device_desc["name"], [])
             name2device[device_desc["name"]].append(platform)
     if len(name2device) > 1:
         raise ValueError("Expected at most one CPU but got %d: %s" % (len(name2device), list(name2device.keys())))
-    cpu_name = list(name2device.keys())[0]
+    cpu_name = first_generator_item(name2device.keys())
     platforms = name2device[cpu_name]
     # Several platforms for the same CPU
     res = opencl_cpus[platforms[0]]
-    if len(platforms) > 1:
+    if len(platforms) > 1:  # noqa: SIM102
         if "intel" in cpu_name.lower():
             for platform in platforms:
                 if "intel" in platform.lower():
                     res = opencl_cpus[platform]
     #
-    return res[list(res.keys())[0]]
+    return res[first_generator_item(res.keys())]
 
 
 def allocate_texture(ctx, shape, support_1D=False):
@@ -289,4 +289,4 @@ def copy_to_texture(queue, dst_texture, src_array, dtype=np.float32):
             src_array = np.ascontiguousarray(src_array, dtype=dtype)
         return cl.enqueue_copy(queue, dst_texture, src_array, origin=(0, 0), region=shape[::-1])
     else:
-        raise ValueError("Unknown source array type")
+        raise TypeError("Unknown source array type")

nabu/pipeline/config.py

@@ -156,7 +156,7 @@ def _extract_nabuconfig_section(section, default_config):
 
 def _extract_nabuconfig_keyvals(default_config):
     res = {}
-    for section in default_config.keys():
+    for section in default_config:
         res[section] = _extract_nabuconfig_section(section, default_config)
     return res
 
@@ -257,7 +257,7 @@ def overwrite_config(conf, overwritten_params):
         if section not in conf:
             raise ValueError("Unknown section %s" % section)
         current_section = conf[section]
-        for key in params.keys():
+        for key in params:
             if key not in current_section:
                 raise ValueError("Unknown parameter '%s' in section '%s'" % (key, section))
             conf[section][key] = overwritten_params[section][key]

nabu/pipeline/config_validators.py

@@ -1,8 +1,9 @@
+# ruff: noqa: F405
 import os
 
 path = os.path
-from ..utils import check_supported, is_writeable
-from .params import *
+from ..utils import check_supported, deprecation_warning, is_writeable
+from .params import *  # noqa: F403
 
 """
 A validator is a function with
@@ -96,12 +97,21 @@ def convert_to_bool_noerr(val):
     return res
 
 
-def name_range_checker(name, valid_names, descr, replacements=None):
+def name_range_checker(name, available_names, descr):
+    """
+    Check whether a parameter name is valid, against a list or dictionary of names.
+    """
     name = name.strip().lower()
-    if replacements is not None and name in replacements:
-        name = replacements[name]
-    valid = name in valid_names
-    assert valid, "Invalid %s '%s'. Available are %s" % (descr, name, str(valid_names))
+    valid = name in available_names
+    if isinstance(available_names, dict):
+        # handle replacements, eg. {"edge": "edges"}
+        name = available_names[name]
+        # we could use .keys() instead to be more permissive to the user
+        available_names_str = str(set(available_names.values()))
+    else:
+        # assuming list
+        available_names_str = str(available_names)
+    assert valid, "Invalid %s '%s'. Available are %s" % (descr, name, available_names_str)
     return name
 
 
@@ -310,7 +320,7 @@ def optional_nonzero_float_validator(val):
         assert error is None, "Invalid number"
     else:
         val_float = None
-    if val_float is not None:
+    if val_float is not None:  # noqa: SIM102
         if abs(val_float) < 1e-6:
             val_float = None
     return val_float
@@ -323,7 +333,7 @@ def optional_tuple_of_floats_validator(val):
     err_msg = "Expected a tuple of two numbers, but got %s" % val
     try:
         res = tuple(float(x) for x in val.strip("()").split(","))
-    except Exception as exc:
+    except Exception:
         raise ValueError(err_msg)
     if len(res) != 2:
         raise ValueError(err_msg)
@@ -337,9 +347,7 @@ def cor_validator(val):
         return val_float
     if len(val.strip()) == 0:
         return None
-    val = name_range_checker(
-        val.lower(), set(cor_methods.values()), "center of rotation estimation method", replacements=cor_methods
-    )
+    val = name_range_checker(val, cor_methods, "center of rotation estimation method")
     return val
 
 
@@ -350,9 +358,7 @@ def tilt_validator(val):
         return val_float
     if len(val.strip()) == 0:
         return None
-    val = name_range_checker(
-        val.lower(), set(tilt_methods.values()), "automatic detector tilt estimation method", replacements=tilt_methods
-    )
+    val = name_range_checker(val, tilt_methods, "automatic detector tilt estimation method")
     return val
 
 
@@ -394,53 +400,55 @@ def cor_slice_validator(val):
 
 
 @validator
-def flatfield_enabled_validator(val):
-    return name_range_checker(val, set(flatfield_modes.values()), "flatfield mode", replacements=flatfield_modes)
+def flatfield_validator(val):
+    ret = name_range_checker(val, flatfield_modes, "flatfield mode")
+    if ret in ["force-load", "force-compute"]:
+        deprecation_warning(
+            f"Using 'flatfield = {ret}' is deprecated since version 2025.1.0. Please use the parameter 'flatfield_loading_mode'",
+        )
+    return ret
+
+
+@validator
+def flatfield_loading_mode_validator(val):
+    return name_range_checker(val, flatfield_loading_mode, "flatfield mode")
 
 
 @validator
 def phase_method_validator(val):
-    return name_range_checker(
-        val, set(phase_retrieval_methods.values()), "phase retrieval method", replacements=phase_retrieval_methods
-    )
+    return name_range_checker(val, phase_retrieval_methods, "phase retrieval method")
 
 
 @validator
 def detector_distortion_correction_validator(val):
     return name_range_checker(
         val,
-        set(detector_distortion_correction_methods.values()),
+        detector_distortion_correction_methods,
         "detector_distortion_correction_methods",
-        replacements=detector_distortion_correction_methods,
     )
 
 
 @validator
 def unsharp_method_validator(val):
-    return name_range_checker(
-        val, set(unsharp_methods.values()), "unsharp mask method", replacements=phase_retrieval_methods
-    )
+    return name_range_checker(val, unsharp_methods, "unsharp mask method")
 
 
 @validator
 def padding_mode_validator(val):
-    return name_range_checker(val, set(padding_modes.values()), "padding mode", replacements=padding_modes)
+    return name_range_checker(val, padding_modes, "padding mode")
 
 
 @validator
 def reconstruction_method_validator(val):
-    return name_range_checker(
-        val, set(reconstruction_methods.values()), "reconstruction method", replacements=reconstruction_methods
-    )
+    return name_range_checker(val, reconstruction_methods, "reconstruction method")
 
 
 @validator
 def fbp_filter_name_validator(val):
     return name_range_checker(
         val,
-        set(fbp_filters.values()),
+        fbp_filters,
         "FBP filter",
-        replacements=fbp_filters,
     )
 
 
@@ -448,29 +456,24 @@ def fbp_filter_name_validator(val):
 def reconstruction_implementation_validator(val):
     return name_range_checker(
         val,
-        set(reco_implementations.values()),
+        reco_implementations,
         "Reconstruction method implementation",
-        replacements=reco_implementations,
     )
 
 
 @validator
 def optimization_algorithm_name_validator(val):
-    return name_range_checker(
-        val, set(optim_algorithms.values()), "optimization algorithm name", replacements=iterative_methods
-    )
+    return name_range_checker(val, optim_algorithms, "optimization algorithm name")
 
 
 @validator
 def output_file_format_validator(val):
-    return name_range_checker(val, set(files_formats.values()), "output file format", replacements=files_formats)
+    return name_range_checker(val, files_formats, "output file format")
 
 
 @validator
 def distribution_method_validator(val):
-    val = name_range_checker(
-        val, set(distribution_methods.values()), "workload distribution method", replacements=distribution_methods
-    )
+    val = name_range_checker(val, distribution_methods, "workload distribution method")
     # TEMP.
     if val != "local":
         raise NotImplementedError("Computation method '%s' is not implemented yet" % val)
@@ -480,9 +483,7 @@ def distribution_method_validator(val):
 
 @validator
 def sino_normalization_validator(val):
-    val = name_range_checker(
-        val, set(sino_normalizations.values()), "sinogram normalization method", replacements=sino_normalizations
-    )
+    val = name_range_checker(val, sino_normalizations, "sinogram normalization method")
     return val
 
 
@@ -490,9 +491,8 @@ def sino_normalization_validator(val):
 def sino_deringer_methods(val):
     val = name_range_checker(
         val,
-        set(rings_methods.values()),
+        rings_methods,
         "sinogram rings artefacts correction method",
-        replacements=rings_methods,
     )
     return val
 
@@ -555,7 +555,7 @@ def nonempty_string_validator(val):
 
 @validator
 def logging_validator(val):
-    return name_range_checker(val, set(log_levels.values()), "logging level", replacements=log_levels)
+    return name_range_checker(val, log_levels, "logging level")
 
 
 @validator