Solve circular import

impedance/impedance_model.py

@@ -8,9 +8,11 @@ import matplotlib.pyplot as plt
 from scipy.integrate import trapz
 from scipy.interpolate import interp1d
 from mpl_toolkits.axes_grid1.inset_locator import inset_axes
-from mbtrack2.utilities import (beam_spectrum, gaussian_bunch_spectrum, 
-                                beam_loss_factor, spectral_density,
-                                effective_impedance, double_sided_impedance)
+from mbtrack2.utilities.misc import (beam_loss_factor, effective_impedance, 
+                                     double_sided_impedance)
+from mbtrack2.utilities.spectrum import (beam_spectrum, 
+                                         gaussian_bunch_spectrum, 
+                                         spectral_density)
 from mbtrack2.impedance.wakefield import WakeField
 from mbtrack2.tracking.element import Element
 

utilities/misc.py

@@ -8,7 +8,7 @@ import numpy as np
 from pathlib import Path
 from scipy.interpolate import interp1d
 from mbtrack2.impedance.wakefield import Impedance
-from mbtrack.utilities import spectral_density
+from mbtrack2.utilities.spectrum import spectral_density
     
 def effective_impedance(ring, imp, m, mu, sigma, M, tuneS, xi=None, 
                         mode="Hermite"):