nabu 2025.1.0.dev13__tar.gz → 2025.1.0.dev14__tar.gz

{nabu-2025.1.0.dev13/nabu.egg-info → nabu-2025.1.0.dev14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nabu
-Version: 2025.1.0.dev13
+Version: 2025.1.0.dev14
 Summary: Nabu - Tomography software
 Author-email: Pierre Paleo <pierre.paleo@esrf.fr>, Henri Payno <henri.payno@esrf.fr>, Alessandro Mirone <mirone@esrf.fr>, Jérôme Lesaint <jerome.lesaint@esrf.fr>
 Maintainer-email: Pierre Paleo <pierre.paleo@esrf.fr>

{nabu-2025.1.0.dev13 → nabu-2025.1.0.dev14}/nabu/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "2025.1.0-dev13"
+__version__ = "2025.1.0-dev14"
 __nabu_modules__ = [
     "app",
     "cuda",

{nabu-2025.1.0.dev13 → nabu-2025.1.0.dev14}/nabu/app/cli_configs.py

@@ -162,7 +162,7 @@ MultiCorConfig = ReconstructConfig.copy()
 MultiCorConfig.update(
     {
         "cor": {
-            "help": "Positions of the center of rotation. It must be a list of comma-separated scalars, or in the form start:stop:step, where start, stop and step can all be floating-point values.",
+            "help": "Absolute positions of the center of rotation. It must be a list of comma-separated scalars, or in the form start:stop:step, where start, stop and step can all be floating-point values.",
             "default": "",
             "mandatory": True,
         },

{nabu-2025.1.0.dev13 → nabu-2025.1.0.dev14}/nabu/reconstruction/mlem.py

@@ -57,7 +57,7 @@ class MLEMReconstructor:
 
     def _set_shifts(self, shifts_uv, cor):
         if shifts_uv is None:
-            self.shifts_uv = np.zeros([self.n_angles, 2])
+            self.shifts_uv = None
         else:
             if shifts_uv.shape[0] != self.n_angles:
                 raise ValueError(
@@ -67,7 +67,7 @@ class MLEMReconstructor:
         self.cor = cor
 
     def reset_rot_center(self, cor):
-        self.cor = cor
+        self.cor = cor - (self.sinos_shape[-1] - 1) // 2
 
     def reconstruct(self, data_vwu):
         """
@@ -82,10 +82,13 @@ class MLEMReconstructor:
 
         # MLEM recons
         self.vol_geom_align = cct.models.VolumeGeometry.get_default_from_data(data_vwu)
-        self.prj_geom_align = cct.models.ProjectionGeometry.get_default_parallel()
-        # Vertical shifts were handled in pipeline. Set them to ZERO
-        self.shifts_uv[:, 1] = 0.0
-        self.prj_geom_align.set_detector_shifts_vu(self.shifts_uv.T[::-1])
+        if self.shifts_uv is not None:
+            self.prj_geom_align = cct.models.ProjectionGeometry.get_default_parallel()
+            # Vertical shifts were handled in pipeline. Set them to ZERO
+            self.shifts_uv[:, 1] = 0.0
+            self.prj_geom_align.set_detector_shifts_vu(self.shifts_uv.T[::-1])
+        else:
+            self.prj_geom_align = None
 
         variances_align = cct.processing.compute_variance_poisson(data_vwu)
         self.weights_align = cct.processing.compute_variance_weight(variances_align, normalized=True)  # , use_std=True

{nabu-2025.1.0.dev13 → nabu-2025.1.0.dev14/nabu.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nabu
-Version: 2025.1.0.dev13
+Version: 2025.1.0.dev14
 Summary: Nabu - Tomography software
 Author-email: Pierre Paleo <pierre.paleo@esrf.fr>, Henri Payno <henri.payno@esrf.fr>, Alessandro Mirone <mirone@esrf.fr>, Jérôme Lesaint <jerome.lesaint@esrf.fr>
 Maintainer-email: Pierre Paleo <pierre.paleo@esrf.fr>

{nabu-2025.1.0.dev13 → nabu-2025.1.0.dev14}/nabu.egg-info/top_level.txt

@@ -1,4 +1,3 @@
 dist
 doc
 nabu
-scripts