From 1e63bfd221c6711b647cc9a1fc85c1ede42d29b2 Mon Sep 17 00:00:00 2001 From: Stephanie Ribet Date: Fri, 6 Sep 2024 08:30:53 -0700 Subject: [PATCH] working on a normalization error --- py4DSTEM/tomography/tomography.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/py4DSTEM/tomography/tomography.py b/py4DSTEM/tomography/tomography.py index 8913ecbd1..54d16f9bd 100644 --- a/py4DSTEM/tomography/tomography.py +++ b/py4DSTEM/tomography/tomography.py @@ -1058,6 +1058,7 @@ def _forward( line_y_diff = xp.arange(-(s[-1] - 1) / 2, s[-1] / 2) * length / s[-1] line_z_diff = line_y_diff * xp.tan(tilt) + (s[-1] - 1) / 2 line_y_diff += (s[-1] - 1) / 2 + # line_y_diff = np.fft.fftfreq(s[-1], 1 / s[-1]) * xp.cos(tilt) + (s[-1]-1)/2 # line_z_diff = np.fft.fftfreq(s[-1], 1 / s[-1]) * xp.sin(tilt) + (s[-1]-1)/2 @@ -1107,6 +1108,7 @@ def _forward( "clip", ) + bincount_x = ( xp.tile( (xp.tile(self._ind_diffraction_ravel, (1, 4))), @@ -1122,14 +1124,12 @@ def _forward( obj[xp.ravel_multi_index((ind0, ind1), (s[1], s[2]), mode="clip"),] * weights_real[:, :, None] ) - .sum(1)[:, ind_diff] + .mean(1)[:, ind_diff] .ravel() - * xp.tile(weights_diff, (1, s[1])).ravel(), + * xp.tile(weights_diff, s[1]).ravel(), minlength=self._q_length * s[1], - ).reshape(s[1], self._q_length)[:, self._circular_mask_bincount] + ).reshape(s[1], self._q_length)[:, self._circular_mask_bincount] * s[2] - # from pdb import set_trace - # set_trace() self._ind0 = ind0 self._ind1 = ind1