tomwer 1.3.21__py3-none-any.whl → 1.3.23__py3-none-any.whl

tomwer/core/process/reconstruction/axis/params.py

@@ -62,10 +62,10 @@ _WITH_PAG = "withpag"
 _NO_PAG = "nopag"
 
 
-DEFAULT_CMP_THETA = 10
-DEFAULT_CMP_N_SUBSAMPLING_Y = 10
+DEFAULT_CMP_THETA = 5
+DEFAULT_CMP_N_SUBSAMPLING_Y = 40
 DEFAULT_CMP_NEAR_POS = 0
-DEFAULT_CMP_NEAR_WIDTH = 20
+DEFAULT_CMP_NEAR_WIDTH = 40
 DEFAULT_CMP_OVERSAMPLING = 4
 DEFAULT_CMP_TAKE_LOG = True
 

tomwer/core/utils/scanutils.py

@@ -40,7 +40,10 @@ from silx.io.utils import h5py_read_dataset
 from tomoscan.esrf.scan.mock import MockEDF as _MockEDF
 from tomoscan.esrf.scan.mock import MockNXtomo as _MockNXtomo
 from tomoscan.io import HDF5File
-from tomoscan.test.utils import MockContext
+try:
+    from tomoscan.test.utils import MockContext
+except ImportError:
+    from tomoscan.tests.utils import MockContext
 
 from tomwer.core.scan.blissscan import BlissScan
 from tomwer.core.scan.nxtomoscan import NXtomoScan

tomwer/gui/cluster/slurm.py

@@ -401,6 +401,7 @@ class SlurmSettingsWidget(qt.QWidget):
         self._queue.currentTextChanged.connect(self._partitionChanged)
         self._nGpu.valueChanged.connect(self._nGpuChanged)
         self._gpuCardCB.currentTextChanged.connect(self._configurationChanged)
+        self._exportValueCM.currentIndexChanged.connect(self._configurationChanged)
 
     def _nGpuChanged(self, *args, **kwargs):
         nGpu = self.getNGPU()

tomwer/tests/datasets.py

@@ -1,5 +1,8 @@
 import os
-from tomoscan.test.datasets import GitlabProject
+try:
+    from tomoscan.test.datasets import GitlabProject
+except ImportError:
+    from tomoscan.tests.datasets import GitlabProject
 
 TomwerCIDatasets = GitlabProject(
     branch_name="tomwer",

tomwer/version.py

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

{tomwer-1.3.21.dist-info → tomwer-1.3.23.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tomwer
-Version: 1.3.21
+Version: 1.3.23
 Summary: "tomography workflow tools"
 Home-page: https://gitlab.esrf.fr/tomotools/tomwer
 Author: data analysis unit
@@ -27,7 +27,7 @@ Requires-Dist: psutil
 Requires-Dist: silx[full] >=2.0
 Requires-Dist: tomoscan >=2.0.0a11
 Requires-Dist: nxtomo <1.3,>=1.2.3rc1
-Requires-Dist: nxtomomill >=1.0dev
+Requires-Dist: nxtomomill <1.1,>=1.0dev
 Requires-Dist: processview >=1.3
 Requires-Dist: ewoks >=0.1.1
 Requires-Dist: ewoksorange <0.7,>=0.6
@@ -35,27 +35,6 @@ Requires-Dist: sluurp >=0.3.3
 Requires-Dist: packaging
 Requires-Dist: flufl-lock
 Requires-Dist: pyunitsystem <2.0,>=1.1.0
-Provides-Extra: _dev_spec
-Requires-Dist: black ; extra == '_dev_spec'
-Requires-Dist: flake8 ; extra == '_dev_spec'
-Requires-Dist: timeout-decorator ; extra == '_dev_spec'
-Requires-Dist: pyopencl ; extra == '_dev_spec'
-Provides-Extra: _full_base
-Requires-Dist: ewoks[orange] >=0.1.1 ; extra == '_full_base'
-Requires-Dist: rsyncmanager ; extra == '_full_base'
-Requires-Dist: graypy ; extra == '_full_base'
-Requires-Dist: fabio ; extra == '_full_base'
-Requires-Dist: h5py >=3 ; extra == '_full_base'
-Requires-Dist: lxml ; extra == '_full_base'
-Requires-Dist: werkzeug ; extra == '_full_base'
-Requires-Dist: json-rpc ; extra == '_full_base'
-Requires-Dist: scipy ; extra == '_full_base'
-Requires-Dist: Pillow ; extra == '_full_base'
-Requires-Dist: glymur ; extra == '_full_base'
-Requires-Dist: resource ; extra == '_full_base'
-Requires-Dist: tifffile ; extra == '_full_base'
-Requires-Dist: hdf5plugin ; extra == '_full_base'
-Requires-Dist: pyicat-plus ; extra == '_full_base'
 Provides-Extra: dev
 Requires-Dist: ewoks[orange] >=0.1.1 ; extra == 'dev'
 Requires-Dist: rsyncmanager ; extra == 'dev'
@@ -100,6 +79,11 @@ Requires-Dist: black ; extra == 'dev_no_cuda'
 Requires-Dist: flake8 ; extra == 'dev_no_cuda'
 Requires-Dist: timeout-decorator ; extra == 'dev_no_cuda'
 Requires-Dist: pyopencl ; extra == 'dev_no_cuda'
+Provides-Extra: dev_spec
+Requires-Dist: black ; extra == 'dev_spec'
+Requires-Dist: flake8 ; extra == 'dev_spec'
+Requires-Dist: timeout-decorator ; extra == 'dev_spec'
+Requires-Dist: pyopencl ; extra == 'dev_spec'
 Provides-Extra: doc
 Requires-Dist: ewoks[orange] >=0.1.1 ; extra == 'doc'
 Requires-Dist: rsyncmanager ; extra == 'doc'
@@ -143,6 +127,22 @@ Requires-Dist: pyicat-plus ; extra == 'full'
 Requires-Dist: nabu[full] >=2023.3.1dev ; extra == 'full'
 Requires-Dist: pycuda <2024.1.1 ; extra == 'full'
 Requires-Dist: scikit-cuda ; extra == 'full'
+Provides-Extra: full_base
+Requires-Dist: ewoks[orange] >=0.1.1 ; extra == 'full_base'
+Requires-Dist: rsyncmanager ; extra == 'full_base'
+Requires-Dist: graypy ; extra == 'full_base'
+Requires-Dist: fabio ; extra == 'full_base'
+Requires-Dist: h5py >=3 ; extra == 'full_base'
+Requires-Dist: lxml ; extra == 'full_base'
+Requires-Dist: werkzeug ; extra == 'full_base'
+Requires-Dist: json-rpc ; extra == 'full_base'
+Requires-Dist: scipy ; extra == 'full_base'
+Requires-Dist: Pillow ; extra == 'full_base'
+Requires-Dist: glymur ; extra == 'full_base'
+Requires-Dist: resource ; extra == 'full_base'
+Requires-Dist: tifffile ; extra == 'full_base'
+Requires-Dist: hdf5plugin ; extra == 'full_base'
+Requires-Dist: pyicat-plus ; extra == 'full_base'
 Provides-Extra: full_no_cuda
 Requires-Dist: ewoks[orange] >=0.1.1 ; extra == 'full_no_cuda'
 Requires-Dist: rsyncmanager ; extra == 'full_no_cuda'

{tomwer-1.3.21.dist-info → tomwer-1.3.23.dist-info}/RECORD

@@ -1,4 +1,4 @@
-tomwer-1.3.21-py3.11-nspkg.pth,sha256=UYCZtLWueceGiAlmXKRJUZ0TWQEubpPoQ1pVnAAsME0,502
+tomwer-1.3.23-py3.12-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
@@ -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=o6TW9xqGYyYLHUGvLiiYEiiDHP6lwWlX63jMLPNh374,8432
-tomwer/version.py,sha256=8PXhlaf-KJdWTwZitiY1R4f6MihzpOrr5dupPob33gY,4387
+tomwer/version.py,sha256=3PnnBZpP3fcPoDSf1-7e1sJpLittFcyS4LWIaabk0KA,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
@@ -314,7 +314,7 @@ tomwer/core/process/reconstruction/axis/__init__.py,sha256=VSQkN6M6JvM_c55OiboNy
 tomwer/core/process/reconstruction/axis/anglemode.py,sha256=sOkuTqO8sR8xd_tEwZHj-o1TA1z33AmwwZbrPnuYqmI,1896
 tomwer/core/process/reconstruction/axis/axis.py,sha256=nkBkDjB5yGkxRNWtjnFrixwOE_qCx5iNloIpWEZne3M,42723
 tomwer/core/process/reconstruction/axis/mode.py,sha256=CvYf-Mat3Vc6Ki1RSUQl4_Z02OKdmXUmpknnLmUgz5k,6750
-tomwer/core/process/reconstruction/axis/params.py,sha256=y1RgFAk1wiJMeueSNJH5enUnUDxw-jsb9_JF_XxSYks,33185
+tomwer/core/process/reconstruction/axis/params.py,sha256=If_WYx8FZUxMeqMclUj_QfMMT1NVI-H1U5NAvem9VzI,33184
 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
@@ -412,7 +412,7 @@ tomwer/core/utils/logconfig.py,sha256=xlMqmecIAfnvs4-xFTvbtmZZ_FrX1fY39jq8NC0Km3
 tomwer/core/utils/normalization.py,sha256=szgQT_LuYiU7yDQ19wOjIGKcjnz_HqQdOQJKHkaugAY,2900
 tomwer/core/utils/nxtomoutils.py,sha256=S4MwQAOhcKPbNaWhTewoA_OxsY9EcrpdDAy6BW84gQM,2685
 tomwer/core/utils/resource.py,sha256=aJ5TDJpS9DthtwUiIbsBHU6ii-Odlnl_w2dUQ3DUkyI,1932
-tomwer/core/utils/scanutils.py,sha256=DRhOtsE8HxvGRxV8D1CjYfM0AanMUlo8jxppI1H8wNI,15641
+tomwer/core/utils/scanutils.py,sha256=viwdgpDCdP5ZX89einHDV67GpPtVPuU0jErjNJHDASc,15719
 tomwer/core/utils/slurm.py,sha256=ven6uAHywHo4G5vjqGNRVljkH-LBJwFDPz5pBAXFK1U,1923
 tomwer/core/utils/spec.py,sha256=QwtoyYkhi89t5IhrR-gbQ-Po5JByyD2HxOBMgdXwFUg,7560
 tomwer/core/utils/threads.py,sha256=_JO6WEbdJo74ZhrFpojM2pVgDmenejump7a568fFu2E,3189
@@ -437,7 +437,7 @@ tomwer/gui/settings.py,sha256=2Uy0itj8Dg-Owtay852l_oSCop2CQBFqIU11iVj2-nE,244
 tomwer/gui/stackplot.py,sha256=Bz-6Taen3RKAa6FYKeZ81M27r9hahbjAr7Cnx0TsPhE,25517
 tomwer/gui/stacks.py,sha256=iyMDSmVRn4u1Nf7mqIcmYJEVw86GReEK4zepB6DKTmk,8650
 tomwer/gui/cluster/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tomwer/gui/cluster/slurm.py,sha256=MEPXKzJGkgnxkWvpuIJ93zecHq_lxaE3m5DQ5MpTed4,27604
+tomwer/gui/cluster/slurm.py,sha256=mXTAX62V7Nvb8al9HTnDJTOx5aDRzO-bn3o-djkqnog,27688
 tomwer/gui/cluster/supervisor.py,sha256=afsXoPocymwhKABam1U2o8LshtVuTMdKaJXBWQAhVNY,17117
 tomwer/gui/cluster/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tomwer/gui/cluster/test/test_cluster.py,sha256=qGDSr3GMPo-nhXtaG-O6hQKzXAh7J9LgaHr8a8sUFRc,3937
@@ -770,16 +770,16 @@ tomwer/synctools/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3
 tomwer/synctools/utils/scanstages.py,sha256=GaglgWjtlgTOtEH8F1tU_8EOP-dDsVWmtUt5sZ0FvUs,9263
 tomwer/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tomwer/tests/conftest.py,sha256=0XlKfOrVtPg8VmyQn4BoK_mzcliFUtacDGLlZ5wD_PM,1912
-tomwer/tests/datasets.py,sha256=Gz-gUkrKmE6WXjyXQUKKdSn-czEArrGZxgiXDbM76IA,335
+tomwer/tests/datasets.py,sha256=debSTWacHYbVmEaH4nRQPwK17VswkUFCIY9ss-iT1q8,418
 tomwer/tests/test_scripts.py,sha256=LAVRe9PLj-8I-9upzd4QTXhktIpuaCFmVyw_e_Lhwrk,5117
 tomwer/tests/test_utils.py,sha256=D0rNDSK6csEOYBY_7gD-4A3jp8rYAm8L1_Xg34A9I2s,305
 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.21.dist-info/LICENSE,sha256=yR_hIZ1MfDh9x2_s23uFqBH7m5DgrBl9nJKkE37YChM,1877
-tomwer-1.3.21.dist-info/METADATA,sha256=n7yg9MZT6SK37fHoLgaBIwO6Izqqe6-itPkhmwR487w,10734
-tomwer-1.3.21.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-tomwer-1.3.21.dist-info/entry_points.txt,sha256=fIcDnCxjgwzfIylLYhUsFyiNZjZMxsfRQBxi4f-cJg8,440
-tomwer-1.3.21.dist-info/namespace_packages.txt,sha256=Iut-JTfT11SZHHm77_ZeszD7pZDWXcTweCbvrJpqDyQ,14
-tomwer-1.3.21.dist-info/top_level.txt,sha256=Yz5zKh0FPiImtzHYcPuztG1AO8-6KEpUWgoChGbA0Ys,21
-tomwer-1.3.21.dist-info/RECORD,,
+tomwer-1.3.23.dist-info/LICENSE,sha256=yR_hIZ1MfDh9x2_s23uFqBH7m5DgrBl9nJKkE37YChM,1877
+tomwer-1.3.23.dist-info/METADATA,sha256=jwtJdynstptioXmo2pUtwkYBdyyyVWW_H5YqUNhjZxQ,10718
+tomwer-1.3.23.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+tomwer-1.3.23.dist-info/entry_points.txt,sha256=fIcDnCxjgwzfIylLYhUsFyiNZjZMxsfRQBxi4f-cJg8,440
+tomwer-1.3.23.dist-info/namespace_packages.txt,sha256=Iut-JTfT11SZHHm77_ZeszD7pZDWXcTweCbvrJpqDyQ,14
+tomwer-1.3.23.dist-info/top_level.txt,sha256=Yz5zKh0FPiImtzHYcPuztG1AO8-6KEpUWgoChGbA0Ys,21
+tomwer-1.3.23.dist-info/RECORD,,

{tomwer-1.3.21.dist-info → tomwer-1.3.23.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.1.0)
+Generator: setuptools (75.2.0)
 Root-Is-Purelib: true
 Tag: py3-none-any