xtrack 0.98.13__tar.gz → 0.98.14__tar.gz

{xtrack-0.98.13/xtrack.egg-info → xtrack-0.98.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xtrack
-Version: 0.98.13
+Version: 0.98.14
 Summary: Tracking library for particle accelerators
 Author: G. Iadarola et al.
 License-Expression: Apache-2.0

xtrack-0.98.14/xtrack/_version.py

@@ -0,0 +1 @@
+__version__ = '0.98.14'

{xtrack-0.98.13 → xtrack-0.98.14}/xtrack/twiss.py

@@ -1420,6 +1420,12 @@ def _compute_coupling_elements_edwards_teng(
 
     """
 
+    # This computes edwards-teng parameters from full one-turn W matrix at all locations
+    # edw_teng_cols = _edwards_teng_from_one_turn_at_all_locations(W_matrix, qx, qy)
+    #
+    # The following instead computes from the one-turn R matrix at one location
+    # and then propagates along the ring:
+
     # R matrix of the full ring (4D)
     Rot = np.zeros(shape=(6, 6), dtype=np.float64)
     Rot[0:2,0:2] = lnf.Rot2D(2 * np.pi * qx)
@@ -1524,7 +1530,7 @@ def _compute_edwards_teng_initial(RR):
         det_bc = np.linalg.det(b_pl_c)
         tr_a_m_tr_d = tr(AA) - tr(DD)
         coeff = - (0.5 * tr_a_m_tr_d
-            + np.sign(det_bc) * np.sqrt(det_bc + 0.25 * tr_a_m_tr_d**2))
+            + np.sign(tr_a_m_tr_d) * np.sqrt(det_bc + 0.25 * tr_a_m_tr_d**2))
         RR_ET0 = 1/coeff * b_pl_c
 
     EE = AA - BB@RR_ET0
@@ -1560,6 +1566,58 @@ def _conj_mat(mm):
     d = mm[1,1]
     return np.array([[d, -b], [-c, a]])
 
+
+def _edwards_teng_from_one_turn_at_all_locations(WW, qx, qy):
+
+    # R matrix of the full ring (4D)
+    Rot = np.zeros(shape=(6, 6), dtype=np.float64)
+    Rot[0:2,0:2] = lnf.Rot2D(2 * np.pi * qx)
+    Rot[2:4,2:4] = lnf.Rot2D(2 * np.pi * qy)
+
+    n_elem = WW.shape[0]
+
+    betx = np.zeros(n_elem)
+    alfx = np.zeros(n_elem)
+    bety = np.zeros(n_elem)
+    alfy = np.zeros(n_elem)
+    r11 = np.zeros(n_elem)
+    r12 = np.zeros(n_elem)
+    r21 = np.zeros(n_elem)
+    r22 = np.zeros(n_elem)
+
+    for ii in range(n_elem):
+
+        WW0 = WW[ii, :, :]
+        WW0_inv = lnf.S.T @ WW0.T @ lnf.S
+        RR = WW0 @ Rot @ WW0_inv
+
+        # Edwards-Teng initial conditions
+        edw_teng_init = _compute_edwards_teng_initial(RR)
+
+        RR_ET=edw_teng_init['RR_ET0']
+
+        r11[ii] = RR_ET[0, 0]
+        r12[ii] = RR_ET[0, 1]
+        r21[ii] = RR_ET[1, 0]
+        r22[ii] = RR_ET[1, 1]
+        betx[ii] = edw_teng_init['betx0']
+        alfx[ii] = edw_teng_init['alfx0']
+        bety[ii] = edw_teng_init['bety0']
+        alfy[ii] = edw_teng_init['alfy0']
+
+    out_dict = {
+        'betx': betx,
+        'alfx': alfx,
+        'bety': bety,
+        'alfy': alfy,
+        'r11': r11,
+        'r12': r12,
+        'r21': r21,
+        'r22': r22
+    }
+
+    return out_dict
+
 def _propagate_edwards_teng(WW, mux, muy, RR_ET0, betx0, alfx0, bety0, alfy0):
 
     lnf = xt.linear_normal_form

{xtrack-0.98.13 → xtrack-0.98.14/xtrack.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xtrack
-Version: 0.98.13
+Version: 0.98.14
 Summary: Tracking library for particle accelerators
 Author: G. Iadarola et al.
 License-Expression: Apache-2.0

xtrack-0.98.13/xtrack/_version.py

@@ -1 +0,0 @@
-__version__ = '0.98.13'