mirror of
https://github.com/cdtools-developers/cdtools.git
synced 2026-09-09 21:12:42 +02:00
Rename probe_size parameter to probe_shape in FancyPtycho and MultislicePtycho classes to match the gaussian_probe function
This commit is contained in:
@@ -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,
|
||||
)
|
||||
|
||||
|
||||
@@ -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,
|
||||
)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user