tomwer 1.4.2__py3-none-any.whl → 1.4.3__py3-none-any.whl

tomwer/core/process/reconstruction/nabu/nabuslices.py

@@ -445,13 +445,47 @@ def interpret_tomwer_configuration(config: dict, scan: TomwerScanBase | None) ->
         return nabu_config
 
     if "tomwer_slices" in config and scan is not None:
+        reconstruction_axis = NabuPlane.from_value(
+            config.get("reconstruction", {}).get("slice_plane", "XY")
+        )
         slices = list(
             NabuSliceMode.getSlices(
                 config["tomwer_slices"],
                 scan=scan,
-                axis=config.get("reconstruction", {}).get("slice_plane", "XY"),
+                axis=reconstruction_axis,
+            )
+        )
+
+        def filter_slice(slice_index: int, axis: NabuPlane):
+            """remove slices that 'cannot' be reconstructed (out of bounds)"""
+            if axis is NabuPlane.XY:
+                index_max = scan.dim_2
+            elif axis in (NabuPlane.XZ, NabuPlane.YZ):
+                index_max = scan.dim_1
+            else:
+                raise ValueError
+
+            if index_max is None:
+                return True
+
+            index_max = index_max - 1
+
+            if slice_index > index_max:
+                _logger.error(
+                    f"slice index {slice_index} requested. But slice index must be in 0-{index_max} - ignore this request"
+                )
+                return False
+            return True
+
+        slices = list(
+            filter(
+                lambda slice_index: filter_slice(
+                    int(slice_index), axis=reconstruction_axis
+                ),
+                slices,
             )
         )
+
     else:
         slices = []
 
@@ -464,17 +498,6 @@ def interpret_tomwer_configuration(config: dict, scan: TomwerScanBase | None) ->
     else:
         pag_dbs = (None,)
 
-    # remove slices that 'cannot' be reconstructed (out of bounds)
-    def filter_slice(slice_index: int):
-        if scan.dim_2 is not None and slice_index > scan.dim_2:
-            _logger.error(
-                f"slice index {slice_index} requested. But slice index must be in 0-{scan.dim_2} - ignore this request"
-            )
-            return False
-        return True
-
-    slices = list(filter(lambda slice_index: filter_slice(int(slice_index)), slices))
-
     # by default add the slice 'None' which is the slice for the volume
     slices.append(None)
     nabu_config = get_nabu_config(config=config)

tomwer/version.py

@@ -77,7 +77,7 @@ RELEASE_LEVEL_VALUE = {
 
 MAJOR = 1
 MINOR = 4
-MICRO = 2
+MICRO = 3
 RELEV = "final"  # <16
 SERIAL = 0  # <16
 

{tomwer-1.4.2.dist-info → tomwer-1.4.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tomwer
-Version: 1.4.2
+Version: 1.4.3
 Summary: "tomography workflow tools"
 Home-page: https://gitlab.esrf.fr/tomotools/tomwer
 Author: Henri Payno, Pierre Paleo, Pierre-Olivier Autran, Jérôme Lesaint, Alessandro Mirone

{tomwer-1.4.2.dist-info → tomwer-1.4.3.dist-info}/RECORD

@@ -220,7 +220,7 @@ orangecontrib/tomwer/widgets/visualization/tests/__init__.py,sha256=47DEQpj8HBSa
 tomwer/__init__.py,sha256=GeLSeY4__z-HQZu1y4ptZ5Y1OeXFvG8kuEwWXhkeaMA,360
 tomwer/__main__.py,sha256=7tCADiS4u7k1PCxFhlRAcYSIOpxQTGUTx8sCEQ-hi1E,8707
 tomwer/utils.py,sha256=7h7dEgKAEUmQ43jkULvC1B9Adl55nkCty-SEKUKCl4U,7008
-tomwer/version.py,sha256=Ut5Y5Pzhf7aqEi5CMCIwsyq_OqFINJdLxd0lcDcQ7js,4386
+tomwer/version.py,sha256=a1loEqEj9NVb3IVtlWL8YHxJkt3I_gA4e_oclG0NANo,4386
 tomwer/app/__init__.py,sha256=RYMB2YhbQaoMXC8W-oOyfZ_Y1vmHD7L13YkKeAMuShM,85
 tomwer/app/axis.py,sha256=OhDgMj_gS-45PnjKBTyOCOkmZ1Iy-Tb6Dj66mzQg0sU,5827
 tomwer/app/canvas.py,sha256=sM368nniUwbQXLA-oNCg1iNwMMol_ZGTKbiw8WsC4yw,1539
@@ -336,7 +336,7 @@ tomwer/core/process/reconstruction/nabu/castvolume.py,sha256=4VEVnJxWfG8_Ku2uhUS
 tomwer/core/process/reconstruction/nabu/helical.py,sha256=gauUkoPiShvnvMQrCQXv28g0yLe-GceML5kYMSXmNIg,1997
 tomwer/core/process/reconstruction/nabu/nabucommon.py,sha256=s1KxEzHQJ09JEWP3_EvKFe51k1boi_a8YRlbs3TppdE,23338
 tomwer/core/process/reconstruction/nabu/nabuscores.py,sha256=e5tRG1QtmVAdXb8KHMTMtBXA3KQXqKKcqipY2HzMURg,25275
-tomwer/core/process/reconstruction/nabu/nabuslices.py,sha256=sUpU1f6_qWbuKVUDNattFVvFE88By29f3CtTCtuKT-k,31517
+tomwer/core/process/reconstruction/nabu/nabuslices.py,sha256=WAmNlfyRWL0zhEE8jMjMg7WyzPM4BcBA6bWpaH8O53A,32101
 tomwer/core/process/reconstruction/nabu/nabuvolume.py,sha256=Fn0tkPDTDJQaMEJA4LzpPp0ZtG4MIu9YN82-jesxRKo,20052
 tomwer/core/process/reconstruction/nabu/plane.py,sha256=366gWprWw8Rlob8jsMn753CqgudruvvVauU0ihH2lU4,400
 tomwer/core/process/reconstruction/nabu/settings.py,sha256=3AJpxVQbJziw4v6F26Ppz8Q9vc9ZNepTWygqpCAbIEM,955
@@ -903,9 +903,9 @@ tomwer/tests/orangecontrib/tomwer/widgets/visualization/tests/test_volume_viewer
 tomwer/tests/test_ewoks/test_conversion.py,sha256=a8cEWbErXiFCAkaapi0jeEoRKYxcFQCoa-Jr_u77_OM,3656
 tomwer/tests/test_ewoks/test_single_node_execution.py,sha256=YBUHfiAnkciv_kjj7biC5fOs7c7ofNImM_azGMn4LZM,2813
 tomwer/tests/test_ewoks/test_workflows.py,sha256=Eq80eexf5NVL7SzvwctLOaUeuQ8V3vDiFiHgbJA4Yb8,4871
-tomwer-1.4.2.dist-info/LICENSE,sha256=62p1wL0n9WMTu8x2YDv0odYgTqeSvTd9mQ0v6Mq7lzE,1876
-tomwer-1.4.2.dist-info/METADATA,sha256=0YX0nYm5b6VVBEgnLOx-vDB7Hermd6Q0lDpus2rD-tc,13377
-tomwer-1.4.2.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-tomwer-1.4.2.dist-info/entry_points.txt,sha256=py3ZUWvGnWGc5c7Yhw_uBTm8Fmew0BDw3aQZnWMBNZI,500
-tomwer-1.4.2.dist-info/top_level.txt,sha256=Yz5zKh0FPiImtzHYcPuztG1AO8-6KEpUWgoChGbA0Ys,21
-tomwer-1.4.2.dist-info/RECORD,,
+tomwer-1.4.3.dist-info/LICENSE,sha256=62p1wL0n9WMTu8x2YDv0odYgTqeSvTd9mQ0v6Mq7lzE,1876
+tomwer-1.4.3.dist-info/METADATA,sha256=Ld2sbq0AQqYvZRs3bw6o5BjDIzkFYxLOMzOXiANnUiY,13377
+tomwer-1.4.3.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+tomwer-1.4.3.dist-info/entry_points.txt,sha256=py3ZUWvGnWGc5c7Yhw_uBTm8Fmew0BDw3aQZnWMBNZI,500
+tomwer-1.4.3.dist-info/top_level.txt,sha256=Yz5zKh0FPiImtzHYcPuztG1AO8-6KEpUWgoChGbA0Ys,21
+tomwer-1.4.3.dist-info/RECORD,,