From efadaf807e769a39bb264bb306cec672e5180635 Mon Sep 17 00:00:00 2001 From: gnzng Date: Tue, 4 Mar 2025 14:20:09 -0800 Subject: [PATCH] Rename probe_size parameter to probe_shape in FancyPtycho and MultislicePtycho classes to match the gaussian_probe function --- src/cdtools/models/fancy_ptycho.py | 5 ++--- src/cdtools/models/multislice_ptycho.py | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/cdtools/models/fancy_ptycho.py b/src/cdtools/models/fancy_ptycho.py index 46e7db6..1be40c6 100644 --- a/src/cdtools/models/fancy_ptycho.py +++ b/src/cdtools/models/fancy_ptycho.py @@ -195,7 +195,7 @@ class FancyPtycho(CDIModel): @classmethod def from_dataset(cls, dataset, - probe_size=None, + probe_shape=None, randomize_ang=0, n_modes=1, n_obj_modes=1, @@ -277,7 +277,7 @@ class FancyPtycho(CDIModel): ) # Finally, initialize the probe and object using this information - if probe_size is None: + if probe_shape is None: probe = tools.initializers.SHARP_style_probe( dataset, propagation_distance=propagation_distance, @@ -288,7 +288,6 @@ class FancyPtycho(CDIModel): dataset, obj_basis, probe_shape, - probe_size, propagation_distance=propagation_distance, ) diff --git a/src/cdtools/models/multislice_ptycho.py b/src/cdtools/models/multislice_ptycho.py index 23df19a..afcd83e 100644 --- a/src/cdtools/models/multislice_ptycho.py +++ b/src/cdtools/models/multislice_ptycho.py @@ -181,7 +181,7 @@ class MultislicePtycho(CDIModel): dataset, dz, nz, - probe_size=None, + probe_shape=None, randomize_ang=0, n_modes=1, n_obj_modes=1, @@ -262,7 +262,7 @@ class MultislicePtycho(CDIModel): ) # Finally, initialize the probe and object using this information - if probe_size is None: + if probe_shape is None: probe = tools.initializers.SHARP_style_probe( dataset, propagation_distance=propagation_distance, @@ -273,7 +273,6 @@ class MultislicePtycho(CDIModel): dataset, obj_basis, probe_shape, - probe_size, propagation_distance=propagation_distance, )