Merge branch 'dev' of https://github.com/QI2lab/mcSIM into dev

Author: ptbrown1729

calibration/psf_calibration.py

@@ -194,11 +194,11 @@ def curvature_model_fn(p):
 # average PSF
 # ###############################
 psf_roi_size = (11, 21, 21)
-psf, psf_coords, otf, otf_coords = fit_psf.average_exp_psfs(img,
-                                                            coords_3d,
-                                                            centers,
-                                                            psf_roi_size,
-                                                            backgrounds=backgrounds)
+psf = fit_psf.average_exp_psfs(img,
+                               coords_3d,
+                               centers,
+                               psf_roi_size,
+                               backgrounds=backgrounds)
 
 tifffile.imwrite(save_dir / "psf.tif",
                  tifffile.transpose_axes(psf.astype(np.float32), "ZYX", asaxes="TZCYXS"),