xtrack 0.89.3__tar.gz → 0.90.0__tar.gz

{xtrack-0.89.3/xtrack.egg-info → xtrack-0.90.0}/PKG-INFO

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

{xtrack-0.89.3 → xtrack-0.90.0}/tests/test_elements.py

@@ -214,6 +214,40 @@ def test_drift(test_context):
                       dtk_particle.zeta,
                       rtol=1e-14, atol=1e-14)
 
+@for_all_test_contexts
+def test_drift_exact_and_expanded(test_context):
+
+    line = xt.Line(elements=[xt.Drift(length=1.), xt.Drift(length=2.), xt.Drift(length=3.)])
+    ltot = line.get_length()
+    line.build_tracker(_context=test_context)
+
+    assert line['e2'].model == 'adaptive'
+
+    p0 = xp.Particles(p0c=1e9, px=0.3, _context=test_context)
+    x_prime_expanded = p0.px / (1 + p0.delta)
+    x_prime_exact = p0.px / np.sqrt((1 + p0.delta)**2 - p0.px**2)
+
+    p = p0.copy(_context=test_context)
+    line.track(p)
+    xo.assert_allclose(p.x, x_prime_expanded*ltot, rtol=1e-14, atol=1e-14)
+
+    line.configure_drift_model(model='exact')
+    assert line['e2'].model == 'exact'
+    p = p0.copy(_context=test_context)
+    line.track(p)
+    xo.assert_allclose(p.x, x_prime_exact*ltot, rtol=1e-14, atol=1e-14)
+
+    line.configure_drift_model(model='expanded')
+    assert line['e2'].model == 'expanded'
+    p = p0.copy(_context=test_context)
+    line.track(p)
+    xo.assert_allclose(p.x, x_prime_expanded*ltot, rtol=1e-14, atol=1e-14)
+
+    line.config.XTRACK_USE_EXACT_DRIFTS = True
+    p = p0.copy(_context=test_context)
+    line.track(p)
+    xo.assert_allclose(p.x, x_prime_exact*ltot, rtol=1e-14, atol=1e-14)
+
 
 @for_all_test_contexts
 def test_drift_exact(test_context):
@@ -232,7 +266,7 @@ def test_drift_exact(test_context):
     drift = xt.Drift(_context=test_context, length=10.)
     line = xt.Line(elements=[drift])
     line.build_tracker(compile=False, _context=test_context)
-    line.config.XTRACK_USE_EXACT_DRIFTS = True
+    line.configure_drift_model(model='exact')
     line.track(particles)
 
     dtk_drift = dtk.elements.DriftExact(length=10.)
@@ -1162,7 +1196,7 @@ def test_nonlinearlens(test_context):
     """)
 
     line = xt.Line.from_madx_sequence(mad.sequence.ss)
-    line.config.XTRACK_USE_EXACT_DRIFTS = True # to be consistent with madx
+    line.configure_drift_model('exact') # to be consistent with madx
     line.build_tracker(_context=test_context)
 
     num_p_test = 10

{xtrack-0.89.3 → xtrack-0.90.0}/tests/test_elements_thick.py

@@ -59,7 +59,7 @@ def test_combined_function_dipole_against_ptc(test_context, k0, k1, k2, length,
 
     ml = MadLoader(mad.sequence.ss, allow_thick=True)
     line_thick = ml.make_line()
-    line_thick.config.XTRACK_USE_EXACT_DRIFTS = True # to be consistent with mad
+    line_thick.configure_drift_model('exact') # to be consistent with madx
     line_thick.build_tracker(_context=test_context)
     line_thick.configure_bend_model(core=model, edge='dipole-only')
 
@@ -1283,7 +1283,7 @@ def test_solenoid_against_madx(test_context, ks, ksi, length):
     ml = MadLoader(mad.sequence.ss, allow_thick=True)
     line_thick = ml.make_line()
     line_thick.build_tracker(_context=test_context)
-    line_thick.config.XTRACK_USE_EXACT_DRIFTS = True  # to be consistent with madx
+    line_thick.configure_drift_model('exact')  # to be consistent with madx
 
     for ii in range(len(p0.x)):
         mad.input(f"""
@@ -1320,7 +1320,7 @@ def test_solenoid_against_madx(test_context, ks, ksi, length):
 def test_solenoid_thick_drift_like(test_context):
     solenoid = xt.UniformSolenoid(ks=1.001e-9, length=1, _context=test_context)
     l_drift = xt.Line(elements=[xt.Drift(length=1)])
-    l_drift.config.XTRACK_USE_EXACT_DRIFTS = True
+    l_drift.configure_drift_model('exact')
     l_drift.build_tracker(_context=test_context)
 
     p0 = xp.Particles(
@@ -1743,7 +1743,6 @@ def test_solenoid_multipole_rotations():
 def test_drift_like_solenoid_with_kicks_radiation(radiation_mode, config):
     test_context = xo.ContextCpu()
 
-    config['XTRACK_USE_EXACT_DRIFTS'] = True
     knl = [0.1, 0.4, 0.5]
     ksl = [0.2, 0.3, 0.6]
 
@@ -1752,6 +1751,7 @@ def test_drift_like_solenoid_with_kicks_radiation(radiation_mode, config):
         xt.Multipole(knl=knl, ksl=ksl),
         xt.Drift(length=0.5),
     ])
+    line_test.configure_drift_model('exact')
 
     line_ref = xt.Line(elements=[
         xt.UniformSolenoid(ks=0, length=1, knl=knl, ksl=ksl, num_multipole_kicks=1)
@@ -1803,8 +1803,6 @@ def test_drift_like_solenoid_with_kicks_radiation(radiation_mode, config):
 def test_solenoid_with_kicks_radiation(radiation_mode, config):
     test_context = xo.ContextCpu()
 
-    config['XTRACK_USE_EXACT_DRIFTS'] = True
-
     ks = 0.4
     l = 1.1
     knl = [0.1, 0.4, 0.5]
@@ -1818,6 +1816,9 @@ def test_solenoid_with_kicks_radiation(radiation_mode, config):
     line_1 = xt.Line(elements=[sol_1])
     line_3 = xt.Line(elements=[sol_3])
 
+    for ll in (line_ref, line_1, line_3):
+        ll.configure_drift_model('exact')
+
     coords = np.linspace(-0.05, 0.05, 10)
     coords_6d = np.array(list(itertools.product(*(coords,) * 6))).T
 

{xtrack-0.89.3 → xtrack-0.90.0}/tests/test_environment.py

@@ -620,19 +620,19 @@ def test_assemble_ring():
     assert 'cell3_copy' in env.lines
     assert cell3_select.particle_ref is not None
     assert env.lines['cell3_copy'] is cell3_select
-    assert cell3_select._element_dict is env.element_dict
+    assert cell3_select.element_dict is env.element_dict
     assert cell3_select.element_names[0] == 'start.cell.3.arc.2'
     assert cell3_select.element_names[-1] == 'end.cell.3.arc.2'
     assert (np.array(cell3_select.element_names) == np.array(
         tw.rows['start.cell.3.arc.2':'end.cell.3.arc.2'].name)).all()
 
-    # Check that they share the _element_dict
-    assert cell._element_dict is env.element_dict
-    assert halfcell._element_dict is env.element_dict
-    assert halfcell_ss._element_dict is env.element_dict
-    assert cell_ss._element_dict is env.element_dict
-    assert insertion._element_dict is env.element_dict
-    assert ring2._element_dict is env.element_dict
+    # Check that they share the element_dict
+    assert cell.element_dict is env.element_dict
+    assert halfcell.element_dict is env.element_dict
+    assert halfcell_ss.element_dict is env.element_dict
+    assert cell_ss.element_dict is env.element_dict
+    assert insertion.element_dict is env.element_dict
+    assert ring2.element_dict is env.element_dict
 
     cell3_select.twiss4d()
 
@@ -1039,19 +1039,19 @@ def test_assemble_ring_builders():
                                 name='cell3_copy')
     assert 'cell3_copy' in env.lines
     assert env.lines['cell3_copy'] is cell3_select
-    assert cell3_select._element_dict is env.element_dict
+    assert cell3_select.element_dict is env.element_dict
     assert cell3_select.element_names[0] == 'start.cell.3.arc.2'
     assert cell3_select.element_names[-1] == 'end.cell.3.arc.2'
     assert (np.array(cell3_select.element_names) == np.array(
         tw.rows['start.cell.3.arc.2':'end.cell.3.arc.2'].name)).all()
 
-    # Check that they share the _element_dict
-    assert cell._element_dict is env.element_dict
-    assert halfcell._element_dict is env.element_dict
-    assert halfcell_ss._element_dict is env.element_dict
-    assert cell_ss._element_dict is env.element_dict
-    assert insertion._element_dict is env.element_dict
-    assert ring2._element_dict is env.element_dict
+    # Check that they share the element_dict
+    assert cell.element_dict is env.element_dict
+    assert halfcell.element_dict is env.element_dict
+    assert halfcell_ss.element_dict is env.element_dict
+    assert cell_ss.element_dict is env.element_dict
+    assert insertion.element_dict is env.element_dict
+    assert ring2.element_dict is env.element_dict
 
     cell3_select.twiss4d()
 
@@ -1393,13 +1393,13 @@ def test_assemble_ring_repeated_elements():
     xo.assert_allclose(tw_ring2.betx[0], tw_cell.betx[0], atol=0, rtol=5e-4)
     xo.assert_allclose(tw_ring2.bety[0], tw_cell.bety[0], atol=0, rtol=5e-4)
 
-    # Check that they share the _element_dict
-    assert cell._element_dict is env.element_dict
-    assert halfcell._element_dict is env.element_dict
-    assert halfcell_ss._element_dict is env.element_dict
-    assert cell_ss._element_dict is env.element_dict
-    assert insertion._element_dict is env.element_dict
-    assert ring2._element_dict is env.element_dict
+    # Check that they share the element_dict
+    assert cell.element_dict is env.element_dict
+    assert halfcell.element_dict is env.element_dict
+    assert halfcell_ss.element_dict is env.element_dict
+    assert cell_ss.element_dict is env.element_dict
+    assert insertion.element_dict is env.element_dict
+    assert ring2.element_dict is env.element_dict
 
     xo.assert_allclose(tw_ring2['betx', 'ip::0'], tw_half_insertion['betx', 'ip'], atol=0, rtol=5e-4)
     xo.assert_allclose(tw_ring2['bety', 'ip::0'], tw_half_insertion['bety', 'ip'], atol=0, rtol=5e-4)
@@ -3193,3 +3193,154 @@ def test_enviroment_from_two_lines():
     assert np.allclose(tw2.s, tw2i.s, atol=0, rtol=1e-15)
     assert np.allclose(tw2.betx, tw2i.betx, atol=0, rtol=1e-15)
     assert np.allclose(tw2.bety, tw2i.bety, atol=0, rtol=1e-15)
+
+def test_particle_ref_from_particles_container():
+
+    env = xt.Environment()
+    env['a'] = 4.
+
+    env.new_particle('my_particle', p0c=['1e12 * a'])
+    assert 'my_particle' in env.particles
+    xo.assert_allclose(env['my_particle'].p0c, 4e12, rtol=0, atol=1e-9)
+    env['a'] = 5.
+    xo.assert_allclose(env['my_particle'].p0c, 5e12, rtol=0, atol=1e-9)
+
+    env.particle_ref = 'my_particle'
+
+    xo.assert_allclose(env.particle_ref.p0c, 5e12, rtol=0, atol=1e-9)
+    assert env.particle_ref.__class__.__name__ == 'EnvParticleRef'
+    assert env._particle_ref == 'my_particle'
+    assert env.ref['my_particle']._value is env.get('my_particle')
+    env.particle_ref.p0c = '2e12 * a'
+    xo.assert_allclose(env.particle_ref.p0c, 10e12, rtol=0, atol=1e-9)
+    env['my_particle'].p0c = '1e12 * a'
+    xo.assert_allclose(env.particle_ref.p0c, 5e12, rtol=0, atol=1e-9)
+
+    env2 = xt.Environment.from_dict(env.to_dict())
+    assert 'my_particle' in env2.particles
+    assert isinstance(env2.get('my_particle'), xt.Particles)
+    assert env2.get('my_particle') is not env.get('my_particle')
+    assert env2._particle_ref == "my_particle"
+    assert env2.ref['my_particle']._value is env2.get('my_particle')
+    xo.assert_allclose(env2['my_particle'].p0c, 5e12, rtol=0, atol=1e-9)
+    env2['a'] = 6.
+    xo.assert_allclose(env2['my_particle'].p0c, 6e12, rtol=0, atol=1e-9)
+    env2['a'] = 5.
+
+    assert env2.particle_ref.__class__.__name__ == 'EnvParticleRef'
+    env2.particle_ref.p0c = '2e12 * a'
+    xo.assert_allclose(env2.particle_ref.p0c, 10e12, rtol=0, atol=1e-9)
+    env2['my_particle'].p0c = '1e12 * a'
+    xo.assert_allclose(env2.particle_ref.p0c, 5e12, rtol=0, atol=1e-9)
+
+    env2 = env.copy()
+    assert 'my_particle' in env2.particles
+    assert env2._particle_ref == "my_particle"
+    assert env.ref['my_particle']._value is env.get('my_particle')
+    assert isinstance(env2.get('my_particle'), xt.Particles)
+    assert env2.get('my_particle') is not env.get('my_particle')
+    xo.assert_allclose(env2['my_particle'].p0c, 5e12, rtol=0, atol=1e-9)
+    env2['a'] = 6.
+    xo.assert_allclose(env2['my_particle'].p0c, 6e12, rtol=0, atol=1e-9)
+    env2['a'] = 5.
+
+    assert env2.particle_ref.__class__.__name__ == 'EnvParticleRef'
+    env2.particle_ref.p0c = '2e12 * a'
+    xo.assert_allclose(env2.particle_ref.p0c, 10e12, rtol=0, atol=1e-9)
+    env2['my_particle'].p0c = '1e12 * a'
+    xo.assert_allclose(env2.particle_ref.p0c, 5e12, rtol=0, atol=1e-9)
+
+    ll = env.new_line(name='my_line', components=[])
+    assert ll._particle_ref == 'my_particle'
+
+    xo.assert_allclose(ll.particle_ref.p0c, 5e12, rtol=0, atol=1e-9)
+    assert ll.particle_ref.__class__.__name__ == 'LineParticleRef'
+    ll.particle_ref.p0c = '2e12 * a'
+    xo.assert_allclose(env.particle_ref.p0c, 10e12, rtol=0, atol=1e-9)
+    env['my_particle'].p0c = '1e12 * a'
+    xo.assert_allclose(ll.particle_ref.p0c, 5e12, rtol=0, atol=1e-9)
+
+    ll2 = xt.Line.from_dict(ll.to_dict())
+    assert 'my_particle' in ll2.env.particles
+    assert ll2.env.particle_ref is None
+    assert ll2.particle_ref.__class__.__name__ == 'LineParticleRef'
+    assert ll2._particle_ref == 'my_particle'
+    xo.assert_allclose(ll2.env['my_particle'].p0c, 5e12, rtol=0, atol=1e-9)
+    ll2['a'] = 7.
+    xo.assert_allclose(ll2.env['my_particle'].p0c, 7e12, rtol=0, atol=1e-9)
+    ll2['a'] = 5.
+
+    ll2.particle_ref.p0c = '2e12 * a'
+    xo.assert_allclose(ll2.particle_ref.p0c, 10e12, rtol=0, atol=1e-9)
+    ll2.env['my_particle'].p0c = '1e12 * a'
+    xo.assert_allclose(ll2.particle_ref.p0c, 5e12, rtol=0, atol=1e-9)
+
+
+    ll2 = ll.copy()
+    assert 'my_particle' in ll2.env.particles
+    assert ll2.env.particle_ref is None
+    assert ll2.particle_ref.__class__.__name__ == 'LineParticleRef'
+    assert ll2._particle_ref == 'my_particle'
+    xo.assert_allclose(ll2.env['my_particle'].p0c, 5e12, rtol=0, atol=1e-9)
+    ll2['a'] = 7.
+    xo.assert_allclose(ll2.env['my_particle'].p0c, 7e12, rtol=0, atol=1e-9)
+    ll2['a'] = 5.
+
+    ll2.particle_ref.p0c = '2e12 * a'
+    xo.assert_allclose(ll2.particle_ref.p0c, 10e12, rtol=0, atol=1e-9)
+    ll2.env['my_particle'].p0c = '1e12 * a'
+    xo.assert_allclose(ll2.particle_ref.p0c, 5e12, rtol=0, atol=1e-9)
+
+def test_particle_ref_as_object():
+
+    env = xt.Environment()
+    env['a'] = 4.
+
+    env.new_particle('my_particle', p0c=['1e12 * a'])
+    assert 'my_particle' in env.particles
+    xo.assert_allclose(env['my_particle'].p0c, 4e12, rtol=0, atol=1e-9)
+    env['a'] = 5.
+    xo.assert_allclose(env['my_particle'].p0c, 5e12, rtol=0, atol=1e-9)
+
+    part = env['my_particle'].copy()
+    env.particle_ref = part
+
+    xo.assert_allclose(env.particle_ref.p0c, 5e12, rtol=0, atol=1e-9)
+    assert env.particle_ref.__class__.__name__ == 'EnvParticleRef'
+    assert env._particle_ref is part
+    env['my_particle'].p0c = '2e12 * a'
+    xo.assert_allclose(env.eval('2e12 * a'), 10e12, rtol=0, atol=1e-9)
+    xo.assert_allclose(env.particle_ref.p0c, 5e12, rtol=0, atol=1e-9)
+
+    env2 = xt.Environment.from_dict(env.to_dict())
+    assert 'my_particle' in env2.particles
+    assert isinstance(env2.get('my_particle'), xt.Particles)
+    assert env2.get('my_particle') is not env.get('my_particle')
+    assert isinstance(env2._particle_ref, xt.Particles)
+    assert env2.particle_ref.__class__.__name__ == 'EnvParticleRef'
+
+    env2 = env.copy()
+    assert 'my_particle' in env2.particles
+    assert isinstance(env2._particle_ref, xt.Particles)
+    assert isinstance(env2.get('my_particle'), xt.Particles)
+    assert env2.get('my_particle') is not env.get('my_particle')
+    assert env2.particle_ref.__class__.__name__ == 'EnvParticleRef'
+
+    ll = env.new_line(name='my_line', components=[])
+    assert isinstance(ll._particle_ref, xt.Particles)
+    assert ll._particle_ref is env._particle_ref
+    xo.assert_allclose(ll.particle_ref.p0c, 5e12, rtol=0, atol=1e-9)
+    assert ll.particle_ref.__class__.__name__ == 'LineParticleRef'
+
+    ll2 = xt.Line.from_dict(ll.to_dict())
+    assert ll2.env.particle_ref is None
+    assert ll2.particle_ref.__class__.__name__ == 'LineParticleRef'
+    assert isinstance(ll2._particle_ref, xt.Particles)
+    assert ll2._particle_ref is not ll._particle_ref
+
+
+    ll2 = ll.copy()
+    assert ll2.env.particle_ref is None
+    assert ll2.particle_ref.__class__.__name__ == 'LineParticleRef'
+    assert isinstance(ll2._particle_ref, xt.Particles)
+    assert ll2._particle_ref is not ll._particle_ref

{xtrack-0.89.3 → xtrack-0.90.0}/tests/test_line.py

@@ -65,7 +65,7 @@ def test_simplification_methods():
     line.remove_zero_length_drifts(inplace=True)
 
     # Test merging of multipoles
-    line._var_management = None
+    line.env._var_management = None
     line.insert_element(element=xt.Multipole(knl=[1, 0, 3], ksl=[0, 20, 0]), name='m1', at_s=3.3)
     line.insert_element(element=xt.Multipole(knl=[4, 2], ksl=[10, 40]), name='m2', at_s=3.3)
     line.insert_element(element=xt.Multipole(knl=[0, 3, 8], ksl=[2, 0, 17]), name='m3', at_s=3.3)

{xtrack-0.89.3 → xtrack-0.90.0}/tests/test_multispecies.py

@@ -413,9 +413,6 @@ def test_multispecies_quadrupole():
     line_ref1.configure_bend_model(core=model)
     line_ref2.configure_bend_model(core=model)
 
-    # line_ref1.config.XTRACK_USE_EXACT_DRIFTS = True
-    # line_ref2.config.XTRACK_USE_EXACT_DRIFTS = True
-
     line_ref1.build_tracker()
     line_ref2.build_tracker()
 
@@ -521,9 +518,6 @@ def test_multispecies_sextupole():
     line_ref1.configure_bend_model(core=model)
     line_ref2.configure_bend_model(core=model)
 
-    # line_ref1.config.XTRACK_USE_EXACT_DRIFTS = True
-    # line_ref2.config.XTRACK_USE_EXACT_DRIFTS = True
-
     line_ref1.build_tracker()
     line_ref2.build_tracker()
 
@@ -623,8 +617,8 @@ def test_multispecies_octupole():
     line_ref1.append_element(element=xt.Marker(), name='endmarker')
     line_ref2.append_element(element=xt.Marker(), name='endmarker')
 
-    line_ref1.config.XTRACK_USE_EXACT_DRIFTS = True
-    line_ref2.config.XTRACK_USE_EXACT_DRIFTS = True
+    line_ref1.configure_drift_model(model='exact')
+    line_ref2.configure_drift_model(model='exact')
 
     line_ref1.build_tracker()
     line_ref2.build_tracker()

{xtrack-0.89.3 → xtrack-0.90.0}/tests/test_particles.py

@@ -4,6 +4,7 @@
 # ######################################### #
 import numpy as np
 import pytest
+from scipy.constants import c as clight
 
 import xtrack as xt
 import xobjects as xo
@@ -135,7 +136,7 @@ def test_check_is_active_sorting_cpu_default(test_context):
     assert set(particles.particle_id[8:]) == {1, 3, 5, 6, 7, 8, 9, 10, 12, 17}
 
 def test_particles_energy_coordinates():
-    p = xt.Particles(mass0=xt.PROTON_MASS_EV, q0=1,
+    p = xt.Particles(mass0=xt.PROTON_MASS_EV, q0=2,
                     kinetic_energy0=50e6, delta=0.1)
 
     beta0 = p.beta0[0]
@@ -144,6 +145,7 @@ def test_particles_energy_coordinates():
     energy0 = p.energy0[0]
     energy = p.energy[0]
     p0c = p.p0c[0]
+    rigidity0 = p.rigidity0[0]
 
     delta = p.delta[0]
     ptau = p.ptau[0]
@@ -156,6 +158,7 @@ def test_particles_energy_coordinates():
     xo.assert_allclose(gamma, 1 / np.sqrt(1 - beta**2), rtol=0, atol=1e-14)
     xo.assert_allclose(energy, mass0_ev * gamma, rtol=0, atol=1e-6) # 1e-6 eV
     xo.assert_allclose(energy0, mass0_ev * gamma0, rtol=0, atol=1e-6) # 1e-6 eV
+    xo.assert_allclose(rigidity0, p0c / clight / p.q0, rtol=0, atol=1e-14)
 
     Pc = p0c * (1 + delta)
     xo.assert_allclose(Pc, mass0_ev * gamma * beta, rtol=0, atol=1e-6) # 1e-6 eV

{xtrack-0.89.3 → xtrack-0.90.0}/tests/test_rbend_straight_body.py

@@ -1376,7 +1376,7 @@ def test_rbend_straight_body_thin_slices_fine():
                 at=2.5)])
     line.insert('start', xt.Marker(), at=0)
     line.append('end', xt.Marker())
-    line.config.XTRACK_USE_EXACT_DRIFTS = True
+    line.configure_drift_model('exact')
 
     line_no_slice = line.copy(shallow=True)
 

{xtrack-0.89.3 → xtrack-0.90.0}/tests/test_slicing.py

@@ -457,7 +457,6 @@ def test_slicing_xdeps_consistency():
         elements=[xt.Bend(k0=1, length=100)] * num_elements,
         element_names=[f'bend{ii}' for ii in range(num_elements)],
     )
-    line._init_var_management()
 
     for ii in range(num_elements):
         line.vars[f'k{ii}'] = 1

{xtrack-0.89.3 → xtrack-0.90.0}/tests/test_survey.py

@@ -150,7 +150,7 @@ def test_survey_with_ref_transformations():
     ])
 
     line.config.XTRACK_GLOBAL_XY_LIMIT = None
-    line.config.XTRACK_USE_EXACT_DRIFTS = True
+    line.configure_drift_model('exact')
     tw = line.twiss4d(_continue_if_lost=True, betx=1, bety=1, x=1e-3, y=2e-3)
 
     sv_no_arg = line.survey()
@@ -289,7 +289,7 @@ def test_survey_with_h_and_v_bends():
     ])
 
     line.config.XTRACK_GLOBAL_XY_LIMIT = None
-    line.config.XTRACK_USE_EXACT_DRIFTS = True
+    line.configure_drift_model('exact')
     tw = line.twiss4d(_continue_if_lost=True, betx=1, bety=1, x=1e-3, y=2e-3)
 
     sv_no_arg = line.survey()
@@ -463,7 +463,7 @@ def test_survey_against_madx():
     tw_ptc = xt.Table(mad.table.ptc_twiss)
 
     line.config.XTRACK_GLOBAL_XY_LIMIT = None
-    line.config.XTRACK_USE_EXACT_DRIFTS = True
+    line.configure_drift_model('exact')
 
     sv = line.survey()
     tw = line.twiss(betx=1, bety=1, x=1e-3, y=2e-3)

xtrack-0.90.0/xtrack/_version.py

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

{xtrack-0.89.3 → xtrack-0.90.0}/xtrack/beam_elements/elements.py

@@ -18,6 +18,13 @@ from xtrack.internal_record import RecordIndex
 
 DEFAULT_MULTIPOLE_ORDER = 5
 
+_INDEX_TO_MODEL_DRIFT = {
+    0: 'adaptive',
+    1: 'expanded',
+    2: 'exact'
+}
+_MODEL_TO_INDEX_DRIFT = {k: v for v, k in _INDEX_TO_MODEL_DRIFT.items()}
+
 _INDEX_TO_MODEL_CURVED = {
     0: 'adaptive',
     1: 'full',
@@ -95,6 +102,24 @@ class _HasIntegrator:
         except KeyError:
             raise ValueError(f'Invalid integrator: {value}')
 
+class _HasModelDrift:
+
+    """
+    Mixin class adding properties and methods for beam elements
+    with drift model fields.
+    """
+
+    @property
+    def model(self):
+        return _INDEX_TO_MODEL_DRIFT[self._model]
+
+    @model.setter
+    def model(self, value):
+        try:
+            self._model = _MODEL_TO_INDEX_DRIFT[value]
+        except KeyError:
+            raise ValueError(f'Invalid model: {value}')
+
 class _HasModelStraight:
 
     """
@@ -315,7 +340,7 @@ class Marker(BeamElement):
     ]
 
 
-class Drift(BeamElement):
+class Drift(_HasModelDrift, BeamElement):
     """Beam element modeling a drift section.
 
     Parameters
@@ -326,7 +351,8 @@ class Drift(BeamElement):
     """
 
     _xofields = {
-        'length': xo.Float64
+        'length': xo.Float64,
+        'model': xo.Int64
     }
 
     isthick = True
@@ -339,6 +365,12 @@ class Drift(BeamElement):
         '#include <beam_elements/elements_src/drift.h>',
     ]
 
+    _rename = {
+        'model': '_model',
+    }
+
+    _no_expr_fields = {'model'}
+
     def __init__(self, length=None, **kwargs):
 
         if '_xobject' in kwargs and kwargs['_xobject'] is not None:

{xtrack-0.89.3 → xtrack-0.90.0}/xtrack/beam_elements/elements_src/drift.h

@@ -18,9 +18,25 @@ void Drift_track_local_particle(DriftData el, LocalParticle* part0){
         length = -length;
     }
 
-    START_PER_PARTICLE_BLOCK(part0, part);
-        Drift_single_particle(part, length);
-    END_PER_PARTICLE_BLOCK;
+    int64_t model;
+    #ifdef XTRACK_USE_EXACT_DRIFTS
+        model = 2;
+    #else
+        model = DriftData_get_model(el);
+        if (model == 0) { // adaptive
+            model = 1; // expanded
+        }
+    #endif
+
+    if (model == 1) {
+        START_PER_PARTICLE_BLOCK(part0, part);
+            Drift_single_particle_expanded(part, length);
+        END_PER_PARTICLE_BLOCK;
+    } else if (model == 2) {
+        START_PER_PARTICLE_BLOCK(part0, part);
+            Drift_single_particle_exact(part, length);
+        END_PER_PARTICLE_BLOCK;
+    }
 }
 
 

{xtrack-0.89.3 → xtrack-0.90.0}/xtrack/beam_elements/elements_src/drift_slice.h

@@ -24,9 +24,25 @@ void DriftSlice_track_local_particle(
         length = weight * DriftSliceData_get__parent_length(el); // m
     }
 
-    START_PER_PARTICLE_BLOCK(part0, part);
-        Drift_single_particle(part, length);
-    END_PER_PARTICLE_BLOCK;
+    int64_t model;
+    #ifdef XTRACK_USE_EXACT_DRIFTS
+        model = 2;
+    #else
+        model = DriftSliceData_get__parent_model(el);
+        if (model == 0) { // adaptive
+            model = 1; // expanded
+        }
+    #endif
+
+    if (model == 1) {
+        START_PER_PARTICLE_BLOCK(part0, part);
+            Drift_single_particle_expanded(part, length);
+        END_PER_PARTICLE_BLOCK;
+    } else if (model == 2) {
+        START_PER_PARTICLE_BLOCK(part0, part);
+            Drift_single_particle_exact(part, length);
+        END_PER_PARTICLE_BLOCK;
+    }
 }
 
 #endif

{xtrack-0.89.3 → xtrack-0.90.0}/xtrack/beam_elements/elements_src/track_magnet.h

@@ -498,11 +498,11 @@ void track_magnet_particles(
             }
         }
 
-        double k0_drift, k1_drift, h_drift, ks_drift;
-        double k0_kick, k1_kick, h_kick;
-        double k0_h_correction, k1_h_correction;
-        int8_t kick_rot_frame;
-        int8_t drift_model;
+        double k0_drift=0, k1_drift=0, h_drift=0, ks_drift=0;
+        double k0_kick=0, k1_kick=0, h_kick=0;
+        double k0_h_correction=0, k1_h_correction=0;
+        int8_t kick_rot_frame=0;
+        int8_t drift_model=0;
         configure_tracking_model(
             model,
             k0,

{xtrack-0.89.3 → xtrack-0.90.0}/xtrack/beam_elements/elements_src/track_magnet.template.h

@@ -417,11 +417,11 @@ void track_magnet_particles(
             }
         }
 
-        double k0_drift, k1_drift, h_drift, ks_drift;
-        double k0_kick, k1_kick, h_kick;
-        double k0_h_correction, k1_h_correction;
-        int8_t kick_rot_frame;
-        int8_t drift_model;
+        double k0_drift=0, k1_drift=0, h_drift=0, ks_drift=0;
+        double k0_kick=0, k1_kick=0, h_kick=0;
+        double k0_h_correction=0, k1_h_correction=0;
+        int8_t kick_rot_frame=0;
+        int8_t drift_model=0;
         configure_tracking_model(
             model,
             k0,