nabu 2025.1.0.dev13__py3-none-any.whl → 2025.1.0.dev14__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. nabu/__init__.py +1 -1
  2. nabu/app/cli_configs.py +1 -1
  3. nabu/reconstruction/mlem.py +9 -6
  4. {nabu-2025.1.0.dev13.dist-info → nabu-2025.1.0.dev14.dist-info}/METADATA +1 -1
  5. {nabu-2025.1.0.dev13.dist-info → nabu-2025.1.0.dev14.dist-info}/RECORD +9 -9
  6. {nabu-2025.1.0.dev13.dist-info → nabu-2025.1.0.dev14.dist-info}/WHEEL +1 -1
  7. {nabu-2025.1.0.dev13.dist-info → nabu-2025.1.0.dev14.dist-info}/entry_points.txt +0 -0
  8. {nabu-2025.1.0.dev13.dist-info → nabu-2025.1.0.dev14.dist-info}/licenses/LICENSE +0 -0
  9. {nabu-2025.1.0.dev13.dist-info → nabu-2025.1.0.dev14.dist-info}/top_level.txt +0 -0
nabu/__init__.py CHANGED
@@ -1,4 +1,4 @@
1
- __version__ = "2025.1.0-dev13"
1
+ __version__ = "2025.1.0-dev14"
2
2
  __nabu_modules__ = [
3
3
  "app",
4
4
  "cuda",
nabu/app/cli_configs.py CHANGED
@@ -162,7 +162,7 @@ MultiCorConfig = ReconstructConfig.copy()
162
162
  MultiCorConfig.update(
163
163
  {
164
164
  "cor": {
165
- "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.",
165
+ "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.",
166
166
  "default": "",
167
167
  "mandatory": True,
168
168
  },
nabu/reconstruction/mlem.py CHANGED
@@ -57,7 +57,7 @@ class MLEMReconstructor:
57
57
 
58
58
  def _set_shifts(self, shifts_uv, cor):
59
59
  if shifts_uv is None:
60
- self.shifts_uv = np.zeros([self.n_angles, 2])
60
+ self.shifts_uv = None
61
61
  else:
62
62
  if shifts_uv.shape[0] != self.n_angles:
63
63
  raise ValueError(
@@ -67,7 +67,7 @@ class MLEMReconstructor:
67
67
  self.cor = cor
68
68
 
69
69
  def reset_rot_center(self, cor):
70
- self.cor = cor
70
+ self.cor = cor - (self.sinos_shape[-1] - 1) // 2
71
71
 
72
72
  def reconstruct(self, data_vwu):
73
73
  """
@@ -82,10 +82,13 @@ class MLEMReconstructor:
82
82
 
83
83
  # MLEM recons
84
84
  self.vol_geom_align = cct.models.VolumeGeometry.get_default_from_data(data_vwu)
85
- self.prj_geom_align = cct.models.ProjectionGeometry.get_default_parallel()
86
- # Vertical shifts were handled in pipeline. Set them to ZERO
87
- self.shifts_uv[:, 1] = 0.0
88
- self.prj_geom_align.set_detector_shifts_vu(self.shifts_uv.T[::-1])
85
+ if self.shifts_uv is not None:
86
+ self.prj_geom_align = cct.models.ProjectionGeometry.get_default_parallel()
87
+ # Vertical shifts were handled in pipeline. Set them to ZERO
88
+ self.shifts_uv[:, 1] = 0.0
89
+ self.prj_geom_align.set_detector_shifts_vu(self.shifts_uv.T[::-1])
90
+ else:
91
+ self.prj_geom_align = None
89
92
 
90
93
  variances_align = cct.processing.compute_variance_poisson(data_vwu)
91
94
  self.weights_align = cct.processing.compute_variance_weight(variances_align, normalized=True) # , use_std=True
{nabu-2025.1.0.dev13.dist-info → nabu-2025.1.0.dev14.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: nabu
3
- Version: 2025.1.0.dev13
3
+ Version: 2025.1.0.dev14
4
4
  Summary: Nabu - Tomography software
5
5
  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>
6
6
  Maintainer-email: Pierre Paleo <pierre.paleo@esrf.fr>
{nabu-2025.1.0.dev13.dist-info → nabu-2025.1.0.dev14.dist-info}/RECORD RENAMED
@@ -1,7 +1,7 @@
1
1
  doc/conf.py,sha256=3xtCarCHrXPr50GbeRDuH-o3Jzojw7mpr7vpGfZPLAE,3787
2
2
  doc/create_conf_doc.py,sha256=IVOdP70KvbW9WS_UQu3Iyd0YfS60E2fJ5IDtQ_s4cDw,1143
3
3
  doc/get_mathjax.py,sha256=VIvKRCdDuF2VoY8JD3mSey9XX13AZMmwTJBHdt1tUs4,1012
4
- nabu/__init__.py,sha256=ArHDO8a36q5KpcPAtV9nZ2qBWX2x49EWkvGtd6goCII,276
4
+ nabu/__init__.py,sha256=Lgb48elUmH-YevNEaVmLMkcg510J3eCdpEviDuB7MhA,276
5
5
  nabu/tests.py,sha256=hOJD1GGxn_KE1bWMoxfjnjzI7d9JBUpoc9B2_tVFiEk,1370
6
6
  nabu/testutils.py,sha256=PmQVGkQmLjq1oX8C_rE8N5yceVNbUifPuNMiE6cQq7k,8667
7
7
  nabu/utils.py,sha256=XFk8_sUupngl5g1aFEE7IL_AzL9eJUV_ikmjiGfJNDA,26727
@@ -9,7 +9,7 @@ nabu/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
9
9
  nabu/app/bootstrap.py,sha256=3yLZJmrmQBmPJMBtE2ih2cspfqOy5T_UN2U8B3i_hkI,3266
10
10
  nabu/app/bootstrap_stitching.py,sha256=wCKgugOQr6-lPMWEn4AYQeric0tCuRc9O-RnpBuTWAA,2230
11
11
  nabu/app/cast_volume.py,sha256=fBjVWOgLWS_JBF5qEdN-b-7GCOQVx15cwerh4BmAsTQ,11171
12
- nabu/app/cli_configs.py,sha256=x32idqLU2iMWxMi8ysYneUnq8mgpyAcT_-1udvAWWuM,22141
12
+ nabu/app/cli_configs.py,sha256=wM5p6cJNhsIWu4kqCiuO8UDKA3eXqkMXG0HiUjZqS7k,22150
13
13
  nabu/app/compare_volumes.py,sha256=3qm3QsxV-D_myLAkhM_LlX0DTrDmhzfhrnNak-1538Q,3337
14
14
  nabu/app/composite_cor.py,sha256=-qAbMJCFa0NmSb1hO2G1QvdW4fwEXSMBBbSFCnQXmCc,5068
15
15
  nabu/app/correct_rot.py,sha256=rIgBZZ_q-WPTy0mH22_XUXSXYqmR9DQkKlgEw_ol1kI,1988
@@ -230,7 +230,7 @@ nabu/reconstruction/filtering.py,sha256=monJnA_kk9k_Gy7bMAos9I-XgU8czWhf9vBth6ik
230
230
  nabu/reconstruction/filtering_cuda.py,sha256=_S-BZMhtnNt8ugePSmf-LF7JvMPCOyGPUMSseymgwZw,4019
231
231
  nabu/reconstruction/filtering_opencl.py,sha256=s65EWrjfUFdScicmNAGyRv8-8OQgapy_HvwMm-J7Lh4,3705
232
232
  nabu/reconstruction/hbp.py,sha256=Qll7i20LWxUo1-SHRxemkYAolBTP8HScwt1OvWmD2r0,18642
233
- nabu/reconstruction/mlem.py,sha256=CD9RppEzHgWRTEwzkY1hQXsfP9xXn1n8p3Lk8H1ya5Y,3629
233
+ nabu/reconstruction/mlem.py,sha256=cBnzbrT9epp4zuwBlxAty1NmFi6FpMGybvQubBkcOFw,3747
234
234
  nabu/reconstruction/projection.py,sha256=SNocaOY9HuNiHs-VxkW9IS707JPJnd3sDjAbf7aIw2E,9081
235
235
  nabu/reconstruction/reconstructor.py,sha256=16xxHcK4iie-uh-trf6x_IuvgxJKBvQRTE5B8tnc4F8,7358
236
236
  nabu/reconstruction/reconstructor_cuda.py,sha256=m_3GzG44PRyiSEfTvYjgr5atLwl26hMfZOMyqTWxp0g,1644
@@ -312,9 +312,9 @@ nabu/thirdparty/pore3d_deringer_munch.py,sha256=o4bisnFc-wMjuohWBT8wgWmfNehPQGtC
312
312
  nabu/thirdparty/tomocupy_remove_stripe.py,sha256=Khe4zFf0kRzu65Yxnvq58gt1ljOztqJGdMDhVAiM7lM,24363
313
313
  nabu/thirdparty/tomopy_phase.py,sha256=hK4oPpkogLOhv23XzzEXQY2u3r8fJvASY_bINVs6ERE,8634
314
314
  nabu/thirdparty/tomwer_load_flats_darks.py,sha256=ZNoVAinUb_wGYbfvs_4BVnWsjsQmNxSvCh1bWhR2WWg,5611
315
- nabu-2025.1.0.dev13.dist-info/licenses/LICENSE,sha256=1eAIPSnEsnSFNUODnLtNtQTs76exG3ZxJ1DJR6zoUBA,1066
316
- nabu-2025.1.0.dev13.dist-info/METADATA,sha256=lwL6b68kmLzJUclKbi3MMeCZ1ltGOyS1NviEUbSuUiI,4327
317
- nabu-2025.1.0.dev13.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
318
- nabu-2025.1.0.dev13.dist-info/entry_points.txt,sha256=cJKGkBeykVL7uK3E4R0RLRqMXifTL2qdO573syPAvJc,1288
319
- nabu-2025.1.0.dev13.dist-info/top_level.txt,sha256=fsm_N3eXLRZk2QXF9OSKPNDPFXOz8FAQjHh5avT3dok,9
320
- nabu-2025.1.0.dev13.dist-info/RECORD,,
315
+ nabu-2025.1.0.dev14.dist-info/licenses/LICENSE,sha256=1eAIPSnEsnSFNUODnLtNtQTs76exG3ZxJ1DJR6zoUBA,1066
316
+ nabu-2025.1.0.dev14.dist-info/METADATA,sha256=e9px--rVeYTmFlOJhZETMdJ8GtzN8Wy_s5VZELrLZD0,4327
317
+ nabu-2025.1.0.dev14.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
318
+ nabu-2025.1.0.dev14.dist-info/entry_points.txt,sha256=cJKGkBeykVL7uK3E4R0RLRqMXifTL2qdO573syPAvJc,1288
319
+ nabu-2025.1.0.dev14.dist-info/top_level.txt,sha256=fsm_N3eXLRZk2QXF9OSKPNDPFXOz8FAQjHh5avT3dok,9
320
+ nabu-2025.1.0.dev14.dist-info/RECORD,,
{nabu-2025.1.0.dev13.dist-info → nabu-2025.1.0.dev14.dist-info}/WHEEL RENAMED
@@ -1,5 +1,5 @@
1
1
  Wheel-Version: 1.0
2
- Generator: setuptools (78.1.0)
2
+ Generator: setuptools (79.0.0)
3
3
  Root-Is-Purelib: true
4
4
  Tag: py3-none-any
5
5