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

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

@@ -287,7 +287,7 @@ class _Reconstructor(_NabuBaseReconstructor):
         )
 
         results = {}
-        if self.advancement is not None:
+        if self.advancement:
             self.advancement.total = len(self.nabu_configs)
         for var_value, config in self.nabu_configs.items():
             if self._cancelled:
@@ -312,7 +312,7 @@ class _Reconstructor(_NabuBaseReconstructor):
                 process_name=self.process_name,
             )
             # specific treatment for cor: rename output files
-            if self.advancement is not None:
+            if self.advancement:
                 self.advancement.update()
         return results
 

tomwer/core/process/reconstruction/saaxis/saaxis.py

@@ -317,7 +317,7 @@ class SAAxisTask(
 
             for cor in cors:
                 cor_nabu_ref = relative_pos_to_absolute(
-                    relative_pos=cor,
+                    relative_pos=scan.axis_params.relative_cor_value,
                     det_width=scan.dim_1,
                 )
                 volume_identifiers = get_multi_cor_recons_volume_identifiers(

tomwer/core/scan/nxtomoscan.py

@@ -18,7 +18,6 @@ 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
 
@@ -488,7 +487,6 @@ 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/CalculationWidget.py

@@ -180,10 +180,6 @@ class CalculationWidget(qt.QWidget):
         return axis_mode.AxisMode.from_value(self._qcbPosition.currentText())
 
     def setMode(self, mode: axis_mode.AxisMode):
-        if mode == self.getMode():
-            # when set mode the estimated cor might changed.
-            # that we want to avoid.
-            return
         with block_signals(self._qcbPosition):
             index = self._qcbPosition.findText(mode.value)
             if index >= 0:

tomwer/gui/reconstruction/axis/EstimatedCORWidget.py

@@ -124,8 +124,9 @@ class EstimatedCORWidget(qt.QGroupBox):
 
         """
         mode = axis_mode.AxisMode.from_value(mode)
-        valid_sides = axis_mode.AXIS_MODE_METADATAS[mode].valid_sides
-        self._estimatedCORQCB.setSidesVisible(valid_sides)
+        self._estimatedCORQCB.setSidesVisible(
+            axis_mode.AXIS_MODE_METADATAS[mode].valid_sides
+        )
         first_guess_available = axis_mode.AXIS_MODE_METADATAS[
             mode
         ].allows_estimated_cor_as_numerical_value
@@ -134,10 +135,9 @@ 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 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:
+        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:
                 with block_signals(self._estimatedCORQCB):
                     cor_guess = self._estimatedCORQCB.getCurrentCorValue()
                     if cor_guess is not None and self._imageWidth is not None:
@@ -150,29 +150,18 @@ class EstimatedCORWidget(qt.QGroupBox):
                             2 * self._imageWidth / 3 - self._imageWidth / 2
                         )
 
-                        if (
-                            Side.LEFT in valid_sides
-                            and left_boundary <= cor_guess < middle_left_boundary
-                        ):
+                        if left_boundary <= cor_guess < middle_left_boundary:
                             new_side = Side.LEFT
-                        elif (
-                            Side.CENTER in valid_sides
-                            and middle_left_boundary
-                            <= cor_guess
-                            < middle_right_boundary
-                        ):
+                        elif middle_left_boundary <= cor_guess < middle_right_boundary:
                             new_side = Side.CENTER
-                        elif (
-                            Side.RIGHT in valid_sides
-                            and middle_right_boundary <= cor_guess <= right_boundary
-                        ):
+                        elif middle_right_boundary <= cor_guess <= right_boundary:
                             new_side = Side.RIGHT
                         else:
-                            # Fallback to the first available valid side
-                            new_side = valid_sides[0]
+                            new_side = axis_mode.AXIS_MODE_METADATAS[mode].valid_sides[
+                                0
+                            ]  # Handle out-of-bound cases if needed
                     else:
-                        # If no guess or boundaries are available, fallback to the first valid side
-                        new_side = valid_sides[0]
+                        new_side = axis_mode.AXIS_MODE_METADATAS[mode].valid_sides[0]
                     self._estimatedCORQCB.setCurrentCorValue(new_side)
                     self._axis_params.estimated_cor = new_side
 

tomwer/gui/stitching/config/axisparams.py

@@ -119,8 +119,6 @@ class StitcherAxisParams(qt.QWidget):
             for option in options:
                 clean_option = option.rstrip(" ").lstrip(" ")
                 opt_name, opt_value = clean_option.split("=")
-                if opt_value == "":
-                    continue
                 if opt_name == stitching_config.KEY_IMG_REG_METHOD:
                     self.setShiftSearchMethod(opt_value)
                 elif opt_name == stitching_config.KEY_WINDOW_SIZE:

tomwer/version.py

@@ -78,8 +78,8 @@ RELEASE_LEVEL_VALUE = {
 MAJOR = 1
 MINOR = 4
 MICRO = 0
-RELEV = "final"  # <16
-SERIAL = 0  # <16
+RELEV = "rc"  # <16
+SERIAL = 1  # <16
 
 date = __date__
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tomwer
-Version: 1.4.0
+Version: 1.4.0rc1
 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
@@ -30,7 +30,7 @@ Requires-Dist: nxtomo>=1.3.0dev4
 Requires-Dist: nxtomomill>=1.1.0a0
 Requires-Dist: processview>=1.4.3
 Requires-Dist: ewoks>=0.1.1
-Requires-Dist: sluurp>=0.4.1
+Requires-Dist: sluurp>=0.4.0
 Requires-Dist: packaging
 Requires-Dist: flufl-lock
 Requires-Dist: pyunitsystem>=2.0.0a

{tomwer-1.4.0.dist-info → tomwer-1.4.0rc1.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=tBqDHIKIZ-WmIQG-f3n4ZzZ6Vwq_keqONfQgw0jG1E4,4386
+tomwer/version.py,sha256=j1oNp7eNg5mwm_5Q77iTFsL3OJijPmUGXya-gpg8TlM,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
@@ -334,7 +334,7 @@ tomwer/core/process/reconstruction/nabu/__init__.py,sha256=47DEQpj8HBSa-_TImW-5J
 tomwer/core/process/reconstruction/nabu/castvolume.py,sha256=4VEVnJxWfG8_Ku2uhUSQAgGfvP_08mXswmC3bHU7E4M,9317
 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/nabuscores.py,sha256=SftxwaQlxN79m9b3-QhY-ROX674Y4lAXGblZfP--pMo,25251
 tomwer/core/process/reconstruction/nabu/nabuslices.py,sha256=WWvq4cx6-lklUILOEMPCjDG_r8oy-QsuCI7hGaseiAw,34919
 tomwer/core/process/reconstruction/nabu/nabuvolume.py,sha256=O9d3PUvkk5r-YNEcOfzyPSx5DT1pu8wGXWXpQ0GhWnw,20556
 tomwer/core/process/reconstruction/nabu/plane.py,sha256=366gWprWw8Rlob8jsMn753CqgudruvvVauU0ihH2lU4,400
@@ -349,7 +349,7 @@ tomwer/core/process/reconstruction/normalization/normalization.py,sha256=lG9eqfz
 tomwer/core/process/reconstruction/normalization/params.py,sha256=WNCuA5A5EuiWJjvKqY309Eiaa7THocgnG7owkQFHdyc,3418
 tomwer/core/process/reconstruction/saaxis/__init__.py,sha256=ZEOu0nZWlMyBoX_A64yeEjVflE5x4iWSpYLTgs45g0o,137
 tomwer/core/process/reconstruction/saaxis/params.py,sha256=E16GiHpSXh28p6BIsSaWMY9y2K-yMRRhXtFf6stUFRA,4204
-tomwer/core/process/reconstruction/saaxis/saaxis.py,sha256=Bv2h4N_JlMSlIs2fj8_0SXou1gt_TcfW_HyzMPafI2Y,30701
+tomwer/core/process/reconstruction/saaxis/saaxis.py,sha256=KIqv94mNMRWs-sm4cLgRKQ-RoOZLuRACDSknk5-_0gU,30733
 tomwer/core/process/reconstruction/sadeltabeta/__init__.py,sha256=WDYJxfqPnz5IeLPCX5W8UEO8-Z-NSH79gkqp2DZn1bM,162
 tomwer/core/process/reconstruction/sadeltabeta/params.py,sha256=ziAlTtQLy4EItIprFxDOm2Td1emHpSpnQb58niF1tI0,2691
 tomwer/core/process/reconstruction/sadeltabeta/sadeltabeta.py,sha256=L01nI67Fhu0_mWMhncOEiFaItQirzbIbMJ0TYBFgIaE,29603
@@ -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=H-qSuRiO8orBV5EJBkg5uhUDAJOG2oF1nj5o13MO1xw,18913
+tomwer/core/scan/nxtomoscan.py,sha256=iw6RneKKXZ5u6whN_yghYMoR4fisvYMpJTVMoarxYIE,18768
 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
@@ -544,10 +544,10 @@ tomwer/gui/reconstruction/axis/AxisMainWindow.py,sha256=7w2LhdQ1pa8vU9U-XTA3ohGQ
 tomwer/gui/reconstruction/axis/AxisOptionsWidget.py,sha256=M47xflZ68KkTDg8tksFt8n7ZFVIr8tJxstlPyG4Odq0,12168
 tomwer/gui/reconstruction/axis/AxisSettingsWidget.py,sha256=7GpHteE2j9RUo-jUQoJdXJ-GnIi9VnY13Lveq3mvd1M,28120
 tomwer/gui/reconstruction/axis/AxisWidget.py,sha256=nkORZHLo8D3Sk8j-8QVr9l3Qse66s-Nv-tB6kCkSMTY,19794
-tomwer/gui/reconstruction/axis/CalculationWidget.py,sha256=OgEeOCml6p-vJwEpKZLIoHLXfIrU9X7nLWewPswN1jE,8628
+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=dL9SCjPEZ7MQLGZP0gZARb-rxD8YYSl-gcFyuN14jwg,17081
+tomwer/gui/reconstruction/axis/EstimatedCORWidget.py,sha256=tcmedDyeJLl557ytCV5KS_RI6tMimYJmhN3QmWnsPAI,16666
 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
@@ -613,7 +613,7 @@ tomwer/gui/stitching/stitching_preview.py,sha256=QqWfw5jOqpmfEDCR-VGrbTtGTU9l06q
 tomwer/gui/stitching/stitching_raw.py,sha256=imFJZyoVQ8H9JgdS02UoNcudvalfCQCAHVvCfh2UGIk,22363
 tomwer/gui/stitching/utils.py,sha256=ZgfKHLyH7l81Ry-4M5ajdwqdeos_J4g4Ee3j3yoXcJo,599
 tomwer/gui/stitching/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tomwer/gui/stitching/config/axisparams.py,sha256=1cRa9ukPvVK7AGePJsJx2M_i_5TMLJocVwrotz7uxXk,8026
+tomwer/gui/stitching/config/axisparams.py,sha256=08UGAkuT3oJwK752JQ9yBBrKZ_K1nLwTJpyaMPwV8eo,7961
 tomwer/gui/stitching/config/output.py,sha256=sVmPQDMmFjmG5Dtuqy-805Qh8ZIbnDMgShnQOgjWQxQ,5936
 tomwer/gui/stitching/config/positionoveraxis.py,sha256=NGgjxzhxCXa3fBtHP9O9oiqLw8lpUqV_NNbhrnRGrdY,16328
 tomwer/gui/stitching/config/stitchingstrategies.py,sha256=BI5KYs0qeEp-hfFI7M9MJN8EHmoC7iaJqQ7Hf902v6Y,4598
@@ -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.0.dist-info/LICENSE,sha256=62p1wL0n9WMTu8x2YDv0odYgTqeSvTd9mQ0v6Mq7lzE,1876
-tomwer-1.4.0.dist-info/METADATA,sha256=cd6jO9c1I49Q-ARnezGeJHxBYF1nU3j1Oh3-lVw8bwM,13403
-tomwer-1.4.0.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-tomwer-1.4.0.dist-info/entry_points.txt,sha256=py3ZUWvGnWGc5c7Yhw_uBTm8Fmew0BDw3aQZnWMBNZI,500
-tomwer-1.4.0.dist-info/top_level.txt,sha256=Yz5zKh0FPiImtzHYcPuztG1AO8-6KEpUWgoChGbA0Ys,21
-tomwer-1.4.0.dist-info/RECORD,,
+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,,