From ebafc44acbefc3171d1588fcd5aa8106daaa896e Mon Sep 17 00:00:00 2001 From: Abe Levitan Date: Wed, 25 Aug 2021 17:06:30 -0400 Subject: [PATCH] Minor tweak to initializations --- CDTools/models/fancy_ptycho.py | 19 +++++++++++++------ CDTools/tools/initializers/initializers.py | 2 +- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/CDTools/models/fancy_ptycho.py b/CDTools/models/fancy_ptycho.py index 84b4b48..e0bb8ae 100644 --- a/CDTools/models/fancy_ptycho.py +++ b/CDTools/models/fancy_ptycho.py @@ -374,11 +374,15 @@ class FancyPtycho(CDIModel): def corrected_translations(self, dataset): translations = dataset.translations.to( dtype=t.float32, device=self.probe.device) - t_offset = tools.interactions.pixel_to_translations( - self.probe_basis, - self.translation_offsets * self.translation_scale, - surface_normal=self.surface_normal) - return translations + t_offset + if (hasattr(self, 'translation_offsets') and + self.translation_offsets is not None): + t_offset = tools.interactions.pixel_to_translations( + self.probe_basis, + self.translation_offsets * self.translation_scale, + surface_normal=self.surface_normal) + return translations + t_offset + else: + return translations def get_rhos(self): @@ -530,7 +534,10 @@ class FancyPtycho(CDIModel): lambda self, fig: plt.figure(fig.number) and plt.imshow(self.background.detach().cpu().numpy()**2)) ] - +# def plot_errors(self, dataset): + + + def save_results(self, dataset): basis = self.probe_basis.detach().cpu().numpy() translations = self.corrected_translations(dataset).detach().cpu().numpy() diff --git a/CDTools/tools/initializers/initializers.py b/CDTools/tools/initializers/initializers.py index 5d6791c..c3afe16 100644 --- a/CDTools/tools/initializers/initializers.py +++ b/CDTools/tools/initializers/initializers.py @@ -633,7 +633,7 @@ def generate_subdominant_modes(dominant_mode, n_modes, circular=True): dominant_fft = far_field(dominant_mode) shape = dominant_mode.shape - center = ((shape[-2]-1)//2, (shape[-1]-1)//2) + center = ((shape[-2])//2, (shape[-1])//2) i, j = np.mgrid[:shape[-2], :shape[-1]] i = t.tensor(i - center[0]).to(dtype=dominant_fft.dtype,