tomwer 1.3.12__py3-none-any.whl → 1.3.13__py3-none-any.whl

orangecontrib/tomwer/widgets/reconstruction/DarkRefAndCopyOW.py

@@ -152,6 +152,7 @@ class DarkRefAndCopyOW(SuperviseOW, WidgetLongProcessing):
         self.widget.recons_params.sigChanged.connect(self._updateSettingsVals)
         self.widget.sigModeAutoChanged.connect(self._updateSettingsVals)
         self.widget.sigCopyActivationChanged.connect(self._updateSettingsVals)
+        self.widget.sigClearCache.connect(self._processing_stack.clear_cache)
         self._processing_stack.sigComputationStarted.connect(self._startProcessing)
         self._processing_stack.sigComputationEnded.connect(self._endProcessing)
         self._processing_stack.sigRefSetted.connect(self.widget.setRefSetBy)

tomwer/core/process/reconstruction/darkref/darkrefscopy.py

@@ -34,6 +34,7 @@ __date__ = "17/08/2021"
 
 import logging
 import os
+import h5py
 import tempfile
 from typing import Union
 
@@ -198,10 +199,21 @@ class DarkRefsCopy(DarkRefsTask):
             update_mode="replace",
         )
 
+    def _clear_cache_data_path(self, file_path: str, data_path: str):
+        if not os.path.exists(file_path):
+            return
+        with h5py.File(file_path, mode="a") as h5f:
+            if data_path in h5f:
+                del h5f[data_path]
+
     def set_darks_and_flats_from_scan(self, scan: TomwerScanBase) -> bool:
         if scan.reduced_flats in (None, {}):
             logger.warning(f"No flat found for {scan}. Unable to copy them")
         else:
+            self._clear_cache_data_path(
+                file_path=self._flats_url.file_path(),
+                data_path=self._flats_url.data_path(),
+            )
             dicttoh5(
                 scan.reduced_flats,
                 h5file=self._flats_url.file_path(),
@@ -212,6 +224,10 @@ class DarkRefsCopy(DarkRefsTask):
         if scan.reduced_darks in (None, {}):
             logger.warning(f"No dark found for {scan}. Unable to copy them")
         else:
+            self._clear_cache_data_path(
+                file_path=self._darks_url.file_path(),
+                data_path=self._darks_url.data_path(),
+            )
             dicttoh5(
                 scan.reduced_darks,
                 h5file=self._darks_url.file_path(),
@@ -247,10 +263,6 @@ class DarkRefsCopy(DarkRefsTask):
                 overwrite=True,
             )
 
-    def clean_save_files(self):
-        if os.path.exists(self._save_file):
-            os.remove(self._save_file)
-
     def run(self):
         """
         This is function triggered when a new scan / data is received.

tomwer/gui/control/selectorwidgetbase.py

@@ -156,7 +156,9 @@ class _SelectorWidget(qt.QMainWindow):
 
     def removeSelectedDatasets(self):
         sItem = self.dataList.selectedItems()
-        selection = [_item.text().get_identifier().to_str() for _item in sItem]
+        selection = [
+            _item.data(qt.Qt.UserRole).get_identifier().to_str() for _item in sItem
+        ]
 
         with block_signals(self):
             # make sure sigUpdated is called only once.

tomwer/gui/reconstruction/darkref/darkrefcopywidget.py

@@ -54,6 +54,7 @@ class DarkRefAndCopyWidget(DarkRefWidget):
     """Signal emitted when the mode auto change"""
     sigCopyActivationChanged = qt.Signal()
     """Signal emitted when the copy is activated or deactivated"""
+    sigClearCache = qt.Signal()
 
     def __init__(self, save_dir: str, parent=None, reconsparams=None, process_id=None):
         DarkRefWidget.__init__(
@@ -79,6 +80,7 @@ class DarkRefAndCopyWidget(DarkRefWidget):
         self._refCopyWidget.sigCopyActivationChanged.connect(
             self._triggerCopyActivation
         )
+        self._refCopyWidget.sigClearCache.connect(self.sigClearCache)
 
     def setRefSetBy(self, scan_id: str):
         self._refCopyWidget._statusBar.showMessage(f"ref set from {scan_id}")
@@ -155,6 +157,8 @@ class RefCopyWidget(qt.QGroupBox):
     """Signal emitted when the mode auto change"""
     sigCopyActivationChanged = qt.Signal()
     """Signal emitted when the copy is activated or deactivated"""
+    sigClearCache = qt.Signal()
+    """Signal when the cache needs to be cleared"""
 
     _DEFAULT_DIRECTORY = "/lbsram/data/visitor"
     """Default directory used when the user need to set path to references"""
@@ -190,6 +194,12 @@ class RefCopyWidget(qt.QGroupBox):
         spacer = qt.QWidget(self)
         spacer.setSizePolicy(qt.QSizePolicy.Minimum, qt.QSizePolicy.Expanding)
         self.layout().addWidget(spacer)
+        self._removeCacheFile = qt.QPushButton("clear cache")
+        self._removeCacheFile.setToolTip(
+            "Remove the file used for cacheing reduce dark / flat."
+        )
+        self.layout().addWidget(self._removeCacheFile)
+
         self.layout().addWidget(self.__createStatusBarGUI())
 
         self.setModeAuto(True)
@@ -201,6 +211,7 @@ class RefCopyWidget(qt.QGroupBox):
         # connect signal / slot
         self.toggled.connect(self._triggerCopyActivated)
         self._qcbAutoMode.toggled.connect(self._triggerModeAutoChanged)
+        self._removeCacheFile.released.connect(self.sigClearCache)
 
     def _triggerCopyActivated(self, *args, **kwargs):
         self.sigCopyActivationChanged.emit()

tomwer/synctools/stacks/reconstruction/dkrefcopy.py

@@ -26,6 +26,7 @@ __authors__ = ["H.Payno"]
 __license__ = "MIT"
 __date__ = "13/08/2021"
 
+import os
 import functools
 import logging
 import shutil
@@ -132,6 +133,15 @@ class DarkRefCopyProcessStack(FIFO, qt.QObject):
     def _create_processing_thread(self, process_id=None) -> qt.QThread:
         return _ProcessingThread(process_id=process_id, save_dir=self._save_dir)
 
+    def clear_cache(self):
+        """
+        remove the file used to cache the reduced darks / flats.
+        This can be used in the case it contain unrelevant data. Like frame with another shape...
+        """
+        cache_file = DarkRefsCopy.get_save_file(self._save_dir)
+        if os.path.exists(cache_file):
+            os.remove(cache_file)
+
 
 class _ProcessingThread(ProcessingThread, SuperviseProcess):
     """

tomwer/version.py

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

{tomwer-1.3.12.dist-info → tomwer-1.3.13.dist-info}/METADATA

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

{tomwer-1.3.12.dist-info → tomwer-1.3.13.dist-info}/RECORD

@@ -1,4 +1,4 @@
-tomwer-1.3.12-py3.11-nspkg.pth,sha256=UYCZtLWueceGiAlmXKRJUZ0TWQEubpPoQ1pVnAAsME0,502
+tomwer-1.3.13-py3.11-nspkg.pth,sha256=UYCZtLWueceGiAlmXKRJUZ0TWQEubpPoQ1pVnAAsME0,502
 orangecontrib/tomwer/__init__.py,sha256=B4DXy1gY_wXmNYa2aOfapmJb2mEuCAjoaNEGnpBs70g,148
 orangecontrib/tomwer/state_summary.py,sha256=5_dPzweL3r0ye4ZfJo6IV2ThJI8fQhWoO2ySdJJajj8,1711
 orangecontrib/tomwer/orange/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -151,7 +151,7 @@ orangecontrib/tomwer/widgets/other/icons/hub.png,sha256=wnKSaxw2WnBkSQjI86aLZfdm
 orangecontrib/tomwer/widgets/other/icons/hub.svg,sha256=9EYoBKY-P-cO17nM48OPA9VDZSCbyGtrMRc80BGHflk,3735
 orangecontrib/tomwer/widgets/reconstruction/AxisOW.py,sha256=ffbMYzHWALir19bZhpXjYIgMfJjyyaeov9Uxp5tNyGs,22342
 orangecontrib/tomwer/widgets/reconstruction/CastNabuVolumeOW.py,sha256=Ev-TrwZ-HxmdMfZMsz512vhCOgXpGImVsdNdlPSnQIM,9604
-orangecontrib/tomwer/widgets/reconstruction/DarkRefAndCopyOW.py,sha256=DyjkZ3RDgUvEkK3yR8qCWQq9eaVus8I-64nvhrHN1ZQ,10988
+orangecontrib/tomwer/widgets/reconstruction/DarkRefAndCopyOW.py,sha256=nToQw3tj9Wm8s3wPsVBeMYh_F6FBtCsAKLsc2Dic4kk,11066
 orangecontrib/tomwer/widgets/reconstruction/NabuHelicalPrepareWeightsDoubleOW.py,sha256=aI8VcCK7m518xjjjvE8l3kpTQFEwjWF-hCKua4bBkJM,5967
 orangecontrib/tomwer/widgets/reconstruction/NabuOW.py,sha256=LzHxCuLrEQIVeGaYmcEO7rwxaT98mbXPdpMc6dCaAHE,12673
 orangecontrib/tomwer/widgets/reconstruction/NabuVolumeOW.py,sha256=B4iZdYHmbsim4qQD5UaMCg2lcJa3ZAim3_AZQC7bYIk,19195
@@ -220,7 +220,7 @@ orangecontrib/tomwer/widgets/visualization/icons/volumeviewer.svg,sha256=2uT9_px
 tomwer/__init__.py,sha256=82Jp1abyG4UWdGuT4nNU7LxaUV6xxkOte5pIz3w69Do,1745
 tomwer/__main__.py,sha256=jsDfWA2yl5am0dHQVkYwlKLxxqKNont6VDF-LusuawE,8575
 tomwer/utils.py,sha256=EgVwJ5CQVjoBvcKNwyVoXv_P4ciI11oxb8fNyy82Lck,8465
-tomwer/version.py,sha256=IDUyPUncjIHz-jVJ_hLVrrkFdMvxkotQuwEVTJGHUKo,4387
+tomwer/version.py,sha256=NB9NVW9JDgrzz_rw-aJi5JYGnpnQP-hHA1sASP_uZ14,4387
 tomwer/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tomwer/app/axis.py,sha256=Ax0wlTp9u0Ll_3ax23QP5Ck16_M9Kop7wx0hAbXrXyM,6004
 tomwer/app/canvas.py,sha256=RbQqgE7DuNjv4nGG6BNfnSevQO5_lCl7N71hGcLoxwE,1561
@@ -318,7 +318,7 @@ tomwer/core/process/reconstruction/axis/params.py,sha256=y1RgFAk1wiJMeueSNJH5enU
 tomwer/core/process/reconstruction/axis/projectiontype.py,sha256=0w_NZ0N95iInHuEQCIxJIxt7K-YpCUo2fZ-_vhZ6D7Q,1543
 tomwer/core/process/reconstruction/darkref/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tomwer/core/process/reconstruction/darkref/darkrefs.py,sha256=gbRq1IJ-9fxD71684wajQj3D_M9G6chm7ahZsjxTmpM,20862
-tomwer/core/process/reconstruction/darkref/darkrefscopy.py,sha256=6wEBs7yBZHeEADxDLZ-jYTxaeOBJCJacqfskkr1-ytE,13276
+tomwer/core/process/reconstruction/darkref/darkrefscopy.py,sha256=cWT2bM_ReVJ18cJKqQXp3IcKk0Z6W5NeJ03wpqTzjNk,13754
 tomwer/core/process/reconstruction/darkref/params.py,sha256=Pnl8XJ4et-u169wzUdhB8_woBEXPXtrGPLZEbXSwZDQ,10080
 tomwer/core/process/reconstruction/darkref/settings.py,sha256=35jliuOIjMKTOJjgn4uiotcDEr6RskpLHfRWWLm76dc,188
 tomwer/core/process/reconstruction/nabu/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -461,7 +461,7 @@ tomwer/gui/control/nxtomomill.py,sha256=DI7DsO98O8h9mFcJ_1y1Kb8nD6w09at8YvJZNHR_
 tomwer/gui/control/observations.py,sha256=oj2OqWYwiewgsZ5vNjzrMjB-YPopYyJmaBE5df09L7c,7735
 tomwer/gui/control/reducedarkflatselector.py,sha256=hW2D69B2THZn8lIOaUQJHJ6aGIn-tHjcynEfIn4DftA,20536
 tomwer/gui/control/scanselectorwidget.py,sha256=m3uxkoG4aNPPwamiI14l82PNS8tvIiOXmKhBJiwHgjU,2356
-tomwer/gui/control/selectorwidgetbase.py,sha256=avj6dkBJaryCQYF66vXbuYbaLAjTwmcdQ1L24DcUH6I,5571
+tomwer/gui/control/selectorwidgetbase.py,sha256=faMzMHM4KDZ9L8irDnwSdGhwg2EjErbLPfXSNUqU9ko,5607
 tomwer/gui/control/singletomoobj.py,sha256=5R_Uwgp5wdDQudxG2vyyq4Nj1GjhqH0HCeo_cFS7WuI,6777
 tomwer/gui/control/tomoobjdisplaymode.py,sha256=u7JPqTD_stisI3ouckVr60yEqZuYWkpF_FI9rKhxPzo,159
 tomwer/gui/control/volumeselectorwidget.py,sha256=mpbofAawBpzdc46IEkucTuiFJRDP18gWGdZjf5wUaTg,2082
@@ -510,7 +510,7 @@ tomwer/gui/reconstruction/axis/__init__.py,sha256=fUKWiRiG2o4Y-9RN-41VZMMM8L9Srl
 tomwer/gui/reconstruction/axis/axis.py,sha256=QLyrJzJrShjlnO3tLkcnv2oexzVkxw-SGgn3cYfmmEY,27260
 tomwer/gui/reconstruction/axis/radioaxis.py,sha256=hTweuwS-X32ZlpkHvP5X910zJ8p4fiJMsn_oUVtfvXM,92755
 tomwer/gui/reconstruction/darkref/__init__.py,sha256=g9LASP8OJjxCPEHXO14hN0OLjLkeUve6etaPm1LIz4c,1373
-tomwer/gui/reconstruction/darkref/darkrefcopywidget.py,sha256=9pgynAKXb5KEfPwjaSprcycMgg7K7DjgXdVUlc5xsJA,11562
+tomwer/gui/reconstruction/darkref/darkrefcopywidget.py,sha256=cfU2EJv_9LfCrKTHwnYwt2Kj4G6lMPbw0lbD-yjyT-Y,12053
 tomwer/gui/reconstruction/darkref/darkrefwidget.py,sha256=O33udHaezaanZD9L5D525KrB4FD77g_Spr7gAUxGEag,16468
 tomwer/gui/reconstruction/nabu/__init__.py,sha256=v2WxaBpu2zpGu7DEV96zaKAtHgRlcpORuAG2S0iF9O0,44
 tomwer/gui/reconstruction/nabu/castvolume.py,sha256=4lrfdBt_24p9_kb9qmytEtIfzPXFPzYVdV57wgMLVWQ,15003
@@ -758,7 +758,7 @@ tomwer/synctools/stacks/edit/imagekeyeditor.py,sha256=NNDQWMJEuE50zBk_2zJAWbf6hC
 tomwer/synctools/stacks/reconstruction/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tomwer/synctools/stacks/reconstruction/axis.py,sha256=9Gqh0isvLYupypOq3P7XM_lU4Hcni4l3V2aUZsAVLrc,8876
 tomwer/synctools/stacks/reconstruction/castvolume.py,sha256=PaoMuTxcj4Ms6N2MFnrCzmaCCC3wEZItYAwQ8NApe_o,8282
-tomwer/synctools/stacks/reconstruction/dkrefcopy.py,sha256=LlEtCh-nbftFo77s1QXnoISDQKQOBR-4AKfurgUj7zI,7040
+tomwer/synctools/stacks/reconstruction/dkrefcopy.py,sha256=01YdLs9xfmKFl7Wz3Qf9jawY6ePGp7fxcTus9BHNBeM,7402
 tomwer/synctools/stacks/reconstruction/nabu.py,sha256=dDqw74kobhkawquJIwLDQH--PN6LbbthlqZ9MQUBJi4,7816
 tomwer/synctools/stacks/reconstruction/normalization.py,sha256=wcw-tHjKUQMcija0bCExDl0InYsKHZNTeTk4w_hnaDI,5362
 tomwer/synctools/stacks/reconstruction/saaxis.py,sha256=N5LM4QPE1H06WXjEH-PGIMfWgCHkwR02QR3PENZ_JzE,7126
@@ -776,10 +776,10 @@ tomwer/tests/test_utils.py,sha256=D0rNDSK6csEOYBY_7gD-4A3jp8rYAm8L1_Xg34A9I2s,30
 tomwer/tests/utils.py,sha256=RAXx5A99WD4Vyuv_wjHBdr-Xu7UiThHRKw2eiB5GX10,107
 tomwer/third_part/WaitingOverlay.py,sha256=GnqiytcJDp_24Cmz_2nZAP5HfpL3Yh7AzR2ATIusGsg,3906
 tomwer/third_part/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tomwer-1.3.12.dist-info/LICENSE,sha256=yR_hIZ1MfDh9x2_s23uFqBH7m5DgrBl9nJKkE37YChM,1877
-tomwer-1.3.12.dist-info/METADATA,sha256=bUzdE3iiLKgWG_xxxestUTCEGqOuBQm0hw7MIbxm1SM,11460
-tomwer-1.3.12.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-tomwer-1.3.12.dist-info/entry_points.txt,sha256=fIcDnCxjgwzfIylLYhUsFyiNZjZMxsfRQBxi4f-cJg8,440
-tomwer-1.3.12.dist-info/namespace_packages.txt,sha256=Iut-JTfT11SZHHm77_ZeszD7pZDWXcTweCbvrJpqDyQ,14
-tomwer-1.3.12.dist-info/top_level.txt,sha256=Yz5zKh0FPiImtzHYcPuztG1AO8-6KEpUWgoChGbA0Ys,21
-tomwer-1.3.12.dist-info/RECORD,,
+tomwer-1.3.13.dist-info/LICENSE,sha256=yR_hIZ1MfDh9x2_s23uFqBH7m5DgrBl9nJKkE37YChM,1877
+tomwer-1.3.13.dist-info/METADATA,sha256=wWs75qkhJSr9ujUassUsmSCC5PGtRboBkMv07SI5Fu0,11460
+tomwer-1.3.13.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+tomwer-1.3.13.dist-info/entry_points.txt,sha256=fIcDnCxjgwzfIylLYhUsFyiNZjZMxsfRQBxi4f-cJg8,440
+tomwer-1.3.13.dist-info/namespace_packages.txt,sha256=Iut-JTfT11SZHHm77_ZeszD7pZDWXcTweCbvrJpqDyQ,14
+tomwer-1.3.13.dist-info/top_level.txt,sha256=Yz5zKh0FPiImtzHYcPuztG1AO8-6KEpUWgoChGbA0Ys,21
+tomwer-1.3.13.dist-info/RECORD,,