darfix 4.1.1__tar.gz → 4.3.0__tar.gz

{darfix-4.1.1 → darfix-4.3.0}/LICENSE

@@ -18,4 +18,6 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.
+
+This project uses joblib (https://github.com/joblib/joblib), licensed under the BSD 3-Clause License.

{darfix-4.1.1/src/darfix.egg-info → darfix-4.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: darfix
-Version: 4.1.1
+Version: 4.3.0
 Summary: Computer vision software for the interpretation of diffraction images
 Author-email: ESRF <dau-pydev@esrf.fr>
 License: The MIT license follows:
@@ -24,6 +24,9 @@ License: The MIT license follows:
         LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
         OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
         SOFTWARE.
+        
+        This project uses joblib (https://github.com/joblib/joblib), licensed under the BSD 3-Clause License.
+        
 Project-URL: Homepage, https://gitlab.esrf.fr/XRD/darfix/
 Project-URL: Documentation, http://www.edna-site.org/pub/doc/darfix/latest
 Project-URL: Repository, https://gitlab.esrf.fr/XRD/darfix/
@@ -46,11 +49,14 @@ Requires-Dist: packaging
 Requires-Dist: scikit-learn
 Requires-Dist: scipy
 Requires-Dist: tqdm
+Requires-Dist: joblib
+Requires-Dist: esrf-pathlib
+Requires-Dist: colorstamps
 Requires-Dist: eval_type_backport
 Provides-Extra: full-noqt
 Requires-Dist: opencv-python-headless>=4.3.0.36; extra == "full-noqt"
 Requires-Dist: scikit-image>=0.17.1; extra == "full-noqt"
-Requires-Dist: ewoksorange<3.0.0,>=2.1.0; extra == "full-noqt"
+Requires-Dist: ewoksorange>=3.0.0; extra == "full-noqt"
 Requires-Dist: hdf5plugin; extra == "full-noqt"
 Provides-Extra: full
 Requires-Dist: darfix[full_noqt]; extra == "full"
@@ -66,7 +72,7 @@ Requires-Dist: flake8_nb>=0.3.1; extra == "dev"
 Requires-Dist: isort; extra == "dev"
 Provides-Extra: doc
 Requires-Dist: darfix[test]; extra == "doc"
-Requires-Dist: sphinx>=4.5; extra == "doc"
+Requires-Dist: sphinx<9,>=7.2; extra == "doc"
 Requires-Dist: sphinx-autodoc-typehints>=1.16; extra == "doc"
 Requires-Dist: sphinxcontrib-video; extra == "doc"
 Requires-Dist: sphinx-copybutton; extra == "doc"

{darfix-4.1.1 → darfix-4.3.0}/pyproject.toml

@@ -8,7 +8,7 @@ addopts = "--import-mode=importlib" # for all pytest versions, pytest-cov needs
 
 [project]
 name = "darfix"
-version = "4.1.1"
+version = "4.3.0"
 keywords = ["orange3 add-on","ewoks"]
 authors = [{name = "ESRF", email = "dau-pydev@esrf.fr"}]
 description = "Computer vision software for the interpretation of diffraction images"
@@ -31,6 +31,9 @@ dependencies = [
     "scikit-learn",
     "scipy",
     "tqdm",
+    "joblib",
+    "esrf-pathlib",
+    "colorstamps",
     "eval_type_backport"
 ]
 
@@ -45,7 +48,7 @@ Changelog = "https://gitlab.esrf.fr/XRD/darfix/-/blob/main/CHANGELOG.md"
 full_noqt = [
     "opencv-python-headless >=4.3.0.36",
     "scikit-image>=0.17.1",
-    "ewoksorange (>=2.1.0,<3.0.0)",
+    "ewoksorange (>=3.0.0)",
     "hdf5plugin",
 ]
 full = [
@@ -65,7 +68,7 @@ dev = [
 ]
 doc = [
     "darfix[test]",
-    "sphinx >=4.5",
+    "sphinx >=7.2,<9",
     "sphinx-autodoc-typehints >=1.16",
     "sphinxcontrib-video",
     "sphinx-copybutton",

{darfix-4.1.1 → darfix-4.3.0}/src/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-4.1.1 → darfix-4.3.0}/src/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()