xtrack 0.82.3__tar.gz → 0.83.0__tar.gz

{xtrack-0.82.3/xtrack.egg-info → xtrack-0.83.0}/PKG-INFO

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

{xtrack-0.82.3 → xtrack-0.83.0}/tests/test_elements_thick.py

@@ -2150,3 +2150,50 @@ def test_octupole_num_kicks():
     xo.assert_allclose(tw_3slices.ptau[-1], tw_3kicks.ptau[-1], atol=1e-15, rtol=0)
     xo.assert_allclose(tw_3slices.betx[-1], tw_3kicks.betx[-1], atol=1e-10, rtol=0)
     xo.assert_allclose(tw_3slices.bety[-1], tw_3kicks.bety[-1], atol=1e-10, rtol=0)
+
+
+def test_configure_model():
+    line = xt.Line(elements={
+        'b1': xt.Bend(k0=10, length=4, knl=[1, 2, 3]),
+        'r1': xt.RBend(k0=7, length=3, knl=[4, 5, 6]),
+        'q1': xt.Quadrupole(k1=20, length=4),
+        's1': xt.Sextupole(k2=50, length=8),
+        'o1': xt.Octupole(k3=100, length=9),
+    })
+
+    line.configure_bend_model(core='drift-kick-drift-exact', edge='dipole-only', integrator='teapot', num_multipole_kicks=4)
+    line.configure_quadrupole_model(model='drift-kick-drift-expanded', edge='full', integrator='uniform', num_multipole_kicks=5)
+    line.configure_sextupole_model(model='drift-kick-drift-exact', edge='full', integrator='yoshida4', num_multipole_kicks=6)
+    line.configure_octupole_model(model='mat-kick-mat', edge=None, integrator='uniform', num_multipole_kicks=7)
+
+    assert line['b1'].model == 'drift-kick-drift-exact'
+    assert line['b1'].edge_entry_active == True
+    assert line['b1'].edge_exit_active == True
+    assert line['b1'].edge_entry_model == 'dipole-only'
+    assert line['b1'].edge_exit_model == 'dipole-only'
+    assert line['b1'].integrator == 'teapot'
+    assert line['b1'].num_multipole_kicks == 4
+
+    assert line['r1'].model == 'drift-kick-drift-exact'
+    assert line['r1'].edge_entry_model == 'dipole-only'
+    assert line['r1'].edge_exit_model == 'dipole-only'
+    assert line['r1'].integrator == 'teapot'
+    assert line['r1'].num_multipole_kicks == 4
+
+    assert line['q1'].model == 'drift-kick-drift-expanded'
+    assert line['q1'].edge_entry_active == True
+    assert line['q1'].edge_exit_active == True
+    assert line['q1'].integrator == 'uniform'
+    assert line['q1'].num_multipole_kicks == 5
+
+    assert line['s1'].model == 'drift-kick-drift-exact'
+    assert line['s1'].edge_entry_active == True
+    assert line['s1'].edge_exit_active == True
+    assert line['s1'].integrator == 'yoshida4'
+    assert line['s1'].num_multipole_kicks == 6
+
+    assert line['o1'].model == 'mat-kick-mat'
+    assert line['o1'].edge_entry_active == False
+    assert line['o1'].edge_exit_active == False
+    assert line['o1'].integrator == 'uniform'
+    assert line['o1'].num_multipole_kicks == 7

{xtrack-0.82.3 → xtrack-0.83.0}/tests/test_madloader.py

@@ -21,19 +21,21 @@ def test_non_zero_index():
     assert xtrack.mad_loader.non_zero_len(lst) == 3
 
 
-def test_add_lists():
+def test_add_lists_same_lengths():
     a = [1, 2, 3, 1, 1, 1]
     b = [1, 1, 1, 4, 5, 6]
     c = xtrack.mad_loader.add_lists(a, b, 8)
     assert c == [2, 3, 4, 5, 6, 7, 0, 0]
 
 
-def test_add_lists():
+def test_add_lists_different_lengths_pick_longer():
     a = [1, 2, 3, 1, 1, 1]
     b = [1, 1, 1, 4, 5, 6, 7, 8]
     c = xtrack.mad_loader.add_lists(a, b, 8)
     assert c == [2, 3, 4, 5, 6, 7, 7, 8]
 
+
+def test_add_lists_manually_extend():
     a = [1, 2, 3, 1, 1, 1]
     b = [1, 1, 1, 4, 5, 6, 7, 8]
     c = xtrack.mad_loader.add_lists(a, b, 10)
@@ -336,6 +338,69 @@ def test_srotation():
     assert line[1].angle == line.vars['angle']._value * 180 / np.pi
 
 
+def test_thick_kicker_option():
+    mad = Madx(stdout=False)
+
+    mad.input("""
+    vk: vkicker, l=2, kick=2;
+    hk: hkicker, l=2, kick=3;
+    ki: kicker, l=2, vkick=4, hkick=5;
+    vk_thin: vkicker, lrad=2, kick=6;
+    hk_thin: hkicker, lrad=2, kick=7;
+    ki_thin: kicker, lrad=2, vkick=8, hkick=9;
+
+    ss: sequence, l = 6;
+        vk: vk, at = 1;
+        hk: hk, at = 3;
+        ki: ki, at = 5;
+        vk_thin: vk_thin, at = 6;
+        hk_thin: hk_thin, at = 6;
+        ki_thin: ki_thin, at = 6;
+    endsequence;
+
+    beam; use, sequence=ss;
+    """)
+    line = MadLoader(mad.sequence.ss, enable_expressions=True, allow_thick=True, enable_thick_kickers=True).make_line()
+
+    _, vk, hk, ki, vk_thin, hk_thin, ki_thin, _ = line.elements
+
+    assert isinstance(vk, xt.Magnet)
+    assert isinstance(hk, xt.Magnet)
+    assert isinstance(ki, xt.Magnet)
+    assert isinstance(vk_thin, xt.Multipole)
+    assert isinstance(hk_thin, xt.Multipole)
+    assert isinstance(ki_thin, xt.Multipole)
+
+    def assert_integrated_strength_eq(value, expected):
+        padded_expected = np.zeros_like(value)
+        padded_expected[:len(expected)] = expected
+        assert np.all(value == padded_expected)
+
+    assert_integrated_strength_eq(vk.knl, [0])
+    assert_integrated_strength_eq(vk.ksl, [2])
+    assert vk.length == 2
+
+    assert_integrated_strength_eq(hk.knl, [-3])
+    assert_integrated_strength_eq(hk.ksl, [0])
+    assert hk.length == 2
+
+    assert_integrated_strength_eq(ki.knl, [-5])
+    assert_integrated_strength_eq(ki.ksl, [4])
+    assert ki.length == 2
+
+    assert_integrated_strength_eq(vk_thin.knl, [0])
+    assert_integrated_strength_eq(vk_thin.ksl, [6])
+    assert vk_thin.length == 2
+
+    assert_integrated_strength_eq(hk_thin.knl, [-7])
+    assert_integrated_strength_eq(hk_thin.ksl, [0])
+    assert hk_thin.length == 2
+
+    assert_integrated_strength_eq(ki_thin.knl, [-9])
+    assert_integrated_strength_eq(ki_thin.ksl, [8])
+    assert ki_thin.length == 2
+
+
 def test_xrotation():
     mad = Madx(stdout=False)
 

{xtrack-0.82.3 → xtrack-0.83.0}/tests/test_radiation_equilibrium_emittances_thick.py

@@ -140,7 +140,7 @@ def test_eq_emitt(conf):
         checked = True
     elif not tilt_machine_by_90_degrees and not vertical_orbit_distortion and wiggler_on:
         xo.assert_allclose(ex, 7.0714e-10, atol=0,     rtol=1e-4)
-        xo.assert_allclose(ey, 5.6804e-13, atol=0,     rtol=4e-3)
+        xo.assert_allclose(ey, 5.6986e-13, atol=0,     rtol=4e-3)
         xo.assert_allclose(ez, 3.8595e-6,  atol=0,     rtol=1e-4)
         checked = True
     elif tilt_machine_by_90_degrees and not vertical_orbit_distortion and wiggler_on:
@@ -154,7 +154,7 @@ def test_eq_emitt(conf):
         xo.assert_allclose(ez, 3.5828e-6,  atol=0,     rtol=1e-4)
         checked = True
     elif tilt_machine_by_90_degrees and vertical_orbit_distortion and not wiggler_on:
-        xo.assert_allclose(ex, 2.2261e-12, atol=0,     rtol=5e-3)
+        xo.assert_allclose(ex, 2.2393e-12, atol=0,     rtol=7e-3)
         xo.assert_allclose(ey, 7.1345e-10, atol=0,     rtol=1e-4)
         xo.assert_allclose(ez, 3.5828e-6,  atol=0,     rtol=1e-4)
         checked = True