nabu 2024.2.11__tar.gz → 2024.2.13__tar.gz

{nabu-2024.2.11/nabu.egg-info → nabu-2024.2.13}/PKG-INFO

@@ -1,31 +1,10 @@
 Metadata-Version: 2.4
 Name: nabu
-Version: 2024.2.11
+Version: 2024.2.13
 Summary: Nabu - Tomography software
 Author-email: Pierre Paleo <pierre.paleo@esrf.fr>, Henri Payno <henri.payno@esrf.fr>, Alessandro Mirone <mirone@esrf.fr>, Jérôme Lesaint <jerome.lesaint@esrf.fr>
 Maintainer-email: Pierre Paleo <pierre.paleo@esrf.fr>
-License: MIT License
-        
-        Copyright (c) 2020-2024 ESRF
-        
-        Permission is hereby granted, free of charge, to any person obtaining a copy
-        of this software and associated documentation files (the "Software"), to deal
-        in the Software without restriction, including without limitation the rights
-        to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-        copies of the Software, and to permit persons to whom the Software is
-        furnished to do so, subject to the following conditions:
-        
-        The above copyright notice and this permission notice shall be included in all
-        copies or substantial portions of the Software.
-        
-        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-        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.
-        
+License-Expression: MIT
 Project-URL: Homepage, https://gitlab.esrf.fr/tomotools/nabu
 Project-URL: Documentation, http://www.silx.org/pub/nabu/doc
 Project-URL: Repository, https://gitlab.esrf.fr/tomotools/nabu/-/releases
@@ -40,7 +19,6 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Environment :: Console
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: Unix
 Classifier: Operating System :: MacOS :: MacOS X
 Classifier: Operating System :: POSIX
@@ -53,7 +31,7 @@ Requires-Dist: numpy<2,>1.9.0
 Requires-Dist: scipy
 Requires-Dist: h5py>=3.0
 Requires-Dist: silx>=0.15.0
-Requires-Dist: tomoscan>=2.1.0
+Requires-Dist: tomoscan>=2.1.5
 Requires-Dist: psutil
 Requires-Dist: pytest
 Requires-Dist: tifffile

{nabu-2024.2.11 → nabu-2024.2.13}/nabu/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "2024.2.11"
+__version__ = "2024.2.13"
 __nabu_modules__ = [
     "app",
     "cuda",

{nabu-2024.2.11 → nabu-2024.2.13}/nabu/io/cast_volume.py

@@ -1,4 +1,6 @@
 import os
+
+from tomoscan.esrf.volume.singleframebase import VolumeSingleFrameBase
 from nabu.misc.utils import rescale_data
 from nabu.pipeline.params import files_formats
 from tomoscan.volumebase import VolumeBase
@@ -176,6 +178,17 @@ def cast_volume(
     if not isinstance(output_data_type, numpy.dtype):
         raise TypeError(f"output_data_type is expected to be a {numpy.dtype}. {type(output_data_type)} provided")
 
+    # Make sure the output volume has the same "start_index" as input volume, if relevant
+    if isinstance(input_volume, VolumeSingleFrameBase) and isinstance(output_volume, VolumeSingleFrameBase):
+        try:
+            first_file_name = next(input_volume.browse_data_files())
+            start_idx = int(first_file_name.split(".")[0].split("_")[-1])
+        except (StopIteration, ValueError, TypeError):
+            # StopIteration: Input volume has no file - should not happen
+            # ValueError / TypeError: fail to convert to int, something wrong when extracting slice number (non-default file name scheme)
+            start_idx = 0
+        output_volume.start_index = start_idx
+
     # start processing
     #  check for data_min and data_max
     if data_min is None or data_max is None:
@@ -193,6 +206,9 @@ def cast_volume(
         data_min = data_min if data_min is not None else found_data_min
         data_max = data_max if data_max is not None else found_data_max
 
+    if isinstance(output_volume, JP2KVolume):
+        output_volume.rescale_data = False
+
     data = []
     for input_slice, frame_dumper in zip(
         input_volume.browse_slices(),

{nabu-2024.2.11 → nabu-2024.2.13/nabu.egg-info}/PKG-INFO

@@ -1,31 +1,10 @@
 Metadata-Version: 2.4
 Name: nabu
-Version: 2024.2.11
+Version: 2024.2.13
 Summary: Nabu - Tomography software
 Author-email: Pierre Paleo <pierre.paleo@esrf.fr>, Henri Payno <henri.payno@esrf.fr>, Alessandro Mirone <mirone@esrf.fr>, Jérôme Lesaint <jerome.lesaint@esrf.fr>
 Maintainer-email: Pierre Paleo <pierre.paleo@esrf.fr>
-License: MIT License
-        
-        Copyright (c) 2020-2024 ESRF
-        
-        Permission is hereby granted, free of charge, to any person obtaining a copy
-        of this software and associated documentation files (the "Software"), to deal
-        in the Software without restriction, including without limitation the rights
-        to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-        copies of the Software, and to permit persons to whom the Software is
-        furnished to do so, subject to the following conditions:
-        
-        The above copyright notice and this permission notice shall be included in all
-        copies or substantial portions of the Software.
-        
-        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-        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.
-        
+License-Expression: MIT
 Project-URL: Homepage, https://gitlab.esrf.fr/tomotools/nabu
 Project-URL: Documentation, http://www.silx.org/pub/nabu/doc
 Project-URL: Repository, https://gitlab.esrf.fr/tomotools/nabu/-/releases
@@ -40,7 +19,6 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Environment :: Console
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: Unix
 Classifier: Operating System :: MacOS :: MacOS X
 Classifier: Operating System :: POSIX
@@ -53,7 +31,7 @@ Requires-Dist: numpy<2,>1.9.0
 Requires-Dist: scipy
 Requires-Dist: h5py>=3.0
 Requires-Dist: silx>=0.15.0
-Requires-Dist: tomoscan>=2.1.0
+Requires-Dist: tomoscan>=2.1.5
 Requires-Dist: psutil
 Requires-Dist: pytest
 Requires-Dist: tifffile

{nabu-2024.2.11 → nabu-2024.2.13}/nabu.egg-info/requires.txt

@@ -2,7 +2,7 @@ numpy<2,>1.9.0
 scipy
 h5py>=3.0
 silx>=0.15.0
-tomoscan>=2.1.0
+tomoscan>=2.1.5
 psutil
 pytest
 tifffile

{nabu-2024.2.11 → nabu-2024.2.13}/pyproject.toml

@@ -29,7 +29,8 @@ keywords = [
     "Ring artefact correction",
     "Geometric calibration",
 ]
-license = {file = "LICENSE"}
+license = "MIT"
+license-files = ["LICENSE"]
 classifiers = [
     "Development Status :: 5 - Production/Stable",
     "Intended Audience :: Developers",
@@ -40,7 +41,6 @@ classifiers = [
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Environment :: Console",
-    "License :: OSI Approved :: MIT License",
     "Operating System :: Unix",
     "Operating System :: MacOS :: MacOS X",
     "Operating System :: POSIX",
@@ -53,7 +53,7 @@ dependencies = [
     "scipy",
     "h5py>=3.0",
     "silx >= 0.15.0",
-    "tomoscan >= 2.1.0",
+    "tomoscan >= 2.1.5",
     "psutil",
     "pytest",
     "tifffile",