xtrack 0.74.2__tar.gz → 0.75.1__tar.gz

{xtrack-0.74.2 → xtrack-0.75.1}/PKG-INFO

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

{xtrack-0.74.2 → xtrack-0.75.1}/ducktrack/elements.py

@@ -634,6 +634,7 @@ class LinearTransferMatrix(Element):
         ("Q_y","","",0.0),
         ("beta_s","","",0.0),
         ("Q_s","","",0.0),
+        ("bucket_length","","",0.0),
         ("chroma_x","","",0.0),
         ("chroma_y","","",0.0),
         ("det_xx","","",0.0),
@@ -721,10 +722,16 @@ class LinearTransferMatrix(Element):
         p.x,p.px = M00_x*p.x + M01_x*p.px, M10_x*p.x + M11_x*p.px
         p.y,p.py = M00_y*p.y + M01_y*p.py, M10_y*p.y + M11_y*p.py
 
+        shift = 0.0
+        if self.bucket_length > 0:
+            bucket_length_zeta = self.bucket_length*p.beta0*clight
+            shift = bucket_length_zeta*np.floor(p.zeta/bucket_length_zeta+0.5);
+            p.zeta -= shift
+            
         pzeta_new = sin_s*p.zeta/self.beta_s+cos_s*p.pzeta
         zeta_new = cos_s*p.zeta-self.beta_s*sin_s*p.pzeta
 
-        p.zeta = zeta_new
+        p.zeta = zeta_new + shift
         p.pzeta = pzeta_new
 
         if self.energy_increment !=0:

xtrack-0.75.1/examples/relative_errors/000_basic_error_definition.py

@@ -0,0 +1,48 @@
+import xtrack as xt
+
+env = xt.Environment()
+env.vars.default_to_zero = True
+line = env.new_line(components=[
+    env.new('mq', 'Quadrupole', length=0.5, k1='kq'),
+    env.new('mqs', 'Quadrupole', length=0.5, k1s='kqs'),
+    env.new('mb', 'Bend', length=0.5, angle='ang', k0_from_h=True),
+])
+
+env.set_multipolar_errors({
+    'mq': {'rel_knl': [1e-6, 1e-5, 1e-4], 'rel_ksl': [-1e-6, -1e-5, -1e-4]},
+    'mqs': {'rel_knl': [2e-6, 2e-5, 2e-4], 'rel_ksl': [3e-6, 3e-5, 3e-4], 'refer': 'k1s'},
+    'mb': {'rel_knl': [2e-6, 3e-5, 4e-4], 'rel_ksl': [5e-6, 6e-5, 7e-4]},
+})
+
+# Errors respond when variables are changed
+env['kq'] = 0.1
+env['kqs'] = 0.2
+env['ang'] = 0.3
+
+# inspect
+env.ref['mq'].knl[1]._info()
+# is:
+# #  element_refs['mq'].knl[1]._get_value()
+#    element_refs['mq'].knl[1] = 5.000000000000001e-07
+
+# #  element_refs['mq'].knl[1]._expr
+#    element_refs['mq'].knl[1] = (0.0 + ((vars['err_mq_knl1'] *
+#                          element_refs['mq'].k1) * element_refs['mq'].length))
+
+# #  element_refs['mq'].knl[1]._expr._get_dependencies()
+#    element_refs['mq'] = Quadrupole(k1=0.1, k1s=0, ...
+#    vars['err_mq_knl1'] = 1e-05
+#    element_refs['mq'].k1 = 0.1
+#    element_refs['mq'].length = 0.5
+
+#  element_refs['mq'].knl[1] does not influence any target
+
+import xobjects as xo
+import numpy as np
+
+xo.assert_allclose(env.get('mq').knl[:3], 0.5 * 0.1 * np.array([1e-6, 1e-5, 1e-4]), rtol=1e-7, atol=0)
+xo.assert_allclose(env.get('mq').ksl[:3], 0.5 * 0.1 * np.array([-1e-6, -1e-5, -1e-4]), rtol=1e-7, atol=0)
+xo.assert_allclose(env.get('mqs').knl[:3], 0.5 * 0.2 * np.array([2e-6, 2e-5, 2e-4]), rtol=1e-7, atol=0)
+xo.assert_allclose(env.get('mqs').ksl[:3], 0.5 * 0.2 * np.array([3e-6, 3e-5, 3e-4]), rtol=1e-7, atol=0)
+xo.assert_allclose(env.get('mb').knl[:3], 0.3 * np.array([2e-6, 3e-5, 4e-4]), rtol=1e-7, atol=0)
+xo.assert_allclose(env.get('mb').ksl[:3], 0.3 * np.array([5e-6, 6e-5, 7e-4]), rtol=1e-7, atol=0)

xtrack-0.75.1/examples/relative_errors/001_random_errors_on_quad_family.py

@@ -0,0 +1,55 @@
+import xtrack as xt
+import numpy as np
+
+env = xt.load_madx_lattice('../../test_data/fcc_ee/fccee_z.seq')
+line = env.fccee_p_ring
+line.particle_ref = xt.Particles(p0c=45.6e9, mass0=xt.ELECTRON_MASS_EV)
+
+tt = line.get_table()
+
+# I want to add a random octupolar error to all quadrupoles whose name starts
+# with 'qf'
+
+# Table with all quads
+tt_quad = tt.rows[tt.element_type=='Quadrupole']
+tt_selected = tt_quad.rows['qf.*']
+# is:
+# Table: 752 rows, 11 cols
+# name                s element_type isthick isreplica ...
+# qfg2.1        468.213 Quadrupole      True     False
+# qfg2.2        520.504 Quadrupole      True     False
+# qfg2.3        572.795 Quadrupole      True     False
+# qfg2.4        625.085 Quadrupole      True     False
+# qfg2.5        677.376 Quadrupole      True     False
+# qfg2.6        729.667 Quadrupole      True     False
+# qfg2.7        781.957 Quadrupole      True     False
+# qfg2.8        834.248 Quadrupole      True     False
+# qfg2.9        886.539 Quadrupole      True     False
+# qfg2.10        938.83 Quadrupole      True     False
+# ...
+# qf2.351         88811 Quadrupole      True     False
+# qf2.352       88915.2 Quadrupole      True     False
+# qf2.353       89019.4 Quadrupole      True     False
+
+# Generate random octupolar errors
+k3l_rel_rms = 1e-3
+k3l_rel = k3l_rel_rms * (2*np.random.rand(len(tt_selected)))
+
+# Generate error dictionary
+errors = {}
+for ii, nn in enumerate(tt_selected.name):
+    errors[nn] = {'rel_knl': [0, 0, k3l_rel[ii]]}
+
+# Set errors in the line
+env.set_multipolar_errors(errors)
+
+# The number of multipolar kicks along the elements is set automatically
+# (one kick upstream by default for quadrupoles). In can be changed as follows
+env.set(tt_selected.name, num_multipole_kicks=4)
+
+# Inspect one element:
+env['qfg2.5'].knl
+# is : [0.00000000e+00, 0.00000000e+00, 4.02838126e-05, 0.00000000e+00,
+#       0.00000000e+00, 0.00000000e+00]
+env['qfg2.5'].num_multipole_kicks
+# is: 4

xtrack-0.75.1/examples/relative_errors/003_check_all_elems_kick.py

@@ -0,0 +1,58 @@
+import xtrack as xt
+import xobjects as xo
+import numpy as np
+
+env = xt.Environment()
+env.particle_ref = xt.Particles(p0c=45.6e9, mass0=xt.ELECTRON_MASS_EV)
+
+l1 = env.new_line(components=[
+    env.new('b1', 'Bend', length=0.1)])
+p0 = l1.build_particles(x=3e-3)
+p = p0.copy()
+l1.track(p)
+xo.assert_allclose(p.px, 0, rtol=0, atol=1e-15)
+env['b1'].knl[2] = 0.1
+p = p0.copy()
+l1.track(p)
+assert np.abs(p.px[0]) > 1e-7
+
+l2 = env.new_line(components=[
+    env.new('q1', 'Quadrupole', length=0.1)])
+p = p0.copy()
+l2.track(p)
+xo.assert_allclose(p.px, 0, rtol=0, atol=1e-15)
+env['q1'].knl[2] = 0.1
+p = p0.copy()
+l2.track(p)
+assert np.abs(p.px[0]) > 1e-7
+
+l3 = env.new_line(components=[
+    env.new('s1', 'Sextupole', length=0.1)])
+p = p0.copy()
+l3.track(p)
+xo.assert_allclose(p.px, 0, rtol=0, atol=1e-15)
+env['s1'].knl[2] = 0.1
+p = p0.copy()
+l3.track(p)
+assert np.abs(p.px[0]) > 1e-7
+
+l4 = env.new_line(components=[
+    env.new('o1', 'Octupole', length=0.1)])
+p = p0.copy()
+l4.track(p)
+xo.assert_allclose(p.px, 0, rtol=0, atol=1e-15)
+env['o1'].knl[2] = 0.1
+p = p0.copy()
+l4.track(p)
+assert np.abs(p.px[0]) > 1e-7
+
+l5 = env.new_line(components=[
+    env.new('rb1', 'RBend', length=0.1)])
+p0 = l5.build_particles(x=3e-3)
+p = p0.copy()
+l5.track(p)
+xo.assert_allclose(p.px, 0, rtol=0, atol=1e-15)
+env['rb1'].knl[2] = 0.1
+p = p0.copy()
+l5.track(p)
+assert np.abs(p.px[0]) > 1e-7

xtrack-0.75.1/examples/transfer_matrix/004_multiple_buckets.py

@@ -0,0 +1,117 @@
+# copyright ############################### #
+# This file is part of the Xtrack Package.  #
+# Copyright (c) CERN, 2021.                 #
+# ######################################### #
+
+import time
+
+import numpy as np
+from matplotlib import pyplot as plt
+from scipy import constants
+
+import xobjects as xo
+context = xo.ContextCpu(omp_num_threads=0)
+import xtrack as xt
+import xfields as xf
+import xpart as xp
+
+n_macroparticles = int(1e3)
+nemitt_x = 2E-6
+nemitt_y = 2E-6
+p0c = 7e12
+gamma = p0c/xp.PROTON_MASS_EV
+physemit_x = nemitt_x/gamma
+physemit_y = nemitt_y/gamma
+beta_x = 1.0
+beta_y = 1.0
+
+sigma_z = 0.08
+momentumCompaction = 3.483575072011584e-04
+eta = momentumCompaction - 1.0 / gamma ** 2
+circumference = 26658.883199999
+frev = constants.c/circumference
+f_RF = 400.8E6
+h = f_RF / frev
+betar = np.sqrt(1 - 1 / gamma ** 2)
+p0 = constants.m_p * betar * gamma * constants.c
+voltage = 16E6
+Qs = np.sqrt(constants.e * voltage * eta * h / (2 * np.pi * betar * constants.c * p0))
+beta_s = eta * circumference / (2 * np.pi * Qs);
+sigma_delta = sigma_z / beta_s
+Qx = 0.31
+Qy = 0.32
+bucket_length = 2.5E-9
+
+linear_fixed_rf = True
+
+particles = xp.Particles(_context=context,
+    p0c=p0c,
+    x=np.zeros(n_macroparticles),
+    px=np.zeros(n_macroparticles),
+    y=np.zeros(n_macroparticles),
+    py=np.zeros(n_macroparticles),
+    zeta=bucket_length*constants.c*betar*np.linspace(-5,5,n_macroparticles),
+    delta=np.zeros(n_macroparticles),
+)
+
+if linear_fixed_rf:
+    arc = xt.LineSegmentMap(
+            betx=beta_x,qx=Qx,
+            bety=beta_y,qy=Qy,
+            longitudinal_mode='linear_fixed_rf',
+            voltage_rf = voltage*10,
+            frequency_rf = f_RF/10,
+            lag_rf = 180.0,
+            slippage_length = circumference,
+            momentum_compaction_factor = momentumCompaction)
+else:
+    arc = xt.LineSegmentMap(
+            betx=beta_x,qx=Qx,
+            bety=beta_y,qy=Qy,
+            bets=-beta_s,qs=Qs)
+
+line = xt.Line(elements=[arc])
+line.build_tracker()
+line.track(particles,num_turns=int(1/Qs),turn_by_turn_monitor=True)
+mon = line.record_last_track
+
+plt.figure()
+plt.plot(mon.zeta/(bucket_length*constants.c*betar),mon.delta/sigma_delta,'.r')
+
+particles = xp.Particles(_context=context,
+    p0c=p0c,
+    x=np.zeros(n_macroparticles),
+    px=np.zeros(n_macroparticles),
+    y=np.zeros(n_macroparticles),
+    py=np.zeros(n_macroparticles),
+    zeta=bucket_length*constants.c*betar*np.linspace(-5,5,n_macroparticles),
+    delta=np.zeros(n_macroparticles),
+)
+
+if linear_fixed_rf:
+    arc = xt.LineSegmentMap(
+            betx=beta_x,qx=Qx,
+            bety=beta_y,qy=Qy,
+            longitudinal_mode='linear_fixed_rf',
+            voltage_rf = voltage,
+            frequency_rf = f_RF,
+            lag_rf = 180.0,
+            slippage_length = circumference,
+            momentum_compaction_factor = momentumCompaction)
+else:
+    arc = xt.LineSegmentMap(
+            betx=beta_x,qx=Qx,
+            bety=beta_y,qy=Qy,
+            bets=-beta_s,qs=Qs,bucket_length=bucket_length)
+
+line2 = xt.Line(elements=[arc])
+line2.build_tracker()
+line2.track(particles,num_turns=int(1/Qs),turn_by_turn_monitor=True)
+mon = line2.record_last_track
+
+plt.plot(mon.zeta/(bucket_length*constants.c*betar),mon.delta/sigma_delta,'.b')
+plt.xlabel(r'$z$ [bucket_lenght$\cdot c\beta_r$]')
+plt.ylabel('$\delta$ [$\sigma_{\delta}$]')
+plt.show()
+
+

{xtrack-0.74.2 → xtrack-0.75.1}/tests/test_elements.py

@@ -6,7 +6,8 @@
 import numpy as np
 import pytest
 from cpymad.madx import Madx
-
+from scipy.stats import linregress
+from scipy import constants as cst
 import ducktrack as dtk
 import xobjects as xo
 import xpart as xp
@@ -650,6 +651,104 @@ def test_simplified_accelerator_segment(test_context):
     xo.assert_allclose(test_context.nparray_from_context_array(particles.delta)[0],
                       dtk_particle.delta, rtol=1e-14, atol=1e-14)
 
+@for_all_test_contexts
+def test_simplified_accelerator_segment_bucket(test_context):
+    dtk_particle = dtk.TestParticles(
+            p0c=25.92e9,
+            x=2e-3,
+            px=4e-5,
+            y=4e-3,
+            py=-8e-5,
+            zeta=2.,
+            delta=2E-3)
+
+    particles = xp.Particles.from_dict(dtk_particle.to_dict(),
+                                       _context=test_context)
+    Q_x = 0.12
+    Q_y = 0.75
+    beta_s = 214.3
+    Q_s = 0.0042
+    bucket_length = 1E-9
+
+    arc = xt.LineSegmentMap(_context=test_context,
+        qx=Q_x, betx = 1.0, qy=Q_y, bety = 1.0,
+        bets=beta_s, qs=Q_s,bucket_length=bucket_length)
+
+    arc.track(particles)
+
+    dtk_arc = dtk.elements.LinearTransferMatrix(
+        Q_x=Q_x, Q_y=Q_y, beta_x_0 = 1.0, beta_x_1 = 1.0,
+        beta_y_0 = 1.0, beta_y_1 = 1.0,
+        beta_s=beta_s, Q_s=Q_s,bucket_length=bucket_length)
+
+    dtk_arc.track(dtk_particle)
+
+    assert np.isclose(test_context.nparray_from_context_array(particles.x)[0],
+                      dtk_particle.x, rtol=1e-14, atol=1e-14)
+    assert np.isclose(test_context.nparray_from_context_array(particles.px)[0],
+                      dtk_particle.px, rtol=1e-14, atol=1e-14)
+    assert np.isclose(test_context.nparray_from_context_array(particles.y)[0],
+                      dtk_particle.y, rtol=1e-14, atol=1e-14)
+    assert np.isclose(test_context.nparray_from_context_array(particles.py)[0],
+                      dtk_particle.py, rtol=1e-14, atol=1e-14)
+    assert np.isclose(test_context.nparray_from_context_array(particles.zeta)[0],
+                      dtk_particle.zeta, rtol=1e-14, atol=1e-14)
+    assert np.isclose(test_context.nparray_from_context_array(particles.delta)[0],
+                      dtk_particle.delta, rtol=1e-14, atol=1e-14)
+
+@for_all_test_contexts
+def test_simplified_accelerator_segment_bucket_fixed_rf(test_context):
+    dtk_particle = dtk.TestParticles(
+            p0c=25.92e9,
+            x=2e-3,
+            px=4e-5,
+            y=4e-3,
+            py=-8e-5,
+            zeta=8.,
+            delta=2E-3)
+
+    particles = xp.Particles.from_dict(dtk_particle.to_dict()).copy(_context=test_context)
+    Q_x = 0.12
+    Q_y = 0.75
+    voltage = 10E6
+    f_RF = 100E6
+    circumference = 2E3
+    momentum_compaction = 1E-2
+
+    arc = xt.LineSegmentMap(_context=test_context,
+        qx=Q_x, betx = 1.0, qy=Q_y, bety = 1.0,
+        voltage_rf = voltage,
+        longitudinal_mode = 'linear_fixed_rf',
+        frequency_rf = f_RF,
+        lag_rf = 180.0,
+        slippage_length = circumference,
+        momentum_compaction_factor = momentum_compaction)
+
+    arc.track(particles)
+
+    particles.move(_context=xo.ContextCpu())
+    eta = (momentum_compaction - 1.0 / particles.gamma0 ** 2)
+    h = f_RF * circumference / (particles.beta0*cst.c)
+    p0 = particles.mass0 * cst.e * particles.beta0  * particles.gamma0 / cst.c
+    Q_s = np.sqrt(cst.e * voltage * eta * h / (2 * np.pi * particles.beta0 * cst.c * p0))
+    beta_s = eta * circumference / (2 * np.pi * Q_s)
+    Qx = 0.31
+    Qy = 0.32
+
+    dtk_arc = dtk.elements.LinearTransferMatrix(
+        Q_x=Q_x, Q_y=Q_y, beta_x_0 = 1.0, beta_x_1 = 1.0,
+        beta_y_0 = 1.0, beta_y_1 = 1.0,
+        beta_s=beta_s, Q_s=Q_s,bucket_length=1.0/f_RF)
+
+    dtk_arc.track(dtk_particle)
+
+    assert np.isclose(particles.x[0], dtk_particle.x, rtol=1e-14, atol=1e-14)
+    assert np.isclose(particles.px[0], dtk_particle.px, rtol=1e-14, atol=1e-14)
+    assert np.isclose(particles.y[0], dtk_particle.y, rtol=1e-14, atol=1e-14)
+    assert np.isclose(particles.py[0], dtk_particle.py, rtol=1e-14, atol=1e-14)
+    assert np.isclose(particles.zeta[0], dtk_particle.zeta, rtol=1e-14, atol=1e-14)
+    assert np.isclose(particles.delta[0], dtk_particle.delta, rtol=1e-14, atol=1e-14)
+
 
 @for_all_test_contexts
 def test_simplified_accelerator_segment_chroma_detuning(test_context):

{xtrack-0.74.2 → xtrack-0.75.1}/tests/test_elements_thick.py

@@ -1989,3 +1989,59 @@ def test_multipole_fringe(test_context, element, kn_param_name):
     xo.assert_allclose(fringe_effect_madng[3], fringe_effect_xtrack[3], atol=1e-16, rtol=1.01e-2)  # py
     xo.assert_allclose(fringe_effect_madng[4], fringe_effect_xtrack[4], atol=1.01e-15, rtol=1.01e-2)  # t
     xo.assert_allclose(fringe_effect_madng[5], fringe_effect_xtrack[5], atol=0, rtol=0)  # pt
+
+def test_knl_knl_kick_present_with_default_num_kicks():
+    env = xt.Environment()
+    env.particle_ref = xt.Particles(p0c=45.6e9, mass0=xt.ELECTRON_MASS_EV)
+
+    l1 = env.new_line(components=[
+        env.new('b1', 'Bend', length=0.1)])
+    p0 = l1.build_particles(x=3e-3)
+    p = p0.copy()
+    l1.track(p)
+    xo.assert_allclose(p.px, 0, rtol=0, atol=1e-15)
+    env['b1'].knl[2] = 0.1
+    p = p0.copy()
+    l1.track(p)
+    assert np.abs(p.px[0]) > 1e-7
+
+    l2 = env.new_line(components=[
+        env.new('q1', 'Quadrupole', length=0.1)])
+    p = p0.copy()
+    l2.track(p)
+    xo.assert_allclose(p.px, 0, rtol=0, atol=1e-15)
+    env['q1'].knl[2] = 0.1
+    p = p0.copy()
+    l2.track(p)
+    assert np.abs(p.px[0]) > 1e-7
+
+    l3 = env.new_line(components=[
+        env.new('s1', 'Sextupole', length=0.1)])
+    p = p0.copy()
+    l3.track(p)
+    xo.assert_allclose(p.px, 0, rtol=0, atol=1e-15)
+    env['s1'].knl[2] = 0.1
+    p = p0.copy()
+    l3.track(p)
+    assert np.abs(p.px[0]) > 1e-7
+
+    l4 = env.new_line(components=[
+        env.new('o1', 'Octupole', length=0.1)])
+    p = p0.copy()
+    l4.track(p)
+    xo.assert_allclose(p.px, 0, rtol=0, atol=1e-15)
+    env['o1'].knl[2] = 0.1
+    p = p0.copy()
+    l4.track(p)
+    assert np.abs(p.px[0]) > 1e-7
+
+    l5 = env.new_line(components=[
+        env.new('rb1', 'RBend', length=0.1)])
+    p0 = l5.build_particles(x=3e-3)
+    p = p0.copy()
+    l5.track(p)
+    xo.assert_allclose(p.px, 0, rtol=0, atol=1e-15)
+    env['rb1'].knl[2] = 0.1
+    p = p0.copy()
+    l5.track(p)
+    assert np.abs(p.px[0]) > 1e-7

{xtrack-0.74.2 → xtrack-0.75.1}/tests/test_environment.py

@@ -164,6 +164,25 @@ def test_vars_and_element_access_modes(container_type):
 
     assert env.elements is env.element_dict
 
+    # Check set with multiple targets
+    env['x0'] = 0
+    env.set(['x1', 'x2', 'x3'], '3*x0')
+    env['x0'] = 3.
+    ttv = env.vars.get_table()
+    for nn in ['x1', 'x2', 'x3']:
+        assert ttv['value', nn] == 3 * 3
+        assert ttv['expr', nn] == '(3.0 * x0)'
+
+    env.new('qx1', xt.Quadrupole, length=1)
+    env.new('qx2', xt.Quadrupole, length=1)
+    env.new('qx3', xt.Quadrupole, length=1)
+
+    env.set(['qx1', 'qx2', 'qx3'], k1='3*x0')
+    for nn in ['qx1', 'qx2', 'qx3']:
+        assert env[nn].k1 == 3 * 3
+        assert str(env.ref[nn].k1._expr) == "(3.0 * vars['x0'])"
+
+
 def test_element_placing_at_s():
 
     env = xt.Environment()
@@ -1952,14 +1971,14 @@ def test_call(tmpdir):
     elements = _trim("""
     env.new('sbend', 'Bend')
     env.new('drift', 'Drift')
-    
+
     env.new('mb2', 'sbend', length=2)
     env.new('drx', 'drift', length='var1 + var2')
     """)
 
     lattice = _trim("""
     env.particle_ref = xt.Particles(mass0=xt.ELECTRON_MASS_EV, energy0=45.6e9)
-    
+
     env.new_line(
         name='seq',
         components=['mb2', 'drx', 'mb2', 'drx'],
@@ -2675,6 +2694,20 @@ def test_remove_element_from_line():
         [ 4.5, 10. , 15. , 20. , 25. , 30. , 35.5, 41. , 46. , 50. , 50. ]),
         rtol=0., atol=1e-14)
 
+    line6 = line0.copy()
+    tt_remove = line6.get_table().rows['q.*']
+    line6.remove(tt_remove.name)
+    tt6 = line3.get_table()
+    tt6.show(cols=['name', 's_start', 's_end', 's_center'])
+
+    assert np.all(tt6.name == np.array(
+        ['drift_1', 'drift_6', 'drift_2', 'drift_7', 'drift_3', 'drift_8',
+        'drift_4', 'mk1', 'mk2', 'mk3', 'drift_9', 'drift_5', 'end',
+        '_end_point']))
+    xo.assert_allclose(tt6.s_center, np.array(
+        [ 4.5, 10. , 15. , 20. , 25. , 30. , 35.5, 40. , 40. , 40. , 41. ,
+        46. , 50. , 50. ]), rtol=0., atol=1e-14)
+
 def test_replace_element():
 
     env = xt.Environment()
@@ -2890,3 +2923,33 @@ def test_nested_lists():
     tt.show(cols=['name', 's_start', 's_end', 's_center'])
     assert np.all(tt.name == np.array(
         ['q1::0', 'q1::1', 'q2', '_end_point']))
+
+
+def test_relative_error_definition():
+
+    env = xt.Environment()
+    env.vars.default_to_zero = True
+    line = env.new_line(components=[
+        env.new('mq', 'Quadrupole', length=0.5, k1='kq'),
+        env.new('mqs', 'Quadrupole', length=0.5, k1s='kqs'),
+        env.new('mb', 'Bend', length=0.5, angle='ang', k0_from_h=True),
+    ])
+
+    env.set_multipolar_errors({
+        'mq': {'rel_knl': [1e-6, 1e-5, 1e-4], 'rel_ksl': [-1e-6, -1e-5, -1e-4]},
+        'mqs': {'rel_knl': [2e-6, 2e-5, 2e-4], 'rel_ksl': [3e-6, 3e-5, 3e-4], 'refer': 'k1s'},
+        'mb': {'rel_knl': [2e-6, 3e-5, 4e-4], 'rel_ksl': [5e-6, 6e-5, 7e-4]},
+    })
+
+    # Errors respond when variables are changed
+    env['kq'] = 0.1
+    env['kqs'] = 0.2
+    env['ang'] = 0.3
+
+
+    xo.assert_allclose(env.get('mq').knl[:3], 0.5 * 0.1 * np.array([1e-6, 1e-5, 1e-4]), rtol=1e-7, atol=0)
+    xo.assert_allclose(env.get('mq').ksl[:3], 0.5 * 0.1 * np.array([-1e-6, -1e-5, -1e-4]), rtol=1e-7, atol=0)
+    xo.assert_allclose(env.get('mqs').knl[:3], 0.5 * 0.2 * np.array([2e-6, 2e-5, 2e-4]), rtol=1e-7, atol=0)
+    xo.assert_allclose(env.get('mqs').ksl[:3], 0.5 * 0.2 * np.array([3e-6, 3e-5, 3e-4]), rtol=1e-7, atol=0)
+    xo.assert_allclose(env.get('mb').knl[:3], 0.3 * np.array([2e-6, 3e-5, 4e-4]), rtol=1e-7, atol=0)
+    xo.assert_allclose(env.get('mb').ksl[:3], 0.3 * np.array([5e-6, 6e-5, 7e-4]), rtol=1e-7, atol=0)

{xtrack-0.74.2 → xtrack-0.75.1}/tests/test_lhc_env.py

@@ -40,9 +40,10 @@ def test_lhc_environment():
                                     deferred_expressions=True,
                                     replace_in_expr={'bv_aux':'bvaux_b2'})
     line4.particle_ref = xp.Particles(mass0=xp.PROTON_MASS_EV, p0c=7000e9)
+    line4.twiss_default['reverse'] = True
 
     env = xt.Environment(lines={'lhcb1': line1, 'lhcb2': line4})
-    env.lhcb2.twiss_default['reverse'] = True
+    assert env.lhcb2.twiss_default['reverse'] == True
 
     env.to_json('lhc.json')
 

{xtrack-0.74.2 → xtrack-0.75.1}/tests/test_line.py

@@ -1295,3 +1295,5 @@ def test_extend_knl_ksl():
                        0., 0., 0., 0., 0., 0., 0., 0.], rtol=0, atol=1e-15)
     xo.assert_allclose(line['o1'].ksl, [4., 5., 200., 0.,
                        0., 0., 0., 0., 0., 0., 0., 0.], rtol=0, atol=1e-15)
+
+