xtrack 0.57.3__tar.gz → 0.59.0__tar.gz

{xtrack-0.57.3 → xtrack-0.59.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xtrack
-Version: 0.57.3
+Version: 0.59.0
 Summary: Tracking library for particle accelerators
 Home-page: https://xsuite.readthedocs.io/
 Download-URL: https://pypi.python.org/pypi/xtrack

{xtrack-0.57.3 → xtrack-0.59.0}/tests/test_attr_replicas_and_slices.py

@@ -6,18 +6,20 @@ import pytest
 assert_allclose = np.testing.assert_allclose
 
 def _make_line_no_expressions():
-    bend = xt.Bend(k0=0.4, h=0.3, length=1, shift_x=1e-3, shift_y=2e-3, rot_s_rad=0.2,
-                k1=0.1,
-                knl=[0.7, 0.8, 0.9, 1.0], ksl=[0.1, 0.2, 0.3, 0.4])
+    bend = xt.Bend(
+        k0=0.4, h=0.3, length=1,
+        shift_x=1e-3, shift_y=2e-3, shift_s=2e-3, rot_s_rad=0.2,
+        k1=0.1,
+        knl=[0.7, 0.8, 0.9, 1.0], ksl=[0.1, 0.2, 0.3, 0.4])
     quad = xt.Quadrupole(k1=0.1, k1s=0.2,
-                        length=0.5, shift_x=2e-3, shift_y=1e-3, rot_s_rad=0.1)
+        length=0.5, shift_x=2e-3, shift_y=1e-3, shift_s=-1e-3, rot_s_rad=0.1)
     sext = xt.Sextupole(k2=0.1, k2s=0.2,
-                        length=0.3, shift_x=3e-3, shift_y=4e-3, rot_s_rad=0.3)
+        length=0.3, shift_x=3e-3, shift_y=4e-3, shift_s=-2e-3, rot_s_rad=0.3)
     octu = xt.Octupole(k3=0.1, k3s=0.2,
-                        length=0.4, shift_x=5e-3, shift_y=6e-3, rot_s_rad=0.4)
+        length=0.4, shift_x=5e-3, shift_y=6e-3, shift_s=-1e-3, rot_s_rad=0.4)
     mult = xt.Multipole(knl=[0.7, 0.8, 0.9, 1.0], ksl=[0.1, 0.2, 0.3, 0.4],
-                        length=0.4, shift_x=5e-3, shift_y=6e-3, rot_s_rad=0.7,
-                        hxl=0.1)
+        length=0.4, shift_x=5e-3, shift_y=6e-3, shift_s=-1e-3, rot_s_rad=0.7,
+        hxl=0.1)
     drift = xt.Drift(length=5.0)
 
     line = xt.Line(elements=[bend, quad, sext, octu, mult, drift, xt.Replica(parent_name='e0')])
@@ -39,6 +41,7 @@ def _make_line_with_expressions():
     line.vars['length_bend'] = 999.
     line.vars['shift_x_bend'] = 999.
     line.vars['shift_y_bend'] = 999.
+    line.vars['shift_s_bend'] = 999.
     line.vars['rot_s_rad_bend'] = 999.
     line.vars['k1_bend'] = 999.
     line.vars['knl_bend_0'] = 999.
@@ -55,6 +58,7 @@ def _make_line_with_expressions():
     line.vars['length_quad'] = 999.
     line.vars['shift_x_quad'] = 999.
     line.vars['shift_y_quad'] = 999.
+    line.vars['shift_s_quad'] = 999.
     line.vars['rot_s_rad_quad'] = 999.
 
     line.vars['k2_sext'] = 999.
@@ -62,6 +66,7 @@ def _make_line_with_expressions():
     line.vars['length_sext'] = 999.
     line.vars['shift_x_sext'] = 999.
     line.vars['shift_y_sext'] = 999.
+    line.vars['shift_s_sext'] = 999.
     line.vars['rot_s_rad_sext'] = 999.
 
     line.vars['k3_octu'] = 999.
@@ -69,6 +74,7 @@ def _make_line_with_expressions():
     line.vars['length_octu'] = 999.
     line.vars['shift_x_octu'] = 999.
     line.vars['shift_y_octu'] = 999.
+    line.vars['shift_s_octu'] = 999.
     line.vars['rot_s_rad_octu'] = 999.
 
     line.vars['knl_mult_0'] = 999.
@@ -82,6 +88,7 @@ def _make_line_with_expressions():
     line.vars['length_mult'] = 999.
     line.vars['shift_x_mult'] = 999.
     line.vars['shift_y_mult'] = 999.
+    line.vars['shift_s_mult'] = 999.
     line.vars['rot_s_rad_mult'] = 999.
     line.vars['hxl_mult'] = 999.
 
@@ -92,6 +99,7 @@ def _make_line_with_expressions():
     line.element_refs['e0'].length = line.vars['length_bend']
     line.element_refs['e0'].shift_x = line.vars['shift_x_bend']
     line.element_refs['e0'].shift_y = line.vars['shift_y_bend']
+    line.element_refs['e0'].shift_s = line.vars['shift_s_bend']
     line.element_refs['e0'].rot_s_rad = line.vars['rot_s_rad_bend']
     line.element_refs['e0'].k1 = line.vars['k1_bend']
     line.element_refs['e0'].knl[0] = line.vars['knl_bend_0']
@@ -108,6 +116,7 @@ def _make_line_with_expressions():
     line.element_refs['e1'].length = line.vars['length_quad']
     line.element_refs['e1'].shift_x = line.vars['shift_x_quad']
     line.element_refs['e1'].shift_y = line.vars['shift_y_quad']
+    line.element_refs['e1'].shift_s = line.vars['shift_s_quad']
     line.element_refs['e1'].rot_s_rad = line.vars['rot_s_rad_quad']
 
     line.element_refs['e2'].k2 = line.vars['k2_sext']
@@ -115,6 +124,7 @@ def _make_line_with_expressions():
     line.element_refs['e2'].length = line.vars['length_sext']
     line.element_refs['e2'].shift_x = line.vars['shift_x_sext']
     line.element_refs['e2'].shift_y = line.vars['shift_y_sext']
+    line.element_refs['e2'].shift_s = line.vars['shift_s_sext']
     line.element_refs['e2'].rot_s_rad = line.vars['rot_s_rad_sext']
 
     line.element_refs['e3'].k3 = line.vars['k3_octu']
@@ -122,6 +132,7 @@ def _make_line_with_expressions():
     line.element_refs['e3'].length = line.vars['length_octu']
     line.element_refs['e3'].shift_x = line.vars['shift_x_octu']
     line.element_refs['e3'].shift_y = line.vars['shift_y_octu']
+    line.element_refs['e3'].shift_s = line.vars['shift_s_octu']
     line.element_refs['e3'].rot_s_rad = line.vars['rot_s_rad_octu']
 
     line.element_refs['e4'].knl[0] = line.vars['knl_mult_0']
@@ -135,6 +146,7 @@ def _make_line_with_expressions():
     line.element_refs['e4'].length = line.vars['length_mult']
     line.element_refs['e4'].shift_x = line.vars['shift_x_mult']
     line.element_refs['e4'].shift_y = line.vars['shift_y_mult']
+    line.element_refs['e4'].shift_s = line.vars['shift_s_mult']
     line.element_refs['e4'].rot_s_rad = line.vars['rot_s_rad_mult']
     line.element_refs['e4'].hxl = line.vars['hxl_mult']
 
@@ -148,6 +160,7 @@ def _set_vars(line):
     line.vars['length_bend'] = 1
     line.vars['shift_x_bend'] = 1e-3
     line.vars['shift_y_bend'] = 2e-3
+    line.vars['shift_s_bend'] = 2e-3
     line.vars['rot_s_rad_bend'] = 0.2
     line.vars['k1_bend'] = 0.1
     line.vars['knl_bend_0'] = 0.7
@@ -164,6 +177,7 @@ def _set_vars(line):
     line.vars['length_quad'] = 0.5
     line.vars['shift_x_quad'] = 2e-3
     line.vars['shift_y_quad'] = 1e-3
+    line.vars['shift_s_quad'] = -1e-3
     line.vars['rot_s_rad_quad'] = 0.1
 
     line.vars['k2_sext'] = 0.1
@@ -171,6 +185,7 @@ def _set_vars(line):
     line.vars['length_sext'] = 0.3
     line.vars['shift_x_sext'] = 3e-3
     line.vars['shift_y_sext'] = 4e-3
+    line.vars['shift_s_sext'] = -2e-3
     line.vars['rot_s_rad_sext'] = 0.3
 
     line.vars['k3_octu'] = 0.1
@@ -178,6 +193,7 @@ def _set_vars(line):
     line.vars['length_octu'] = 0.4
     line.vars['shift_x_octu'] = 5e-3
     line.vars['shift_y_octu'] = 6e-3
+    line.vars['shift_s_octu'] = -1e-3
     line.vars['rot_s_rad_octu'] = 0.4
 
     line.vars['knl_mult_0'] = 0.7
@@ -191,6 +207,7 @@ def _set_vars(line):
     line.vars['length_mult'] = 0.4
     line.vars['shift_x_mult'] = 5e-3
     line.vars['shift_y_mult'] = 6e-3
+    line.vars['shift_s_mult'] = -1e-3
     line.vars['rot_s_rad_mult'] = 0.7
     line.vars['hxl_mult'] = 0.1
 
@@ -239,6 +256,7 @@ def test_attr_replicas(test_context, check_expr, use_copy):
     assert_allclose(tt['rot_s_rad', 'e0'], 0.2, rtol=0, atol=1e-14)
     assert_allclose(tt['shift_x', 'e0'], 1e-3, rtol=0, atol=1e-14)
     assert_allclose(tt['shift_y', 'e0'], 2e-3, rtol=0, atol=1e-14)
+    assert_allclose(tt['shift_s', 'e0'], 2e-3, rtol=0, atol=1e-14)
     assert_allclose(tt['k0l', 'e0'], 0.4 * 1 + 0.7, rtol=0, atol=1e-14)
     assert_allclose(tt['k1l', 'e0'], 0.1 * 1 + 0.8, rtol=0, atol=1e-14)
     assert_allclose(tt['k2l', 'e0'], 0.9, rtol=0, atol=1e-14)
@@ -259,6 +277,7 @@ def test_attr_replicas(test_context, check_expr, use_copy):
     assert_allclose(tt['rot_s_rad', 'e1'], 0.1, rtol=0, atol=1e-14)
     assert_allclose(tt['shift_x', 'e1'], 2e-3, rtol=0, atol=1e-14)
     assert_allclose(tt['shift_y', 'e1'], 1e-3, rtol=0, atol=1e-14)
+    assert_allclose(tt['shift_s', 'e1'], -1e-3, rtol=0, atol=1e-14)
     assert_allclose(tt['k0l', 'e1'], 0.0, rtol=0, atol=1e-14)
     assert_allclose(tt['k1l', 'e1'], 0.1 * 0.5, rtol=0, atol=1e-14)
     assert_allclose(tt['k2l', 'e1'], 0.0, rtol=0, atol=1e-14)
@@ -279,6 +298,7 @@ def test_attr_replicas(test_context, check_expr, use_copy):
     assert_allclose(tt['rot_s_rad', 'e2'], 0.3, rtol=0, atol=1e-14)
     assert_allclose(tt['shift_x', 'e2'], 3e-3, rtol=0, atol=1e-14)
     assert_allclose(tt['shift_y', 'e2'], 4e-3, rtol=0, atol=1e-14)
+    assert_allclose(tt['shift_s', 'e2'], -2e-3, rtol=0, atol=1e-14)
     assert_allclose(tt['k0l', 'e2'], 0.0, rtol=0, atol=1e-14)
     assert_allclose(tt['k1l', 'e2'], 0.0, rtol=0, atol=1e-14)
     assert_allclose(tt['k2l', 'e2'], 0.1 * 0.3, rtol=0, atol=1e-14)
@@ -299,6 +319,7 @@ def test_attr_replicas(test_context, check_expr, use_copy):
     assert_allclose(tt['rot_s_rad', 'e3'], 0.4, rtol=0, atol=1e-14)
     assert_allclose(tt['shift_x', 'e3'], 5e-3, rtol=0, atol=1e-14)
     assert_allclose(tt['shift_y', 'e3'], 6e-3, rtol=0, atol=1e-14)
+    assert_allclose(tt['shift_s', 'e3'], -1e-3, rtol=0, atol=1e-14)
     assert_allclose(tt['k0l', 'e3'], 0.0, rtol=0, atol=1e-14)
     assert_allclose(tt['k1l', 'e3'], 0.0, rtol=0, atol=1e-14)
     assert_allclose(tt['k2l', 'e3'], 0, rtol=0, atol=1e-14)
@@ -319,6 +340,7 @@ def test_attr_replicas(test_context, check_expr, use_copy):
     assert_allclose(tt['rot_s_rad', 'e4'], 0.7, rtol=0, atol=1e-14)
     assert_allclose(tt['shift_x', 'e4'], 5e-3, rtol=0, atol=1e-14)
     assert_allclose(tt['shift_y', 'e4'], 6e-3, rtol=0, atol=1e-14)
+    assert_allclose(tt['shift_s', 'e4'], -1e-3, rtol=0, atol=1e-14)
     assert_allclose(tt['k0l', 'e4'], 0.7, rtol=0, atol=1e-14)
     assert_allclose(tt['k1l', 'e4'], 0.8, rtol=0, atol=1e-14)
     assert_allclose(tt['k2l', 'e4'], 0.9, rtol=0, atol=1e-14)
@@ -339,6 +361,7 @@ def test_attr_replicas(test_context, check_expr, use_copy):
     assert_allclose(tt['rot_s_rad', 'e5'], 0.0, rtol=0, atol=1e-14)
     assert_allclose(tt['shift_x', 'e5'], 0.0, rtol=0, atol=1e-14)
     assert_allclose(tt['shift_y', 'e5'], 0.0, rtol=0, atol=1e-14)
+    assert_allclose(tt['shift_s', 'e5'], 0.0, rtol=0, atol=1e-14)
     assert_allclose(tt['k0l', 'e5'], 0.0, rtol=0, atol=1e-14)
     assert_allclose(tt['k1l', 'e5'], 0.0, rtol=0, atol=1e-14)
     assert_allclose(tt['k2l', 'e5'], 0.0, rtol=0, atol=1e-14)
@@ -358,6 +381,7 @@ def test_attr_replicas(test_context, check_expr, use_copy):
     assert_allclose(tt['rot_s_rad', 'e6'], 0.2, rtol=0, atol=1e-14)
     assert_allclose(tt['shift_x', 'e6'], 1e-3, rtol=0, atol=1e-14)
     assert_allclose(tt['shift_y', 'e6'], 2e-3, rtol=0, atol=1e-14)
+    assert_allclose(tt['shift_s', 'e6'], 2e-3, rtol=0, atol=1e-14)
     assert_allclose(tt['k0l', 'e6'], 0.4 * 1 + 0.7, rtol=0, atol=1e-14)
     assert_allclose(tt['k1l', 'e6'], 0.1 * 1 + 0.8, rtol=0, atol=1e-14)
     assert_allclose(tt['k2l', 'e6'], 0.9, rtol=0, atol=1e-14)
@@ -413,6 +437,7 @@ def test_attr_thin_slicing(test_context, check_expr, use_copy):
     assert_allclose(tt['rot_s_rad', 'e0..1'], 0.2, rtol=0, atol=1e-14)
     assert_allclose(tt['shift_x', 'e0..1'], 1e-3, rtol=0, atol=1e-14)
     assert_allclose(tt['shift_y', 'e0..1'], 2e-3, rtol=0, atol=1e-14)
+    assert_allclose(tt['shift_s', 'e0..1'], 2e-3, rtol=0, atol=1e-14)
     assert_allclose(tt['k0l', 'e0..1'], 0.5 * (0.4 * 1 + 0.7), rtol=0, atol=1e-14)
     assert_allclose(tt['k1l', 'e0..1'], 0.5 * (0.1 * 1 + 0.8), rtol=0, atol=1e-14)
     assert_allclose(tt['k2l', 'e0..1'], 0.5 *  .9, rtol=0, atol=1e-14)
@@ -433,6 +458,7 @@ def test_attr_thin_slicing(test_context, check_expr, use_copy):
     assert_allclose(tt['rot_s_rad', 'e0..exit_map'], 0.2, rtol=0, atol=1e-14)
     assert_allclose(tt['shift_x', 'e0..exit_map'], 1e-3, rtol=0, atol=1e-14)
     assert_allclose(tt['shift_y', 'e0..exit_map'], 2e-3, rtol=0, atol=1e-14)
+    assert_allclose(tt['shift_s', 'e0..exit_map'], 2e-3, rtol=0, atol=1e-14)
     assert_allclose(tt['k0l', 'e0..exit_map'], 0, rtol=0, atol=1e-14)
     assert_allclose(tt['k1l', 'e0..exit_map'], 0, rtol=0, atol=1e-14)
     assert_allclose(tt['k2l', 'e0..exit_map'], 0, rtol=0, atol=1e-14)
@@ -453,6 +479,7 @@ def test_attr_thin_slicing(test_context, check_expr, use_copy):
     assert_allclose(tt['rot_s_rad', 'e0..entry_map'], 0.2, rtol=0, atol=1e-14)
     assert_allclose(tt['shift_x', 'e0..entry_map'], 1e-3, rtol=0, atol=1e-14)
     assert_allclose(tt['shift_y', 'e0..entry_map'], 2e-3, rtol=0, atol=1e-14)
+    assert_allclose(tt['shift_s', 'e0..entry_map'], 2e-3, rtol=0, atol=1e-14)
     assert_allclose(tt['k0l', 'e0..entry_map'], 0, rtol=0, atol=1e-14)
     assert_allclose(tt['k1l', 'e0..entry_map'], 0, rtol=0, atol=1e-14)
     assert_allclose(tt['k2l', 'e0..entry_map'], 0, rtol=0, atol=1e-14)
@@ -473,6 +500,7 @@ def test_attr_thin_slicing(test_context, check_expr, use_copy):
     assert_allclose(tt['rot_s_rad', 'drift_e0..1'], 0, rtol=0, atol=1e-14)
     assert_allclose(tt['shift_x', 'drift_e0..1'], 0, rtol=0, atol=1e-14)
     assert_allclose(tt['shift_y', 'drift_e0..1'], 0, rtol=0, atol=1e-14)
+    assert_allclose(tt['shift_s', 'drift_e0..1'], 0, rtol=0, atol=1e-14)
     assert_allclose(tt['k0l', 'drift_e0..1'], 0, rtol=0, atol=1e-14)
     assert_allclose(tt['k1l', 'drift_e0..1'], 0, rtol=0, atol=1e-14)
     assert_allclose(tt['k2l', 'drift_e0..1'], 0, rtol=0, atol=1e-14)
@@ -493,6 +521,7 @@ def test_attr_thin_slicing(test_context, check_expr, use_copy):
     assert_allclose(tt['rot_s_rad', 'e1..1'], 0.1, rtol=0, atol=1e-14)
     assert_allclose(tt['shift_x', 'e1..1'], 2e-3, rtol=0, atol=1e-14)
     assert_allclose(tt['shift_y', 'e1..1'], 1e-3, rtol=0, atol=1e-14)
+    assert_allclose(tt['shift_s', 'e1..1'], -1e-3, rtol=0, atol=1e-14)
     assert_allclose(tt['k0l', 'e1..1'], 0., rtol=0, atol=1e-14)
     assert_allclose(tt['k1l', 'e1..1'], 0.1 * 0.5 / 2, rtol=0, atol=1e-14)
     assert_allclose(tt['k2l', 'e1..1'], 0, rtol=0, atol=1e-14)
@@ -513,6 +542,7 @@ def test_attr_thin_slicing(test_context, check_expr, use_copy):
     assert_allclose(tt['rot_s_rad', 'drift_e1..1'], 0, rtol=0, atol=1e-14)
     assert_allclose(tt['shift_x', 'drift_e1..1'], 0, rtol=0, atol=1e-14)
     assert_allclose(tt['shift_y', 'drift_e1..1'], 0, rtol=0, atol=1e-14)
+    assert_allclose(tt['shift_s', 'drift_e1..1'], 0, rtol=0, atol=1e-14)
     assert_allclose(tt['k0l', 'drift_e1..1'], 0, rtol=0, atol=1e-14)
     assert_allclose(tt['k1l', 'drift_e1..1'], 0, rtol=0, atol=1e-14)
     assert_allclose(tt['k2l', 'drift_e1..1'], 0, rtol=0, atol=1e-14)
@@ -533,6 +563,7 @@ def test_attr_thin_slicing(test_context, check_expr, use_copy):
     assert_allclose(tt['rot_s_rad', 'e1_entry'], 0, rtol=0, atol=1e-14)
     assert_allclose(tt['shift_x', 'e1_entry'], 0, rtol=0, atol=1e-14)
     assert_allclose(tt['shift_y', 'e1_entry'], 0, rtol=0, atol=1e-14)
+    assert_allclose(tt['shift_s', 'e1_entry'], 0, rtol=0, atol=1e-14)
     assert_allclose(tt['k0l', 'e1_entry'], 0, rtol=0, atol=1e-14)
     assert_allclose(tt['k1l', 'e1_entry'], 0, rtol=0, atol=1e-14)
     assert_allclose(tt['k2l', 'e1_entry'], 0, rtol=0, atol=1e-14)
@@ -553,6 +584,7 @@ def test_attr_thin_slicing(test_context, check_expr, use_copy):
     assert_allclose(tt['rot_s_rad', 'e2..1'], 0.3, rtol=0, atol=1e-14)
     assert_allclose(tt['shift_x', 'e2..1'], 3e-3, rtol=0, atol=1e-14)
     assert_allclose(tt['shift_y', 'e2..1'], 4e-3, rtol=0, atol=1e-14)
+    assert_allclose(tt['shift_s', 'e2..1'], -2e-3, rtol=0, atol=1e-14)
     assert_allclose(tt['k0l', 'e2..1'], 0., rtol=0, atol=1e-14)
     assert_allclose(tt['k1l', 'e2..1'], 0., rtol=0, atol=1e-14)
     assert_allclose(tt['k2l', 'e2..1'], 0.1 * 0.3*1/2, rtol=0, atol=1e-14)
@@ -573,6 +605,7 @@ def test_attr_thin_slicing(test_context, check_expr, use_copy):
     assert_allclose(tt['rot_s_rad', 'drift_e2..1'], 0, rtol=0, atol=1e-14)
     assert_allclose(tt['shift_x', 'drift_e2..1'], 0, rtol=0, atol=1e-14)
     assert_allclose(tt['shift_y', 'drift_e2..1'], 0, rtol=0, atol=1e-14)
+    assert_allclose(tt['shift_s', 'drift_e2..1'], 0, rtol=0, atol=1e-14)
     assert_allclose(tt['k0l', 'drift_e2..1'], 0, rtol=0, atol=1e-14)
     assert_allclose(tt['k1l', 'drift_e2..1'], 0, rtol=0, atol=1e-14)
     assert_allclose(tt['k2l', 'drift_e2..1'], 0, rtol=0, atol=1e-14)
@@ -593,6 +626,7 @@ def test_attr_thin_slicing(test_context, check_expr, use_copy):
     assert_allclose(tt['rot_s_rad', 'e3..1'], 0.4, rtol=0, atol=1e-14)
     assert_allclose(tt['shift_x', 'e3..1'], 5e-3, rtol=0, atol=1e-14)
     assert_allclose(tt['shift_y', 'e3..1'], 6e-3, rtol=0, atol=1e-14)
+    assert_allclose(tt['shift_s', 'e3..1'], -1e-3, rtol=0, atol=1e-14)
     assert_allclose(tt['k0l', 'e3..1'], 0., rtol=0, atol=1e-14)
     assert_allclose(tt['k1l', 'e3..1'], 0., rtol=0, atol=1e-14)
     assert_allclose(tt['k2l', 'e3..1'], 0., rtol=0, atol=1e-14)
@@ -613,6 +647,7 @@ def test_attr_thin_slicing(test_context, check_expr, use_copy):
     assert_allclose(tt['rot_s_rad', 'drift_e3..1'], 0, rtol=0, atol=1e-14)
     assert_allclose(tt['shift_x', 'drift_e3..1'], 0, rtol=0, atol=1e-14)
     assert_allclose(tt['shift_y', 'drift_e3..1'], 0, rtol=0, atol=1e-14)
+    assert_allclose(tt['shift_s', 'drift_e3..1'], 0, rtol=0, atol=1e-14)
     assert_allclose(tt['k0l', 'drift_e3..1'], 0, rtol=0, atol=1e-14)
     assert_allclose(tt['k1l', 'drift_e3..1'], 0, rtol=0, atol=1e-14)
     assert_allclose(tt['k2l', 'drift_e3..1'], 0, rtol=0, atol=1e-14)
@@ -634,6 +669,7 @@ def test_attr_thin_slicing(test_context, check_expr, use_copy):
     assert_allclose(tt['rot_s_rad', 'e5'], 0.0, rtol=0, atol=1e-14)
     assert_allclose(tt['shift_x', 'e5'], 0.0, rtol=0, atol=1e-14)
     assert_allclose(tt['shift_y', 'e5'], 0.0, rtol=0, atol=1e-14)
+    assert_allclose(tt['shift_s', 'e5'], 0.0, rtol=0, atol=1e-14)
     assert_allclose(tt['k0l', 'e5'], 0.0, rtol=0, atol=1e-14)
     assert_allclose(tt['k1l', 'e5'], 0.0, rtol=0, atol=1e-14)
     assert_allclose(tt['k2l', 'e5'], 0.0, rtol=0, atol=1e-14)
@@ -654,6 +690,7 @@ def test_attr_thin_slicing(test_context, check_expr, use_copy):
     assert_allclose(tt['rot_s_rad', 'e6..1'], 0.2, rtol=0, atol=1e-14)
     assert_allclose(tt['shift_x', 'e6..1'], 1e-3, rtol=0, atol=1e-14)
     assert_allclose(tt['shift_y', 'e6..1'], 2e-3, rtol=0, atol=1e-14)
+    assert_allclose(tt['shift_s', 'e6..1'], 2e-3, rtol=0, atol=1e-14)
     assert_allclose(tt['k0l', 'e6..1'], 0.5 * (0.4 * 1 + 0.7), rtol=0, atol=1e-14)
     assert_allclose(tt['k1l', 'e6..1'], 0.5 * (0.1 * 1 + 0.8), rtol=0, atol=1e-14)
     assert_allclose(tt['k2l', 'e6..1'], 0.5 *  .9, rtol=0, atol=1e-14)
@@ -674,6 +711,7 @@ def test_attr_thin_slicing(test_context, check_expr, use_copy):
     assert_allclose(tt['rot_s_rad', 'e6..exit_map'], 0.2, rtol=0, atol=1e-14)
     assert_allclose(tt['shift_x', 'e6..exit_map'], 1e-3, rtol=0, atol=1e-14)
     assert_allclose(tt['shift_y', 'e6..exit_map'], 2e-3, rtol=0, atol=1e-14)
+    assert_allclose(tt['shift_s', 'e6..exit_map'], 2e-3, rtol=0, atol=1e-14)
     assert_allclose(tt['k0l', 'e6..exit_map'], 0, rtol=0, atol=1e-14)
     assert_allclose(tt['k1l', 'e6..exit_map'], 0, rtol=0, atol=1e-14)
     assert_allclose(tt['k2l', 'e6..exit_map'], 0, rtol=0, atol=1e-14)
@@ -694,6 +732,7 @@ def test_attr_thin_slicing(test_context, check_expr, use_copy):
     assert_allclose(tt['rot_s_rad', 'e6..entry_map'], 0.2, rtol=0, atol=1e-14)
     assert_allclose(tt['shift_x', 'e6..entry_map'], 1e-3, rtol=0, atol=1e-14)
     assert_allclose(tt['shift_y', 'e6..entry_map'], 2e-3, rtol=0, atol=1e-14)
+    assert_allclose(tt['shift_s', 'e6..entry_map'], 2e-3, rtol=0, atol=1e-14)
     assert_allclose(tt['k0l', 'e6..entry_map'], 0, rtol=0, atol=1e-14)
     assert_allclose(tt['k1l', 'e6..entry_map'], 0, rtol=0, atol=1e-14)
     assert_allclose(tt['k2l', 'e6..entry_map'], 0, rtol=0, atol=1e-14)
@@ -714,6 +753,7 @@ def test_attr_thin_slicing(test_context, check_expr, use_copy):
     assert_allclose(tt['rot_s_rad', 'drift_e6..1'], 0, rtol=0, atol=1e-14)
     assert_allclose(tt['shift_x', 'drift_e6..1'], 0, rtol=0, atol=1e-14)
     assert_allclose(tt['shift_y', 'drift_e6..1'], 0, rtol=0, atol=1e-14)
+    assert_allclose(tt['shift_s', 'drift_e6..1'], 0, rtol=0, atol=1e-14)
     assert_allclose(tt['k0l', 'drift_e6..1'], 0, rtol=0, atol=1e-14)
     assert_allclose(tt['k1l', 'drift_e6..1'], 0, rtol=0, atol=1e-14)
     assert_allclose(tt['k2l', 'drift_e6..1'], 0, rtol=0, atol=1e-14)
@@ -769,6 +809,7 @@ def test_attr_thick_slicing(test_context, check_expr, use_copy):
     assert_allclose(tt['rot_s_rad', 'e0..1'], 0.2, rtol=0, atol=1e-14)
     assert_allclose(tt['shift_x', 'e0..1'], 1e-3, rtol=0, atol=1e-14)
     assert_allclose(tt['shift_y', 'e0..1'], 2e-3, rtol=0, atol=1e-14)
+    assert_allclose(tt['shift_s', 'e0..1'], 2e-3, rtol=0, atol=1e-14)
     assert_allclose(tt['k0l', 'e0..1'], 0.5 * (0.4 * 1 + 0.7), rtol=0, atol=1e-14)
     assert_allclose(tt['k1l', 'e0..1'], 0.5 * (0.1 * 1 + 0.8), rtol=0, atol=1e-14)
     assert_allclose(tt['k2l', 'e0..1'], 0.5 *  .9, rtol=0, atol=1e-14)
@@ -789,6 +830,7 @@ def test_attr_thick_slicing(test_context, check_expr, use_copy):
     assert_allclose(tt['rot_s_rad', 'e0..exit_map'], 0.2, rtol=0, atol=1e-14)
     assert_allclose(tt['shift_x', 'e0..exit_map'], 1e-3, rtol=0, atol=1e-14)
     assert_allclose(tt['shift_y', 'e0..exit_map'], 2e-3, rtol=0, atol=1e-14)
+    assert_allclose(tt['shift_s', 'e0..exit_map'], 2e-3, rtol=0, atol=1e-14)
     assert_allclose(tt['k0l', 'e0..exit_map'], 0, rtol=0, atol=1e-14)
     assert_allclose(tt['k1l', 'e0..exit_map'], 0, rtol=0, atol=1e-14)
     assert_allclose(tt['k2l', 'e0..exit_map'], 0, rtol=0, atol=1e-14)
@@ -809,6 +851,7 @@ def test_attr_thick_slicing(test_context, check_expr, use_copy):
     assert_allclose(tt['rot_s_rad', 'e0..entry_map'], 0.2, rtol=0, atol=1e-14)
     assert_allclose(tt['shift_x', 'e0..entry_map'], 1e-3, rtol=0, atol=1e-14)
     assert_allclose(tt['shift_y', 'e0..entry_map'], 2e-3, rtol=0, atol=1e-14)
+    assert_allclose(tt['shift_s', 'e0..entry_map'], 2e-3, rtol=0, atol=1e-14)
     assert_allclose(tt['k0l', 'e0..entry_map'], 0, rtol=0, atol=1e-14)
     assert_allclose(tt['k1l', 'e0..entry_map'], 0, rtol=0, atol=1e-14)
     assert_allclose(tt['k2l', 'e0..entry_map'], 0, rtol=0, atol=1e-14)
@@ -829,6 +872,7 @@ def test_attr_thick_slicing(test_context, check_expr, use_copy):
     assert_allclose(tt['rot_s_rad', 'e1..1'], 0.1, rtol=0, atol=1e-14)
     assert_allclose(tt['shift_x', 'e1..1'], 2e-3, rtol=0, atol=1e-14)
     assert_allclose(tt['shift_y', 'e1..1'], 1e-3, rtol=0, atol=1e-14)
+    assert_allclose(tt['shift_s', 'e1..1'], -1e-3, rtol=0, atol=1e-14)
     assert_allclose(tt['k0l', 'e1..1'], 0., rtol=0, atol=1e-14)
     assert_allclose(tt['k1l', 'e1..1'], 0.1 * 0.5 / 2, rtol=0, atol=1e-14)
     assert_allclose(tt['k2l', 'e1..1'], 0, rtol=0, atol=1e-14)
@@ -849,6 +893,7 @@ def test_attr_thick_slicing(test_context, check_expr, use_copy):
     assert_allclose(tt['rot_s_rad', 'e1_entry'], 0, rtol=0, atol=1e-14)
     assert_allclose(tt['shift_x', 'e1_entry'], 0, rtol=0, atol=1e-14)
     assert_allclose(tt['shift_y', 'e1_entry'], 0, rtol=0, atol=1e-14)
+    assert_allclose(tt['shift_s', 'e1_entry'], 0, rtol=0, atol=1e-14)
     assert_allclose(tt['k0l', 'e1_entry'], 0, rtol=0, atol=1e-14)
     assert_allclose(tt['k1l', 'e1_entry'], 0, rtol=0, atol=1e-14)
     assert_allclose(tt['k2l', 'e1_entry'], 0, rtol=0, atol=1e-14)
@@ -869,6 +914,7 @@ def test_attr_thick_slicing(test_context, check_expr, use_copy):
     assert_allclose(tt['rot_s_rad', 'e2..1'], 0.3, rtol=0, atol=1e-14)
     assert_allclose(tt['shift_x', 'e2..1'], 3e-3, rtol=0, atol=1e-14)
     assert_allclose(tt['shift_y', 'e2..1'], 4e-3, rtol=0, atol=1e-14)
+    assert_allclose(tt['shift_s', 'e2..1'], -2e-3, rtol=0, atol=1e-14)
     assert_allclose(tt['k0l', 'e2..1'], 0., rtol=0, atol=1e-14)
     assert_allclose(tt['k1l', 'e2..1'], 0., rtol=0, atol=1e-14)
     assert_allclose(tt['k2l', 'e2..1'], 0.1 * 0.3*1/2, rtol=0, atol=1e-14)
@@ -889,6 +935,7 @@ def test_attr_thick_slicing(test_context, check_expr, use_copy):
     assert_allclose(tt['rot_s_rad', 'e3..1'], 0.4, rtol=0, atol=1e-14)
     assert_allclose(tt['shift_x', 'e3..1'], 5e-3, rtol=0, atol=1e-14)
     assert_allclose(tt['shift_y', 'e3..1'], 6e-3, rtol=0, atol=1e-14)
+    assert_allclose(tt['shift_s', 'e3..1'], -1e-3, rtol=0, atol=1e-14)
     assert_allclose(tt['k0l', 'e3..1'], 0., rtol=0, atol=1e-14)
     assert_allclose(tt['k1l', 'e3..1'], 0., rtol=0, atol=1e-14)
     assert_allclose(tt['k2l', 'e3..1'], 0., rtol=0, atol=1e-14)
@@ -910,6 +957,7 @@ def test_attr_thick_slicing(test_context, check_expr, use_copy):
     assert_allclose(tt['rot_s_rad', 'e5'], 0.0, rtol=0, atol=1e-14)
     assert_allclose(tt['shift_x', 'e5'], 0.0, rtol=0, atol=1e-14)
     assert_allclose(tt['shift_y', 'e5'], 0.0, rtol=0, atol=1e-14)
+    assert_allclose(tt['shift_s', 'e5'], 0.0, rtol=0, atol=1e-14)
     assert_allclose(tt['k0l', 'e5'], 0.0, rtol=0, atol=1e-14)
     assert_allclose(tt['k1l', 'e5'], 0.0, rtol=0, atol=1e-14)
     assert_allclose(tt['k2l', 'e5'], 0.0, rtol=0, atol=1e-14)
@@ -930,6 +978,7 @@ def test_attr_thick_slicing(test_context, check_expr, use_copy):
     assert_allclose(tt['rot_s_rad', 'e6..1'], 0.2, rtol=0, atol=1e-14)
     assert_allclose(tt['shift_x', 'e6..1'], 1e-3, rtol=0, atol=1e-14)
     assert_allclose(tt['shift_y', 'e6..1'], 2e-3, rtol=0, atol=1e-14)
+    assert_allclose(tt['shift_s', 'e6..1'], 2e-3, rtol=0, atol=1e-14)
     assert_allclose(tt['k0l', 'e6..1'], 0.5 * (0.4 * 1 + 0.7), rtol=0, atol=1e-14)
     assert_allclose(tt['k1l', 'e6..1'], 0.5 * (0.1 * 1 + 0.8), rtol=0, atol=1e-14)
     assert_allclose(tt['k2l', 'e6..1'], 0.5 *  .9, rtol=0, atol=1e-14)
@@ -950,6 +999,7 @@ def test_attr_thick_slicing(test_context, check_expr, use_copy):
     assert_allclose(tt['rot_s_rad', 'e6..exit_map'], 0.2, rtol=0, atol=1e-14)
     assert_allclose(tt['shift_x', 'e6..exit_map'], 1e-3, rtol=0, atol=1e-14)
     assert_allclose(tt['shift_y', 'e6..exit_map'], 2e-3, rtol=0, atol=1e-14)
+    assert_allclose(tt['shift_s', 'e6..exit_map'], 2e-3, rtol=0, atol=1e-14)
     assert_allclose(tt['k0l', 'e6..exit_map'], 0, rtol=0, atol=1e-14)
     assert_allclose(tt['k1l', 'e6..exit_map'], 0, rtol=0, atol=1e-14)
     assert_allclose(tt['k2l', 'e6..exit_map'], 0, rtol=0, atol=1e-14)
@@ -970,6 +1020,7 @@ def test_attr_thick_slicing(test_context, check_expr, use_copy):
     assert_allclose(tt['rot_s_rad', 'e6..entry_map'], 0.2, rtol=0, atol=1e-14)
     assert_allclose(tt['shift_x', 'e6..entry_map'], 1e-3, rtol=0, atol=1e-14)
     assert_allclose(tt['shift_y', 'e6..entry_map'], 2e-3, rtol=0, atol=1e-14)
+    assert_allclose(tt['shift_s', 'e6..entry_map'], 2e-3, rtol=0, atol=1e-14)
     assert_allclose(tt['k0l', 'e6..entry_map'], 0, rtol=0, atol=1e-14)
     assert_allclose(tt['k1l', 'e6..entry_map'], 0, rtol=0, atol=1e-14)
     assert_allclose(tt['k2l', 'e6..entry_map'], 0, rtol=0, atol=1e-14)

{xtrack-0.57.3 → xtrack-0.59.0}/tests/test_elements_thick.py

@@ -341,7 +341,7 @@ def test_import_thick_bend_from_madx(use_true_thick_bends, with_knobs, bend_type
 
     assert np.allclose(
         elem.knl,
-        np.array([0, 0, 0.8, 0, 0]),  # knl = [0, 0, k2 * L, 0, 0]
+        np.array([0, 0, 0.8, 0, 0, 0]),  # knl = [0, 0, k2 * L, 0, 0]
         atol=1e-16,
     )
 
@@ -378,7 +378,7 @@ def test_import_thick_bend_from_madx(use_true_thick_bends, with_knobs, bend_type
 
     assert np.allclose(
         elem.knl,
-        np.array([0, 0, 2.4, 0, 0]),  # knl = [0, 0, k2 * L, 0, 0]
+        np.array([0, 0, 2.4, 0, 0, 0]),  # knl = [0, 0, k2 * L, 0, 0]
         atol=1e-16,
     )
 
@@ -485,7 +485,7 @@ def test_import_thick_bend_from_madx_and_slice(
         assert np.isclose(elem.weight, 0.5, atol=1e-16)
         assert np.isclose(elem._parent.length, 2.0, atol=1e-16)
         assert np.isclose(elem._parent.k0, 0.2, atol=1e-16)
-        assert np.allclose(elem._parent.knl, [0., 0, 0.8, 0, 0], atol=1e-16)
+        assert np.allclose(elem._parent.knl, [0., 0, 0.8, 0, 0, 0], atol=1e-16)
         assert np.allclose(elem._parent.ksl, 0, atol=1e-16)
         assert np.isclose(elem._parent.h, 0.05, atol=1e-16)
 
@@ -509,14 +509,14 @@ def test_import_thick_bend_from_madx_and_slice(
         assert np.isclose(elem.weight, 0.5, atol=1e-16)
         assert np.isclose(elem._parent.length, 3.0, atol=1e-16)
         assert np.isclose(elem._parent.k0, 0.4, atol=1e-16)
-        assert np.allclose(elem._parent.knl, [0., 0, 2.4, 0, 0], atol=1e-16)
+        assert np.allclose(elem._parent.knl, [0., 0, 2.4, 0, 0, 0], atol=1e-16)
         assert np.allclose(elem._parent.ksl, 0, atol=1e-16)
         assert np.isclose(elem._parent.h, 0.2/3, atol=1e-16)
 
         assert np.isclose(elem._xobject.weight, 0.5, atol=1e-16)
         assert np.isclose(elem._xobject._parent.length, 3.0, atol=1e-16)
         assert np.isclose(elem._xobject._parent.k0, 0.4, atol=1e-16)
-        assert np.allclose(elem._xobject._parent.knl, [0., 0, 2.4, 0, 0], atol=1e-16)
+        assert np.allclose(elem._xobject._parent.knl, [0., 0, 2.4, 0, 0, 0], atol=1e-16)
         assert np.allclose(elem._xobject._parent.ksl, 0, atol=1e-16)
         assert np.isclose(elem._xobject._parent.h, 0.2/3, atol=1e-16)
 

{xtrack-0.57.3 → xtrack-0.59.0}/tests/test_prebuild_kernels.py

@@ -1,14 +1,13 @@
 # copyright ################################# #
-# This file is part of the Xobjects Package.  #
-# Copyright (c) CERN, 2022.                   #
+# This file is part of the Xtrack Package.    #
+# Copyright (c) CERN, 2024.                   #
 # ########################################### #
-import json
 
 import cffi
 
 import xobjects as xo
 import xtrack as xt
-from xtrack.prebuild_kernels import regenerate_kernels
+from xsuite.prebuild_kernels import regenerate_kernels
 
 
 def test_prebuild_kernels(mocker, tmp_path, temp_context_default_func, capsys):
@@ -43,15 +42,17 @@ def test_prebuild_kernels(mocker, tmp_path, temp_context_default_func, capsys):
         }),
     ]
 
-    patch_defs = 'xtrack.prebuilt_kernels.kernel_definitions.kernel_definitions'
+    # Override the definitions with the temporary ones
+    patch_defs = 'xsuite.kernel_definitions.kernel_definitions'
     mocker.patch(patch_defs, kernel_definitions)
-
-    mocker.patch('xtrack.prebuild_kernels.XT_PREBUILT_KERNELS_LOCATION',
+    # We need to change the default location so that loading the kernels works
+    mocker.patch('xsuite.prebuild_kernels.XSK_PREBUILT_KERNELS_LOCATION',
+                 tmp_path)
+    mocker.patch('xsuite.XSK_PREBUILT_KERNELS_LOCATION',
                  tmp_path)
-    mocker.patch('xtrack.tracker.XT_PREBUILT_KERNELS_LOCATION', tmp_path)
 
     # Try regenerating the kernels
-    regenerate_kernels()
+    regenerate_kernels(location=tmp_path)
 
     # Check if the expected files were created
     so_file0, = tmp_path.glob('000_test_module.*.so')
@@ -103,17 +104,17 @@ def test_per_element_prebuild_kernels(mocker, tmp_path, temp_context_default_fun
         }),
     ]
 
-    patch_defs = 'xtrack.prebuilt_kernels.kernel_definitions.kernel_definitions'
+    # Override the definitions with the temporary ones
+    patch_defs = 'xsuite.kernel_definitions.kernel_definitions'
     mocker.patch(patch_defs, kernel_definitions)
-
-    mocker.patch('xtrack.prebuild_kernels.XT_PREBUILT_KERNELS_LOCATION',
+    # We need to change the default location so that loading the kernels works
+    mocker.patch('xsuite.prebuild_kernels.XSK_PREBUILT_KERNELS_LOCATION',
+                 tmp_path)
+    mocker.patch('xsuite.XSK_PREBUILT_KERNELS_LOCATION',
                  tmp_path)
-    mocker.patch('xtrack.tracker.XT_PREBUILT_KERNELS_LOCATION', tmp_path)
-    mocker.patch('xtrack.base_element.XT_PREBUILT_KERNELS_LOCATION', tmp_path)
-    mocker.patch('xtrack.particles.particles.XT_PREBUILT_KERNELS_LOCATION', tmp_path)
 
     # Try regenerating the kernels
-    regenerate_kernels()
+    regenerate_kernels(location=tmp_path)
 
     # Check if the expected files were created
     so_file_exists = False