From 790df573e82311226ca25f7c547c96a0d8fa7175 Mon Sep 17 00:00:00 2001 From: Talon Chandler Date: Tue, 10 Sep 2024 16:12:09 -0700 Subject: [PATCH] Revert "fix warnings from tensoring a tensor" This reverts commit ca4e7c597dcf880d0c2d2b7859ed0e685522308c. --- tests/test_optics.py | 2 +- waveorder/optics.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/test_optics.py b/tests/test_optics.py index 4e821776..2d03dc2f 100644 --- a/tests/test_optics.py +++ b/tests/test_optics.py @@ -31,7 +31,7 @@ def test_generate_propagation_kernel(): def test_gen_Greens_function_z(): wavelength = 0.5 - z_position_list = torch.tensor([0, 1, -1]) # note fftfreq coords + z_position_list = [0, 1, -1] # note fftfreq coords radial_frequencies = util.generate_radial_frequencies((10, 10), 0.5) pupil = optics.generate_pupil(radial_frequencies, 0.5, 0.5) diff --git a/waveorder/optics.py b/waveorder/optics.py index 1a7bab6e..65ac1305 100644 --- a/waveorder/optics.py +++ b/waveorder/optics.py @@ -395,7 +395,7 @@ def generate_propagation_kernel( wavelength : float wavelength of the light in the immersion media - z_position_list : torch.tensor + z_position_list : torch.tensor or list 1D array of defocused z positions with the size of (Z) Returns @@ -414,7 +414,7 @@ def generate_propagation_kernel( 1j * 2 * np.pi - * z_position_list[:, None, None] + * torch.tensor(z_position_list)[:, None, None] * oblique_factor[None, :, :] ) @@ -440,7 +440,7 @@ def generate_greens_function_z( wavelength_illumination : float wavelength of the light in the immersion media - z_position_list : torch.tensor + z_position_list : torch.tensor or list 1D array of defocused z position with the size of (Z,) axially_even : bool @@ -461,9 +461,9 @@ def generate_greens_function_z( ) ** (1 / 2) / wavelength_illumination if axially_even: - z_positions = torch.abs(z_position_list[:, None, None]) + z_positions = torch.abs(torch.tensor(z_position_list)[:, None, None]) else: - z_positions = z_position_list[:, None, None] + z_positions = torch.tensor(z_position_list)[:, None, None] greens_function_z = ( -1j