darfix 3.0.1__py3-none-any.whl → 4.2.0__py3-none-any.whl

darfix/_config.py

@@ -1,3 +1,6 @@
+FWHM_VAL = 2.35482  # For numba
+
+
 class Config:
     """
     Class containing shared global configuration for the darfix project.
@@ -15,7 +18,7 @@ class Config:
     .. versionadded:: 0.3
     """
 
-    FWHM_VAL = 2.35482
+    FWHM_VAL = FWHM_VAL
 
     """Magic value that returns FWHM when multiplied by the standard deviation.
 

darfix/core/data_selection.py

@@ -1,7 +1,6 @@
 import os
 import urllib.parse
 import urllib.request
-from typing import Iterable
 from typing import Optional
 from typing import Union
 
@@ -11,94 +10,66 @@ from darfix.core.dataset import ImageDataset
 
 
 def load_process_data(
-    filenames: Union[str, Iterable[str], DataUrl],
+    detector_url: Union[str, DataUrl],
     root_dir: Optional[str] = None,
-    in_memory: bool = True,
-    dark_filename: Optional[Union[str, DataUrl]] = None,
-    copy_files: bool = True,
-    isH5: bool = False,
+    dark_detector_url: Optional[Union[str, DataUrl]] = None,
     title: str = "",
     metadata_url=None,
 ):
     """
-    Loads data from `filenames`.
-    If `filenames` is:
+    Loads data from `detector_url`.
+    If `detector_url` is:
 
         - a str: consider it as a file pattern (for EDF files).
-        - an iterable: consider a list of EDF files.
         - a DataUrl: consider it readable by silx `get_data` function
 
-    :param filenames: filenames to be loaded.
+    :param detector_url: detector_url to be loaded.
     :param metadata_url: path to the scan metadata for HDF5 containing positioner information in order to load metadata for non-edf files
     """
     indices = li_indices = None
     root_dir_specified = bool(root_dir)
-    if isinstance(filenames, Iterable) and not isinstance(filenames, str) and isH5:
-        assert len(filenames) == 1
-        filenames = filenames[0]
 
-    if isinstance(filenames, DataUrl):
-        assert filenames.file_path() not in (
+    if isinstance(detector_url, DataUrl):
+        assert detector_url.file_path() not in (
             "",
             None,
         ), "no file_path provided to the DataUrl"
         if not root_dir_specified:
-            root_dir = os.path.dirname(filenames.file_path())
+            root_dir = os.path.dirname(detector_url.file_path())
         dataset = ImageDataset(
             _dir=root_dir,
-            first_filename=filenames,
-            in_memory=in_memory,
-            copy_files=copy_files,
-            isH5=isH5,
+            detector_url=detector_url,
             title=title,
             metadata_url=metadata_url,
         )
-    elif isinstance(filenames, str):
-        if not filenames:
-            raise ValueError("'filenames' cannot be an empty string")
+    elif isinstance(detector_url, str):
+        if not detector_url:
+            raise ValueError("'detector_url' cannot be an empty string")
         if not root_dir_specified:
-            root_dir = _get_root_dir(filenames)
+            root_dir = _get_root_dir(detector_url)
         dataset = ImageDataset(
             _dir=root_dir,
-            first_filename=filenames,
-            in_memory=in_memory,
-            copy_files=copy_files,
-            isH5=isH5,
-            title=title,
-            metadata_url=metadata_url,
-        )
-    elif isinstance(filenames, Iterable):
-        filenames = list(filenames)
-        if not root_dir_specified:
-            root_dir = _get_root_dir(filenames[0])
-        dataset = ImageDataset(
-            _dir=root_dir,
-            filenames=filenames,
-            in_memory=in_memory,
-            copy_files=copy_files,
-            isH5=isH5,
+            detector_url=detector_url,
             title=title,
             metadata_url=metadata_url,
         )
     else:
         raise TypeError(
-            f"Expected filenames to be a list, a string or a silx DataUrl. Got {type(filenames)} instead."
+            f"Expected detector_url to be a string or a silx DataUrl. Got {type(detector_url)} instead."
         )
 
-    if not dark_filename:
+    if not dark_detector_url:
         bg_dataset = None
-    elif isinstance(dark_filename, str):
+    elif isinstance(dark_detector_url, str):
         dark_root_dir = os.path.join(dataset.dir, "dark")
         os.makedirs(dark_root_dir, exist_ok=True)
         bg_dataset = ImageDataset(
             _dir=dark_root_dir,
-            first_filename=dark_filename,
-            copy_files=False,
-            isH5=isH5,
+            detector_url=dark_detector_url,
             metadata_url=None,
         )
-    elif isinstance(dark_filename, DataUrl):
-        assert dark_filename.file_path() not in (
+    elif isinstance(dark_detector_url, DataUrl):
+        assert dark_detector_url.file_path() not in (
             "",
             None,
         ), "no file_path provided to the DataUrl"
@@ -106,14 +77,12 @@ def load_process_data(
         os.makedirs(dark_root_dir, exist_ok=True)
         bg_dataset = ImageDataset(
             _dir=dark_root_dir,
-            first_filename=dark_filename,
-            copy_files=False,
-            isH5=isH5,
+            detector_url=dark_detector_url,
             metadata_url=None,
         )
     else:
         raise TypeError(
-            f"Expected dark_filename to be a string or a silx DataUrl. Got {type(dark_filename)} instead."
+            f"Expected dark_detector_url to be a string or a silx DataUrl. Got {type(dark_detector_url)} instead."
         )
 
     assert dataset.data is not None and dataset.data.size > 0, "No data was loaded!"