diff --git a/impedance/impedance_model.py b/impedance/impedance_model.py index f174cae6dc970bff3eae43e3862a07b95eb4ea25..2bf0f9d70916e53769aac9603bff16bcdd870a0c 100644 --- a/impedance/impedance_model.py +++ b/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 diff --git a/utilities/misc.py b/utilities/misc.py index b2afeaf0568e3f3cfbb2413619d6c337f3adfe87..a099c2a8756a7ed267508f16554b42a191c86b8a 100644 --- a/utilities/misc.py +++ b/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"):