diff --git a/mbtrack2/instability/instabilities.py b/mbtrack2/instability/instabilities.py index 8e3985e1af5ca7f5db54a012a62c63232ec8b32a..b5e62461ca720fdcf8dd76322065f02bdebfd7e2 100644 --- a/mbtrack2/instability/instabilities.py +++ b/mbtrack2/instability/instabilities.py @@ -130,7 +130,7 @@ def lcbi_growth_rate_mode(ring, I, Vrf, M, mu, fr=None, RL=None, QL=None, Z=None """ nu_s = ring.synchrotron_tune(Vrf) - factor = ring.eta * I / (4 * np.pi * ring.E0 * nu_s) + factor = ring.eta() * I / (4 * np.pi * ring.E0 * nu_s) if isinstance(fr, (float, int)): fr = np.array([fr]) diff --git a/mbtrack2/utilities/misc.py b/mbtrack2/utilities/misc.py index 2a2bd27b36860ef39f1a6d6bd3c485741ecf13fc..7b06a1af09dd7a8f50d7fa955fff06316745e3e5 100644 --- a/mbtrack2/utilities/misc.py +++ b/mbtrack2/utilities/misc.py @@ -88,7 +88,7 @@ def effective_impedance(ring, imp, m, mu, sigma, M, tuneS, xi=None, pmin = fmin/(ring.f0 * M) + 1 p = np.arange(pmin, pmax+1) fp = ring.f0*(p*M + mu + tuneXY + m*tuneS) - f_xi = xi/ring.eta*ring.f0 + f_xi = xi/ring.eta()*ring.f0 num = np.sum(imp(fp) * h(fp - f_xi)) den = np.sum(h(fp - f_xi)) Zeff = num/den @@ -136,7 +136,7 @@ def head_tail_form_factor(ring, imp, m, sigma, tuneS, xi=None, mode="Hermite", m if xi is None: xi = ring.chro[1] fp = ring.f0*(p*M + mu + tuneXY + m*tuneS) - f_xi = xi/ring.eta*ring.f0 + f_xi = xi/ring.eta()*ring.f0 den = np.sum(h(fp - f_xi)) else: raise TypeError("Effective impedance is only defined for long, xdip"