more rebase cleanup

Author: j-c-c

tests/test_covar2d.py

@@ -79,7 +79,6 @@ def cov2d_fixture(volume, basis, ctf_enabled):
     n = 32
 
     # Default CTF params
-    pixel_size = 5.0 * 65 / volume.resolution
     unique_filters = None
     h_idx = None
     h_ctf_fb = None
@@ -107,7 +106,6 @@ def cov2d_fixture(volume, basis, ctf_enabled):
         filter_indices=h_idx,
         offsets=0.0,
         amplitudes=1.0,
-        pixel_size=pixel_size,
         dtype=volume.dtype,
         noise_adder=noise_adder,
     )

tests/test_covar2d_denoiser.py

@@ -13,7 +13,6 @@
 img_size = 32
 num_imgs = 1024
 noise_var = 0.1848
-pixel_size = 5
 noise_adder = WhiteNoiseAdder(var=noise_var)
 pixel_size = 5
 filters = [