darfix 4.0.3__py3-none-any.whl → 4.3.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

@@ -4,6 +4,7 @@ import urllib.request
 from typing import Optional
 from typing import Union
 
+from esrf_pathlib import ESRFPath
 from silx.io.url import DataUrl
 
 from darfix.core.dataset import ImageDataset
@@ -26,7 +27,6 @@ def load_process_data(
     :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(detector_url, DataUrl):
@@ -87,9 +87,18 @@ def load_process_data(
 
     assert dataset.data is not None and dataset.data.size > 0, "No data was loaded!"
 
-    return dataset, indices, li_indices, bg_dataset
+    return dataset, bg_dataset
 
 
 def _get_root_dir(filename: str) -> str:
     url = urllib.parse.urlparse(filename, scheme="file")
     return os.path.dirname(urllib.request.url2pathname(url.path))
+
+
+def get_default_output_directory(raw_data_file: str) -> str:
+    esrf_raw_data_file = ESRFPath(raw_data_file)
+    try:
+        return str(esrf_raw_data_file.processed_dataset_path)
+    except AttributeError:
+        # Not an ESRF path : Default directory is cwd.
+        return os.getcwd()