tomwer 1.4.0rc1__py3-none-any.whl → 1.4.0rc2__py3-none-any.whl

tomwer/core/scan/nxtomoscan.py

@@ -18,6 +18,7 @@ from tomoscan.esrf.identifier.hdf5Identifier import (
 )
 from tomoscan.esrf.identifier.url_utils import UrlSettings, split_path, split_query
 from tomoscan.esrf.scan.nxtomoscan import NXtomoScan as _tsNXtomoScan
+from tomoscan.utils.io import filter_esrf_mounting_points
 from nxtomo.nxobject.nxdetector import ImageKey
 from nxtomo.paths.nxtomo import get_paths as _get_nexus_paths
 
@@ -487,6 +488,7 @@ class NXtomoScan(_tsNXtomoScan, TomwerScanBase):
                 bliss_raw_data_files[0] if len(bliss_raw_data_files) > 0 else None
             )
             if bliss_raw_data_file is not None:
+                bliss_raw_data_file = filter_esrf_mounting_points(bliss_raw_data_file)
                 strips = bliss_raw_data_file.lstrip("/").split("/")
                 if len(strips) > 2 and bliss_raw_data_file.startswith(
                     ("/data/visitor", "/data/visitor")

tomwer/gui/reconstruction/axis/EstimatedCORWidget.py

@@ -124,9 +124,8 @@ class EstimatedCORWidget(qt.QGroupBox):
 
         """
         mode = axis_mode.AxisMode.from_value(mode)
-        self._estimatedCORQCB.setSidesVisible(
-            axis_mode.AXIS_MODE_METADATAS[mode].valid_sides
-        )
+        valid_sides = axis_mode.AXIS_MODE_METADATAS[mode].valid_sides
+        self._estimatedCORQCB.setSidesVisible(valid_sides)
         first_guess_available = axis_mode.AXIS_MODE_METADATAS[
             mode
         ].allows_estimated_cor_as_numerical_value
@@ -135,9 +134,10 @@ class EstimatedCORWidget(qt.QGroupBox):
         if first_guess_available:
             # if the first guess is valid, when the sides visibility is modify we want to activate it.
             self._estimatedCORQCB.selectFirstGuess()
-        elif not isinstance(self._estimatedCORQCB.getCurrentCorValue(), Side):
-            # else if the current side cannot be re-used, pick the next one available
-            if axis_mode.AXIS_MODE_METADATAS[mode].valid_sides:
+        elif valid_sides:
+            # Proceed only if there are valid sides
+            current_side = self._estimatedCORQCB.getCurrentCorValue()
+            if not isinstance(current_side, Side) or current_side not in valid_sides:
                 with block_signals(self._estimatedCORQCB):
                     cor_guess = self._estimatedCORQCB.getCurrentCorValue()
                     if cor_guess is not None and self._imageWidth is not None:
@@ -150,18 +150,29 @@ class EstimatedCORWidget(qt.QGroupBox):
                             2 * self._imageWidth / 3 - self._imageWidth / 2
                         )
 
-                        if left_boundary <= cor_guess < middle_left_boundary:
+                        if (
+                            Side.LEFT in valid_sides
+                            and left_boundary <= cor_guess < middle_left_boundary
+                        ):
                             new_side = Side.LEFT
-                        elif middle_left_boundary <= cor_guess < middle_right_boundary:
+                        elif (
+                            Side.CENTER in valid_sides
+                            and middle_left_boundary
+                            <= cor_guess
+                            < middle_right_boundary
+                        ):
                             new_side = Side.CENTER
-                        elif middle_right_boundary <= cor_guess <= right_boundary:
+                        elif (
+                            Side.RIGHT in valid_sides
+                            and middle_right_boundary <= cor_guess <= right_boundary
+                        ):
                             new_side = Side.RIGHT
                         else:
-                            new_side = axis_mode.AXIS_MODE_METADATAS[mode].valid_sides[
-                                0
-                            ]  # Handle out-of-bound cases if needed
+                            # Fallback to the first available valid side
+                            new_side = valid_sides[0]
                     else:
-                        new_side = axis_mode.AXIS_MODE_METADATAS[mode].valid_sides[0]
+                        # If no guess or boundaries are available, fallback to the first valid side
+                        new_side = valid_sides[0]
                     self._estimatedCORQCB.setCurrentCorValue(new_side)
                     self._axis_params.estimated_cor = new_side
 

tomwer/version.py

@@ -79,7 +79,7 @@ MAJOR = 1
 MINOR = 4
 MICRO = 0
 RELEV = "rc"  # <16
-SERIAL = 1  # <16
+SERIAL = 2  # <16
 
 date = __date__
 

{tomwer-1.4.0rc1.dist-info → tomwer-1.4.0rc2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tomwer
-Version: 1.4.0rc1
+Version: 1.4.0rc2
 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.0rc1.dist-info → tomwer-1.4.0rc2.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=j1oNp7eNg5mwm_5Q77iTFsL3OJijPmUGXya-gpg8TlM,4383
+tomwer/version.py,sha256=Vs2f0crFymGdC8vYgisbt6gSSnsw9ui4Jb9RGNnGg2U,4383
 tomwer/app/__init__.py,sha256=RYMB2YhbQaoMXC8W-oOyfZ_Y1vmHD7L13YkKeAMuShM,85
 tomwer/app/axis.py,sha256=BJNuwMOjw1vS2w-9sKxltIgWMEWAPetnK2sAOFmXoZg,5880
 tomwer/app/canvas.py,sha256=sM368nniUwbQXLA-oNCg1iNwMMol_ZGTKbiw8WsC4yw,1539
@@ -406,7 +406,7 @@ tomwer/core/scan/edfscan.py,sha256=hsFzpYyPIrvsLM61J9aDmpdVskMTFO94fNcF3HEG_iI,2
 tomwer/core/scan/futurescan.py,sha256=chXjteQ4_6cSyFBoCil-DeHkHGGzM-xb21xJRYLEfhI,213
 tomwer/core/scan/hdf5scan.py,sha256=rQ-WtbOIgNtnMxA2kC23fEAcJIJIKboAv7UQColkrBg,966
 tomwer/core/scan/helicalmetadata.py,sha256=JRBxqHkyTe5f3FDlbIeDfN31P6Ms48SqGiFRXHuZ8sw,472
-tomwer/core/scan/nxtomoscan.py,sha256=iw6RneKKXZ5u6whN_yghYMoR4fisvYMpJTVMoarxYIE,18768
+tomwer/core/scan/nxtomoscan.py,sha256=H-qSuRiO8orBV5EJBkg5uhUDAJOG2oF1nj5o13MO1xw,18913
 tomwer/core/scan/scanbase.py,sha256=TMfoQHJgaWTNJfjXiOVYDLT58A03T-O-8MDOM6bwt3E,28514
 tomwer/core/scan/scanfactory.py,sha256=-bF0Ru9bn8bnGk4MKXhbt5Oli19qN1WvFPDMtqw81BA,9116
 tomwer/core/scan/scantype.py,sha256=pQjWuCy_014uK5cdb8pFAkE_EPHJvPdSo3NM8aWTo58,137
@@ -547,7 +547,7 @@ tomwer/gui/reconstruction/axis/AxisWidget.py,sha256=nkORZHLo8D3Sk8j-8QVr9l3Qse66
 tomwer/gui/reconstruction/axis/CalculationWidget.py,sha256=F8z4V5xhoWVQ5sQPVwUv3fsTxIPu4vhlReBTgnnCG0g,8476
 tomwer/gui/reconstruction/axis/CompareImages.py,sha256=jqzlMBU_tfIdR1yHuZa8Avt8Te0EPBkjI6R4TY6kIlw,11425
 tomwer/gui/reconstruction/axis/ControlWidget.py,sha256=DsBPFIEZCva-JPUFxORjkAnoYfgb5udfJ71W-fCwgRY,10686
-tomwer/gui/reconstruction/axis/EstimatedCORWidget.py,sha256=tcmedDyeJLl557ytCV5KS_RI6tMimYJmhN3QmWnsPAI,16666
+tomwer/gui/reconstruction/axis/EstimatedCORWidget.py,sha256=dL9SCjPEZ7MQLGZP0gZARb-rxD8YYSl-gcFyuN14jwg,17081
 tomwer/gui/reconstruction/axis/EstimatedCorComboBox.py,sha256=Hq8o6X5-iVMqltGcpy2E5OpCP5nNV353Mepsf_R7zVY,4434
 tomwer/gui/reconstruction/axis/InputWidget.py,sha256=UhEWL3aJG56PfkI7DKw-sBd6hDsRJ2NnQ0XN0nBmM6g,13052
 tomwer/gui/reconstruction/axis/ManualFramesSelection.py,sha256=b7-OjYyLuMQxG19AuvUNdwhSV5ewwfC4s9Yn8-6yZLQ,6481
@@ -904,9 +904,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=L0vNnfGpI6Soy8b_w6OjTMhLzUSutMFhWjPOe6kZO-E,5081
-tomwer-1.4.0rc1.dist-info/LICENSE,sha256=62p1wL0n9WMTu8x2YDv0odYgTqeSvTd9mQ0v6Mq7lzE,1876
-tomwer-1.4.0rc1.dist-info/METADATA,sha256=3QcO1MU_iJulld_cCeDiJAK0U4NWTU7tFLBqcRDD4_k,13406
-tomwer-1.4.0rc1.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-tomwer-1.4.0rc1.dist-info/entry_points.txt,sha256=py3ZUWvGnWGc5c7Yhw_uBTm8Fmew0BDw3aQZnWMBNZI,500
-tomwer-1.4.0rc1.dist-info/top_level.txt,sha256=Yz5zKh0FPiImtzHYcPuztG1AO8-6KEpUWgoChGbA0Ys,21
-tomwer-1.4.0rc1.dist-info/RECORD,,
+tomwer-1.4.0rc2.dist-info/LICENSE,sha256=62p1wL0n9WMTu8x2YDv0odYgTqeSvTd9mQ0v6Mq7lzE,1876
+tomwer-1.4.0rc2.dist-info/METADATA,sha256=XrRzqu2ANWCR-0X9IFhU4OHEsTWf1L6gKTCLK7oiL5g,13406
+tomwer-1.4.0rc2.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+tomwer-1.4.0rc2.dist-info/entry_points.txt,sha256=py3ZUWvGnWGc5c7Yhw_uBTm8Fmew0BDw3aQZnWMBNZI,500
+tomwer-1.4.0rc2.dist-info/top_level.txt,sha256=Yz5zKh0FPiImtzHYcPuztG1AO8-6KEpUWgoChGbA0Ys,21
+tomwer-1.4.0rc2.dist-info/RECORD,,