tomwer 1.4.19__py3-none-any.whl → 1.5.0__py3-none-any.whl

tomwer/tests/orangecontrib/tomwer/widgets/edit/tests/test_nxtomo_editor.py

@@ -3,6 +3,7 @@ import pickle
 
 import numpy
 import pytest
+import pint
 from nxtomomill.nexus.nxtomo import NXtomo
 from orangecanvas.scheme.readwrite import literal_dumps
 from silx.gui.utils.testutils import SignalListener
@@ -15,15 +16,21 @@ from tomwer.tests.utils import skip_gui_test
 from tomwer.gui.utils.qt_utils import QSignalSpy
 from tomwer.tests.conftest import qtapp  # noqa F401
 
+_ureg = pint.get_application_registry()
+
 
 def getDefaultConfig() -> dict:
     """return the configuration of the NXtomo editor. First value is the value of the field, second is: is the associated lock button locked or not"""
     return {
         NXtomoEditorKeys.ENERGY: (5.9, False),
+        NXtomoEditorKeys.SAMPLE_SOURCE_DISTANCE: (-55.2, False),
+        NXtomoEditorKeys.PROPAGATION_DISTANCE: (10.1, True),
         NXtomoEditorKeys.SAMPLE_DETECTOR_DISTANCE: (2.4, True),
         NXtomoEditorKeys.FIELD_OF_VIEW: ("Full", False),
-        NXtomoEditorKeys.X_PIXEL_SIZE: (0.023, True),
-        NXtomoEditorKeys.Y_PIXEL_SIZE: (0.025, True),
+        NXtomoEditorKeys.DETECTOR_X_PIXEL_SIZE: (0.023, True),
+        NXtomoEditorKeys.DETECTOR_Y_PIXEL_SIZE: (0.025, True),
+        NXtomoEditorKeys.SAMPLE_X_PIXEL_SIZE: (0.24, True),
+        NXtomoEditorKeys.SAMPLE_Y_PIXEL_SIZE: (0.26, True),
         NXtomoEditorKeys.X_FLIPPED: (True, True),
         NXtomoEditorKeys.Y_FLIPPED: (False, False),
         NXtomoEditorKeys.X_TRANSLATION: (0.0,),
@@ -49,41 +56,41 @@ def test_NXtomoEditorOW(
     signal_listener = SignalListener()
     window.sigScanReady.connect(signal_listener)
     # set up the widget to define and lock distance, energy and x pixel size
-    distance_widget = window.widget.mainWidget._distanceMetricEntry
-    distance_widget.setValue(0.6)
-    distance_widget.setUnit("mm")
-    distance_locker = window.widget.mainWidget._distanceLB
+    distance_widget = window.widget.mainWidget._sampleDetectorDistanceMetricEntry
+    distance_widget.setValue(value_m=0.6)
+    distance_widget.setUnit(_ureg.millimeter)
+    distance_locker = window.widget.mainWidget._sampleDetectorDistanceLB
     distance_locker.setLock(True)
     energy_widget = window.widget.mainWidget._energyEntry
     energy_widget.setValue(88.058)
     energy_locker = window.widget.mainWidget._energyLockerLB
     energy_locker.setLock(True)
-    x_pixel_widget = window.widget.mainWidget._xPixelSizeMetricEntry
-    x_pixel_widget.setValue(45)
-    x_pixel_widget.setUnit("nm")
-    x_pixel_locker = window.widget.mainWidget._xPixelSizeLB
+    x_pixel_widget = window.widget.mainWidget._xDetectorPixelSizeMetricEntry
+    x_pixel_widget.setValue(value_m=45)
+    x_pixel_widget.setUnit(_ureg.nanometer)
+    x_pixel_locker = window.widget.mainWidget._xDetectorPixelSizeLB
     x_pixel_locker.setLock(True)
 
     # 1.0 create nx tomos with raw data
     nx_tomo = NXtomo()
     nx_tomo.instrument.detector.x_pixel_size = (
-        0.023  # should be overwrite by the configuration / lock buttons
+        0.023 * _ureg.meter  # should be overwrite by the configuration / lock buttons
     )
     nx_tomo.instrument.detector.y_pixel_size = (
-        0.025  # should be overwrite by the configuration / lock buttons
+        0.025 * _ureg.meter  # should be overwrite by the configuration / lock buttons
     )
     nx_tomo.instrument.detector.field_of_view = "full"
     nx_tomo.instrument.detector.distance = (
-        2.4  # should be overwrite by the configuration / lock buttons
+        2.4 * _ureg.meter  # should be overwrite by the configuration / lock buttons
     )
     nx_tomo.instrument.detector.x_flipped = (
         False  # should be overwrite by the configuration / lock buttons
     )
     nx_tomo.instrument.detector.y_flipped = True
-    nx_tomo.energy = 5.9
+    nx_tomo.energy = 5.9 * _ureg.keV
     nx_tomo.instrument.detector.image_key_control = [ImageKey.PROJECTION.value] * 12
     nx_tomo.instrument.detector.data = numpy.empty(shape=(12, 10, 10))
-    nx_tomo.sample.rotation_angle = numpy.linspace(0, 20, num=12)
+    nx_tomo.sample.rotation_angle = numpy.linspace(0, 20, num=12) * _ureg.degree
 
     file_path = os.path.join(tmp_path, "nxtomo.nx")
     entry = "entry0000"
@@ -109,18 +116,20 @@ def test_NXtomoEditorOW(
         detector_data_as="as_numpy_array",
     )
     numpy.testing.assert_almost_equal(
-        overwrite_nx_tomo.instrument.detector.x_pixel_size.si_value, 45e-9
+        overwrite_nx_tomo.instrument.detector.x_pixel_size.to_base_units().magnitude,
+        (45e-9 * _ureg.meter).to_base_units().magnitude,
     )
     assert (
-        overwrite_nx_tomo.instrument.detector.y_pixel_size.si_value
-        == nx_tomo.instrument.detector.y_pixel_size.si_value
+        overwrite_nx_tomo.instrument.detector.y_pixel_size
+        == nx_tomo.instrument.detector.y_pixel_size
     )
     assert (
         overwrite_nx_tomo.instrument.detector.field_of_view
         == nx_tomo.instrument.detector.field_of_view
     )
     numpy.testing.assert_almost_equal(
-        overwrite_nx_tomo.instrument.detector.distance.value, 6.0e-4
+        overwrite_nx_tomo.instrument.detector.distance.to_base_units().magnitude,
+        (6.0e-4 * _ureg.meter).to_base_units().magnitude,
     )
     assert (
         overwrite_nx_tomo.instrument.detector.x_flipped
@@ -131,7 +140,10 @@ def test_NXtomoEditorOW(
         overwrite_nx_tomo.instrument.detector.y_flipped
         == True  # is not locked and is initially set to False (should load it and ignore overwriting)
     )
-    numpy.testing.assert_almost_equal(overwrite_nx_tomo.energy.value, 88.058)
+    numpy.testing.assert_almost_equal(
+        overwrite_nx_tomo.energy.to_base_units().magnitude,
+        (88.058 * _ureg.keV).to_base_units().magnitude,
+    )
     numpy.testing.assert_array_almost_equal(
         overwrite_nx_tomo.instrument.detector.data,
         nx_tomo.instrument.detector.data,

tomwer/tests/orangecontrib/tomwer/widgets/reconstruction/tests/test_nabu_widget.py

@@ -101,7 +101,7 @@ class TestNabuWidget(TestCaseQt):
         self.wait_processing()
         self.assertEqual(self.widget.getMode(), _NabuMode.HALF_ACQ)
         self.patch_fov(value=FOV.FULL.value)
-        self.scan.clear_caches()
+        self.scan.clear_cache()
         self.widget.process(self.scan)
         self.wait_processing()
         self.assertEqual(self.widget.getMode(), _NabuMode.FULL_FIELD)

tomwer/version.py

@@ -76,8 +76,8 @@ RELEASE_LEVEL_VALUE = {
 }
 
 MAJOR = 1
-MINOR = 4
-MICRO = 19
+MINOR = 5
+MICRO = 0
 RELEV = "final"  # <16
 SERIAL = 0  # <16
 

{tomwer-1.4.19.dist-info → tomwer-1.5.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tomwer
-Version: 1.4.19
+Version: 1.5.0
 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
@@ -18,22 +18,22 @@ Classifier: Operating System :: POSIX
 Classifier: Natural Language :: English
 Classifier: Topic :: Scientific/Engineering :: Physics
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Python: >=3.6
+Requires-Python: >=3.9
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 Requires-Dist: numpy
 Requires-Dist: setuptools
 Requires-Dist: psutil
-Requires-Dist: silx[full]<2.1.1,>=2.0
-Requires-Dist: tomoscan>=2.1.0a18
-Requires-Dist: nxtomo<2.0,>=1.3.0dev4
-Requires-Dist: nxtomomill>=1.1.0a0
+Requires-Dist: silx[full]>=2.1.1
+Requires-Dist: tomoscan>=2.2.0a6
+Requires-Dist: nxtomo>=2.0.0dev2
+Requires-Dist: nxtomomill>=1.2.0dev1
 Requires-Dist: processview>=1.5.0
 Requires-Dist: ewoks>=0.1.1
 Requires-Dist: ewokscore<1.1.0
 Requires-Dist: sluurp>=0.4.1
 Requires-Dist: packaging
-Requires-Dist: pyunitsystem>=2.0.0a
+Requires-Dist: pint
 Requires-Dist: tqdm
 Provides-Extra: full-base
 Requires-Dist: orange-canvas-core; extra == "full-base"
@@ -227,7 +227,7 @@ Requires-Dist: ewoksnotify[full]; extra == "test"
 Requires-Dist: pyicat_plus; extra == "test"
 Requires-Dist: nabu>=2023.3.1dev; extra == "test"
 Requires-Dist: pytest-asyncio; extra == "test"
-Requires-Dist: tomoscan[test]>=2.1.0a18; extra == "test"
+Requires-Dist: tomoscan[test]>=2.2.0a6; extra == "test"
 Provides-Extra: setup-requires
 Requires-Dist: setuptools; extra == "setup-requires"
 Requires-Dist: numpy>=1.12; extra == "setup-requires"