tomwer 1.3.7__tar.gz → 1.3.9__tar.gz

{tomwer-1.3.7/tomwer.egg-info → tomwer-1.3.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tomwer
-Version: 1.3.7
+Version: 1.3.9
 Summary: "tomography workflow tools"
 Home-page: https://gitlab.esrf.fr/tomotools/tomwer
 Author: data analysis unit

{tomwer-1.3.7 → tomwer-1.3.9}/tomwer/core/process/reconstruction/nabu/nabuslices.py

@@ -173,14 +173,6 @@ def run_slices_reconstruction(
 
     # handle special cases like several db...
     nabu_configurations = interpret_tomwer_configuration(config, scan=scan)
-    if "phase" in config and "delta_beta" in config["phase"]:
-        db_list = utils.retrieve_lst_of_value_from_str(
-            config["phase"]["delta_beta"], type_=float
-        )
-    else:
-        db_list = ()
-    ask_sinogram_registration = len(db_list) > 0
-    ask_sinogram_load = False
     output_urls = []
     stderrs = []
     stdouts = []
@@ -199,8 +191,6 @@ def run_slices_reconstruction(
             scan=scan,
             slice_index=slice_index,
             dry_run=dry_run,
-            ask_sinogram_registration=ask_sinogram_registration,
-            ask_sinogram_load=ask_sinogram_load,
             instanciate_class_only=instanciate_classes_only,
             axis=config.get("reconstruction", {}).get("slice_plane", "XY"),
         )
@@ -238,9 +228,6 @@ def run_slices_reconstruction(
             final_configs.append(result.config)
             all_succeed = all_succeed and result.success
 
-        if ask_sinogram_registration:
-            ask_sinogram_load = True
-            ask_sinogram_registration = False
         if advancement is not None:
             advancement.increaseAdvancement(1)
 
@@ -640,8 +627,6 @@ class SingleSliceRunner(_NabuBaseReconstructor):
         slice_index: Union[int, str, None],
         axis: NabuPlane,
         target: Target,
-        ask_sinogram_registration: bool,
-        ask_sinogram_load: bool,
         cluster_config: Optional[dict],
         process_name: str,
         add_to_latest_reconstructions: bool = True,
@@ -658,8 +643,6 @@ class SingleSliceRunner(_NabuBaseReconstructor):
         if not isinstance(config, dict):
             raise TypeError(f"config is expected to be a dictionary not {type(dict)}")
         self._config = config
-        self._ask_sinogram_registration = ask_sinogram_registration
-        self._ask_sinogram_load = ask_sinogram_load
         self._add_to_latest_reconstructions = add_to_latest_reconstructions
 
     @property
@@ -670,14 +653,6 @@ class SingleSliceRunner(_NabuBaseReconstructor):
     def config(self):
         return self._config
 
-    @property
-    def ask_sinogram_load(self):
-        return self._ask_sinogram_load
-
-    @property
-    def ask_sinogram_registration(self):
-        return self._ask_sinogram_registration
-
     @property
     def add_to_latest_reconstructions(self):
         return self._add_to_latest_reconstructions
@@ -721,25 +696,8 @@ class SingleSliceRunner(_NabuBaseReconstructor):
         # force overwrite results
         if "output" not in config:
             config["output"] = {}
-        # handle nabu sinogram step
-        if self.scan.process_file is not None:
-            steps_file_basename, _ = os.path.splitext(self.scan.process_file)
-            steps_file_basename = "_".join(
-                ("steps_file_basename", "nabu", "sinogram", "save", "step")
-            )
-            steps_file_basename = steps_file_basename + ".hdf5"
-            steps_file = os.path.join(
-                os.path.dirname(self.scan.process_file), steps_file_basename
-            )
-        else:
-            steps_file = ""
 
         config["output"].update({"overwrite_results": 1})
-        config["pipeline"] = {
-            "save_steps": "sinogram" if self.ask_sinogram_registration else "",
-            "resume_from_step": "sinogram" if self.ask_sinogram_load else "",
-            "steps_file": steps_file,
-        }
 
         config, cfg_folder = self._treateOutputSliceConfig(config)
         # the policy is to save nabu .cfg file at the same location as the
@@ -918,8 +876,6 @@ def run_single_slice_reconstruction(
     nabu_config,
     dry_run,
     slice_index: Union[int, str, None],
-    ask_sinogram_registration: bool,
-    ask_sinogram_load: bool,
     process_id: Optional[int] = None,
     cluster_config: Optional[dict] = None,
     add_to_latest_reconstructions=True,
@@ -938,8 +894,6 @@ def run_single_slice_reconstruction(
     :param local:
     :param stdout: file to redirect stdout
     :param stderr: file to redirect stderr
-    :param bool ask_sinogram_registration: should we ask nabu to register sinogram
-    :param bool ask_sinogram_load: should we ask nabu to load sinogram
     :param bool add_to_latest_reconstructions: if true add reconstructed slice to the latest reconstruction.
                                                We wan't to avoid this treatment for saaxis and sadeltebeta for example
     :param bool instanciate_class_only: if we don't want to run the SingleSliceRunner but only return them. Use case: we want to keep a hand on processing and it can be cancelled
@@ -970,8 +924,6 @@ def run_single_slice_reconstruction(
         slice_index=slice_index,
         axis=axis,
         target=target,
-        ask_sinogram_registration=ask_sinogram_registration,
-        ask_sinogram_load=ask_sinogram_load,
         cluster_config=cluster_config,
         add_to_latest_reconstructions=add_to_latest_reconstructions,
         process_name=process_name,

{tomwer-1.3.7 → tomwer-1.3.9}/tomwer/core/process/reconstruction/nabu/utils.py

@@ -461,6 +461,8 @@ def nabu_std_err_has_error(errs: typing.Optional[bytes]):
             in line
             or "return SourceModule(" in line
             or "CUBLAS" in line
+            or "Not supported for EDF"
+            in line  # debatable but very disturbing from the gui side... anyway EDF days are coming to an end
         )
 
     if errs is None:

{tomwer-1.3.7 → tomwer-1.3.9}/tomwer/gui/control/datawatcher/datawatcher.py

@@ -148,7 +148,6 @@ class DataWatcherWidget(_DataWatcher, qt.QMainWindow):
 
         # set initial path to observe
         self.setFolderObserved(self._getInitPath())
-        self._initStatusView()
 
         # hide all windows by default
         for widget in (
@@ -475,20 +474,10 @@ class DataWatcherWidget(_DataWatcher, qt.QMainWindow):
             self.observationThread.sigScanReady.disconnect(self._signalScanReady)
             self.obsThIsConnected = False
 
-    def _initStatusView(self):
-        """
-        The status view need a thread to update the animated icon when scanning
-        """
-        self.__threadAnimation = QWaiterThread(0.1)
-        self.__threadAnimation.finished.connect(self._updateAnimatedIcon)
-
     def _updateStatusView(self):
         """Update the processing state"""
         if self.currentStatus in self._animatedStates:
-            if not self.__threadAnimation.isRunning():
-                self.__threadAnimation.start()
-            elif self.__threadAnimation is not None:
-                self.__threadAnimation.wait(4000)
+            pass
         elif self.currentStatus == "acquisition ended":
             self._setStateIcon(silxicons.getQIcon("selected"))
         elif self.currentStatus == "failure":
@@ -506,18 +495,6 @@ class DataWatcherWidget(_DataWatcher, qt.QMainWindow):
         else:
             self._stateLabel.setPixmap(icon.pixmap(30, state=qt.QIcon.On))
 
-    def _updateAnimatedIcon(self):
-        """Simple function which manage the waiting icon"""
-        if self.currentStatus in self._animatedStates:
-            icon = self.animated_icon.currentIcon()
-            if icon is None:
-                icon = qt.QIcon()
-            self.animated_icon._updateState()
-            self._setStateIcon(icon)
-
-            # get ready for the next animation
-            self.__threadAnimation.start()
-
     def _signalScanReady(self, scan):
         if type(scan) is str:
             try:

{tomwer-1.3.7 → tomwer-1.3.9}/tomwer/version.py

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

{tomwer-1.3.7 → tomwer-1.3.9/tomwer.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tomwer
-Version: 1.3.7
+Version: 1.3.9
 Summary: "tomography workflow tools"
 Home-page: https://gitlab.esrf.fr/tomotools/tomwer
 Author: data analysis unit