xtrack 0.73.1__tar.gz → 0.73.2__tar.gz

{xtrack-0.73.1 → xtrack-0.73.2}/PKG-INFO

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

{xtrack-0.73.1 → xtrack-0.73.2}/examples/lattice_design/000_environemnt.py

@@ -84,7 +84,7 @@ env.vars({
 
 halfcell_ss = env.new_line(components=[
 
-    env.new('mid', xt.Marker, at='l.halfcell'),
+    env.new('mid.ss', xt.Marker, at='l.halfcell'),
 
     env.new('mq.ss.d', 'mq', k1='kqd.ss', at = '0.5 + l.mq / 2'),
     env.new('mq.ss.f', 'mq', k1='kqf.ss', at = 'l.halfcell - l.mq / 2 - 0.5'),

{xtrack-0.73.1 → xtrack-0.73.2}/examples/lattice_design/000a_subline.py

@@ -85,7 +85,7 @@ env.vars({
 
 halfcell_ss = env.new_line(components=[
 
-    env.new('mid', xt.Marker, at='l.halfcell'),
+    env.new('mid.ss', xt.Marker, at='l.halfcell'),
 
     env.new('mq.ss.d', 'mq', k1='kqd.ss', at = '0.5 + l.mq / 2'),
     env.new('mq.ss.f', 'mq', k1='kqf.ss', at = 'l.halfcell - l.mq / 2 - 0.5'),

{xtrack-0.73.1 → xtrack-0.73.2}/examples/lattice_design/000b_builder.py

@@ -86,7 +86,7 @@ env.vars({
 
 halfcell_ss = env.new_builder()
 
-halfcell_ss.new('mid', xt.Marker, at='l.halfcell')
+halfcell_ss.new('mid.ss', xt.Marker, at='l.halfcell')
 
 halfcell_ss.new('mq.ss.d', 'mq', k1='kqd.ss', at = '0.5 + l.mq / 2'),
 halfcell_ss.new('mq.ss.f', 'mq', k1='kqf.ss', at = 'l.halfcell - l.mq / 2 - 0.5')

{xtrack-0.73.1 → xtrack-0.73.2}/examples/lattice_design/000c_repeated_elements.py

@@ -77,7 +77,7 @@ env.vars({
 
 halfcell_ss = env.new_line(components=[
 
-    env.new('mid', xt.Marker, at='l.halfcell'),
+    env.new('mid.ss', xt.Marker, at='l.halfcell'),
 
     env.new('mq.ss.d', 'mq', k1='kqd.ss', at = '0.5 + l.mq / 2'),
     env.new('mq.ss.f', 'mq', k1='kqf.ss', at = 'l.halfcell - l.mq / 2 - 0.5'),

{xtrack-0.73.1 → xtrack-0.73.2}/examples/lattice_design/000d_env_to_json.py

@@ -85,7 +85,7 @@ env.vars({
 
 halfcell_ss = env.new_line(components=[
 
-    env.new('mid', xt.Marker, at='l.halfcell'),
+    env.new('mid.ss', xt.Marker, at='l.halfcell'),
 
     env.new('mq.ss.d', 'mq', k1='kqd.ss', at = '0.5 + l.mq / 2'),
     env.new('mq.ss.f', 'mq', k1='kqf.ss', at = 'l.halfcell - l.mq / 2 - 0.5'),
@@ -259,17 +259,17 @@ opt.solve()
 # Check matched betx=2*bety in env2 but not in env
 xo.assert_allclose(env2['ring'].twiss4d()['betx', 'ip.l'],
                    2*env2['ring'].twiss4d()['bety', 'ip.l'],
-                   rtol=1e-4, atol=0)
+                   rtol=2e-4, atol=0)
 xo.assert_allclose(env2['ring_sliced'].twiss4d()['betx', 'ip.l'],
                    2*env2['ring_sliced'].twiss4d()['bety', 'ip.l'],
-                   rtol=1e-4, atol=0)
+                   rtol=2e-4, atol=0)
 
 xo.assert_allclose(env['ring'].twiss4d()['betx', 'ip.l'],
                    env['ring'].twiss4d()['bety', 'ip.l'],
-                   rtol=1e-4, atol=0)
+                   rtol=2e-4, atol=0)
 xo.assert_allclose(env['ring_sliced'].twiss4d()['betx', 'ip.l'],
                    env['ring_sliced'].twiss4d()['bety', 'ip.l'],
-                   rtol=1e-4, atol=0)
+                   rtol=2e-4, atol=0)
 
 import matplotlib.pyplot as plt
 plt.close('all')

{xtrack-0.73.1 → xtrack-0.73.2}/examples/lattice_design/003_view.py

@@ -8,8 +8,10 @@ line = xt.Line()
 
 if container_type == 'env':
     ee = env
+    eenv = env
 elif container_type == 'line':
     ee = line
+    eenv = line.env
 
 ee['a']  = 3.
 ee['b1']  = 3 * ee['a'] # done by value
@@ -36,7 +38,7 @@ assert ee.get('b1') == 9
 assert ee.get('b2') == 9
 assert ee.get('c') == 12
 
-ee.new('mb', 'Bend', extra={'description': 'Hello Riccarco'},
+eenv.new('mb', 'Bend', extra={'description': 'Hello Riccarco'},
         k1='3*a', h=4*ee.ref['a'], knl=[0, '5*a', 6*ee.ref['a']])
 assert isinstance(ee['mb'].k1, float)
 assert isinstance(ee['mb'].h, float)

xtrack-0.73.2/examples/mad_loader/003_load_thick_with_errors.py

@@ -0,0 +1,50 @@
+from cpymad.madx import Madx
+import xtrack as xt
+
+mad = Madx()
+
+mad.input('''
+
+    k1=0.2;
+    l = 5.;
+
+    radius = 0.3;
+
+    dknr0=0.02;
+    dknr1=-0.04;
+    dknr2=0.06;
+    dkns3=0.2;
+
+    dksr0=0.03;
+    dksr1=-0.05;
+    dksr2=0.07;
+    dksr3=0.3;
+
+    elm: quadrupole, k1:=k1, l=5.;
+
+    seq: sequence, l=50;
+    elm1:elm, at=5;
+    elm2:elm, at=10;
+    elm3:elm, at=20;
+    endsequence;
+
+    beam;
+    use,sequence=seq;
+
+    select,pattern=elm,flag=error;
+    efcomp, radius=radius,
+        dknr={dknr0,dknr1,dknr2,dknr3},
+        dksr={dksr0,dksr1,dksr2,dksr3}
+        ;
+
+''')
+
+line = xt.Line.from_madx_sequence(mad.sequence.seq,
+                                  enable_field_errors=True,
+                                  allow_thick=True)
+
+# Remember to set num_multipole_kicks
+
+
+
+

{xtrack-0.73.1 → xtrack-0.73.2}/examples/new_madloader/003_write_lhc.py

@@ -5,7 +5,7 @@ from xtrack.mad_parser.env_writer import EnvWriterProxy
 env_proxy = EnvWriterProxy()
 loader = MadxLoader(reverse_lines=['lhcb2'], env=env_proxy)
 loader.load_file("lhc.seq")
-loader.load_file("optics.madx")
+# loader.load_file("optics.madx")
 env = loader.env.env
 line = env.lines['lhcb1']
 line.particle_ref = xt.Particles(mass0=xt.PROTON_MASS_EV, p0c=7000e9)

xtrack-0.73.2/examples/twiss/032_twiss_with_collective.py

@@ -0,0 +1,74 @@
+import xtrack as xt
+import xobjects as xo
+
+env = xt.Environment()
+env.particle_ref = xt.Particles(p0c=7e12)
+
+class MyKicker:
+    def __init__(self, kickx=0, kicky=0):
+        self.kickx = kickx
+        self.kicky = kicky
+
+    def track(self, p):
+        p.px += self.kickx
+        p.py += self.kicky
+
+kick1 = MyKicker(kickx=1e-3)
+kick2 = MyKicker(kickx=-2e-3)
+kick3 = MyKicker(kickx=1e-3)
+
+line = env.new_line(components=[
+    env.place('k1', kick1, at=0),
+    env.place('k2', kick2, at=2),
+    env.place('k3', kick3, at=4),
+    ])
+
+tw = line.twiss(betx=1, bety=1, include_collective=True)
+xo.assert_allclose(tw['x', 'k2'], 2e-3, atol=1e-8, rtol=0)
+
+tw_nocoll = line.twiss(betx=1, bety=1)
+xo.assert_allclose(tw_nocoll['x', 'k2'], 0, atol=1e-8, rtol=0)
+
+
+class MyQuad:
+    def __init__(self, k1l=0):
+        self.k1l = k1l
+
+    def track(self, p):
+        p.px += -self.k1l * p.x
+        p.py += self.k1l * p.y
+
+kq = 0.1
+qf = MyQuad(k1l=0.1)
+qd = MyQuad(k1l=-0.1)
+
+lfodo = env.new_line(components=[
+    env.place('qf', qf, at=0),
+    env.place('qd', qd, at=10),
+    env.new('end', 'Marker', at=20),
+])
+
+twfodo = lfodo.twiss4d(include_collective=True)
+
+lfodo_ref = env.new_line(components=[
+    env.new('mqf', 'Multipole', knl=[0, kq], at=0),
+    env.new('mqd', 'Multipole', knl=[0, -kq], at=10),
+    env.new('mend', 'Marker', at=20),
+])
+
+twfodo_ref = lfodo_ref.twiss4d(include_collective=True)
+
+xo.assert_allclose(twfodo.qx, twfodo_ref.qx, atol=1e-8, rtol=0)
+xo.assert_allclose(twfodo.qy, twfodo_ref.qy, atol=1e-8, rtol=0)
+xo.assert_allclose(twfodo.dqx, twfodo_ref.dqx, atol=1e-8, rtol=0)
+xo.assert_allclose(twfodo.dqy, twfodo_ref.dqy, atol=1e-8, rtol=0)
+
+twfodo_open = lfodo.twiss4d(include_collective=True, betx=1, bety=1,
+                            compute_chromatic_properties=True)
+twfodo_open_ref = lfodo_ref.twiss4d(include_collective=True, betx=1, bety=1,
+                                    compute_chromatic_properties=True)
+
+xo.assert_allclose(twfodo_open.betx, twfodo_open_ref.betx, atol=0, rtol=1e-8)
+xo.assert_allclose(twfodo_open.bety, twfodo_open_ref.bety, atol=0, rtol=1e-8)
+xo.assert_allclose(twfodo_open.ax_chrom, twfodo_open_ref.ax_chrom, atol=0, rtol=1e-8)
+xo.assert_allclose(twfodo_open.ay_chrom, twfodo_open_ref.ay_chrom, atol=0, rtol=1e-8)

{xtrack-0.73.1 → xtrack-0.73.2}/tests/test_environment.py

@@ -183,13 +183,11 @@ def test_element_placing_at_s():
         env.new('b1', xt.Bend, length='l.b1'),
         env.new('q1', xt.Quadrupole, length='l.q1'),
         env.new('ip', xt.Marker, at='s.ip'),
-        (
-            env.new('before_before_right', xt.Marker),
-            env.new('before_right', xt.Sextupole, length=1),
-            env.new('right',xt.Quadrupole, length=0.8, at='s.right', from_='ip'),
-            env.new('after_right', xt.Marker),
-            env.new('after_right2', xt.Marker),
-        ),
+        env.new('before_before_right', xt.Marker, at='before_right@start'),
+        env.new('before_right', xt.Sextupole, length=1, anchor='end', at='right@start'),
+        env.new('right',xt.Quadrupole, length=0.8, at='s.right', from_='ip'),
+        env.new('after_right', xt.Marker),
+        env.new('after_right2', xt.Marker),
         env.new('left', xt.Quadrupole, length=1, at='s.left', from_='ip'),
         env.new('after_left', xt.Marker),
         env.new('after_left2', xt.Bend, length='l.after_left2'),
@@ -1594,6 +1592,12 @@ def test_env_new():
     assert isinstance(env['e1.ll4'], xt.Bend)
     assert isinstance(env['e2.ll4'], xt.Bend)
 
+    ret = env.new('aper', xt.LimitEllipse, a='2*a', b='a')
+    assert ret == 'aper'
+    assert env[ret].a == 6
+    assert env[ret].b == 3
+
+
 def test_builder_new():
 
     env = xt.Environment()
@@ -1687,6 +1691,7 @@ def test_builder_new():
     assert len(bdr.components) == 11
     assert bdr.components[-1] is ret
 
+
 def test_neg_line():
 
     line = xt.Line(elements=[xt.Bend(k0=0.5), xt.Quadrupole(k1=0.1)])
@@ -1716,11 +1721,9 @@ def test_repeated_elements():
         env.new('ip1', 'Marker', at=10),
         'mb',
         pp,
-        (
-            'mb',
-            env.new('ip2', 'Marker', at=20),
-            'mb',
-        ),
+        env.place('mb', anchor='end', at='ip2@start'),
+        env.new('ip2', 'Marker', at=20),
+        'mb',
         pp
     ])
 
@@ -2016,6 +2019,23 @@ def test_import_line_from_other_env(overwrite_vars, x_value):
     assert isinstance(env2['ip'], xt.Marker)
     assert env2['d'].length == 3 * 7
 
+
+def test_copy_element_from_other_env():
+    env1 = xt.Environment()
+    env1['var'] = 3
+    env1['var2'] = '2 * var'
+    env1.new('quad', xt.Quadrupole, length='var', knl=[0, 'var2'])
+
+    env2 = xt.Environment()
+    env2['var'] = 4
+    env2['var2'] = '2 * var'
+    env2.copy_element_from('quad', env1, 'quad/env2')
+
+    assert env2['quad/env2'].length == 4
+    assert env2['quad/env2'].knl[0] == 0
+    assert env2['quad/env2'].knl[1] == 8
+
+
 def test_insert_repeated_elements():
 
     env = xt.Environment()
@@ -2844,4 +2864,18 @@ def test_append_to_line():
     xo.assert_allclose(tt.s_center, np.array(
         [ 2.5,  5.5,  7.5, 10. , 15. , 20. , 25. , 30. , 35.5, 40. , 40. ,
         40. , 41. , 42.5, 46.5, 50. , 51. , 53. , 55. , 57. , 58. ]),
-        rtol=0., atol=1e-14)
+        rtol=0., atol=1e-14)
+
+def test_nested_lists():
+
+    env = xt.Environment()
+
+    env.new('q1', 'Quadrupole', length=2.0)
+    env.new('q2', 'Quadrupole', length=2.0)
+
+    line = env.new_line(components=[2*['q1'], 'q2'])
+
+    tt = line.get_table()
+    tt.show(cols=['name', 's_start', 's_end', 's_center'])
+    assert np.all(tt.name == np.array(
+        ['q1::0', 'q1::1', 'q2', '_end_point']))

{xtrack-0.73.1 → xtrack-0.73.2}/tests/test_line.py

@@ -388,7 +388,7 @@ def test_check_aperture():
                        'dr4', 'th2', 'th2_ap_back',
                        'dr5', 'th3_ap_front', 'th3', 'dr6',
                        'th4_ap_entry', 'th4', 'th4_ap_exit'])
-    
+
     df = line.check_aperture()
 
     expected_miss_upstream = [nn in ('m2', 'th2') for nn in df['name'].values]
@@ -421,7 +421,6 @@ def test_to_dict():
 
     assert result['metadata'] == line.metadata
 
-
 def test_from_dict_legacy():
     test_dict = {
         'elements': [
@@ -442,6 +441,36 @@ def test_from_dict_legacy():
 
     assert result.element_names == ['mn1', 'd1']
 
+@pytest.mark.parametrize('under_test', ['copy', 'from_to_dict'])
+def test_copy_to_dict_from_dict_config(under_test):
+
+    # Step 1: Create a line object
+    line = xt.Line()
+
+    # Step 2: Build the tracker
+    line.build_tracker()
+    line.metadata['hello'] = 'world'
+
+    # Step 3: Configure radiation model
+    line.configure_radiation(model='mean')
+
+    # Step 5: Serialize and deserialize the line
+    if under_test == 'copy':
+        l2 = line.copy()
+    elif under_test == 'from_to_dict':
+        line_dict = line.to_dict()
+        l2 = xt.Line.from_dict(line_dict)
+    else:
+        raise ValueError(f'Unknown test {under_test}')
+
+    assert np.all(
+        np.sort(list(line.config.keys())) == np.sort(list(l2.config.keys())))
+
+    for key in line.config.keys():
+        assert line.config[key] == l2.config[key]
+
+    assert line.metadata['hello'] == l2.metadata['hello']
+
 
 def test_from_dict_current():
     test_dict = {

{xtrack-0.73.1 → xtrack-0.73.2}/tests/test_madloader.py

@@ -4,6 +4,7 @@ import pathlib
 import numpy as np
 from cpymad.madx import Madx
 from scipy.constants import c as clight
+from scipy.special import factorial
 
 import xobjects as xo
 import xpart as xp
@@ -213,6 +214,89 @@ def test_tilt_shift_and_errors():
         line = list(ml.iter_elements())
 
 
+def test_thick_errors():
+    mad = Madx()
+
+    mad.input('''
+        k0 = 0.1;
+        k1 = 0.2;
+        k2 = 0.3;
+        k3 = 0.4;
+        ks = 0.5;
+        l = 5.;
+        radius = 0.3;
+
+        dknr0 = 0.02;
+        dknr1 = -0.04;
+        dknr2 = 0.06;
+        dkns3 = 0.2;
+        dksr0 = 0.03;
+        dksr1 = -0.05;
+        dksr2 = 0.07;
+        dksr3 = 0.3;
+
+        bend: sbend, k0 := k0, l = 5;
+        quad: quadrupole, k1 := k1, l = 5.;
+        sext: sextupole, k2 := k2, l = 5.;
+        octu: octupole, k3 := k3, l = 5.;
+        sole: solenoid, ks := ks, l = 5.;
+
+        seq: sequence, l = 50;
+            quad1: quad, at = 5;
+            quad2: quad, at = 10;
+            quad3: quad, at = 20;
+            bend1: bend, at = 25;
+            sext1: sext, at = 30;
+            octu1: octu, at = 35;
+            sole1: sole, at = 40;
+        endsequence;
+
+        beam;
+
+        use, sequence = seq;
+
+        select, pattern = quad, flag = error;
+        select, pattern = bend, flag = error;
+        select, pattern = sext, flag = error;
+        select, pattern = octu, flag = error;
+        select, pattern = sole, flag = error;
+        efcomp, radius = radius,
+            dknr = {dknr0, dknr1, dknr2, dknr3},
+            dksr = {dksr0, dksr1, dksr2, dksr3};
+    ''')
+
+    line = xt.Line.from_madx_sequence(
+        sequence=mad.sequence.seq,
+        enable_field_errors=True,
+        allow_thick=True,
+    )
+
+    def error(name, which):
+        field_errors = mad.sequence.seq.expanded_elements[name].field_errors
+        dk = getattr(field_errors, which)
+        return dk[:6]
+
+    xo.assert_allclose(line['bend1'].knl, error('bend1', 'dkn'), atol=0, rtol=1e-15)
+    xo.assert_allclose(line['bend1'].ksl, error('bend1', 'dks'), atol=0, rtol=1e-15)
+
+    xo.assert_allclose(line['quad1'].knl, error('quad1', 'dkn'), atol=0, rtol=1e-15)
+    xo.assert_allclose(line['quad2'].knl, error('quad2', 'dkn'), atol=0, rtol=1e-15)
+    xo.assert_allclose(line['quad3'].knl, error('quad3', 'dkn'), atol=0, rtol=1e-15)
+
+    xo.assert_allclose(line['quad1'].ksl, error('quad1', 'dks'), atol=0, rtol=1e-15)
+    xo.assert_allclose(line['quad2'].ksl, error('quad2', 'dks'), atol=0, rtol=1e-15)
+    xo.assert_allclose(line['quad3'].ksl, error('quad3', 'dks'), atol=0, rtol=1e-15)
+
+    xo.assert_allclose(line['sext1'].knl, error('sext1', 'dkn'), atol=0, rtol=1e-15)
+    xo.assert_allclose(line['sext1'].ksl, error('sext1', 'dks'), atol=0, rtol=1e-15)
+
+    xo.assert_allclose(line['octu1'].knl, error('octu1', 'dkn'), atol=0, rtol=1e-15)
+    xo.assert_allclose(line['octu1'].ksl, error('octu1', 'dks'), atol=0, rtol=1e-15)
+
+    xo.assert_allclose(line['sole1'].knl, error('sole1', 'dkn'), atol=0, rtol=1e-15)
+    xo.assert_allclose(line['sole1'].ksl, error('sole1', 'dks'), atol=0, rtol=1e-15)
+
+
 def test_matrix():
     mad = Madx(stdout=False)
 

{xtrack-0.73.1 → xtrack-0.73.2}/tests/test_new_madloader.py

@@ -146,7 +146,7 @@ def example_sequence(temp_context_default_mod):
     se: sextupole, L=1, K2=2, K2S=3, TILT=2;  ! ignore ktap
     oc: octupole, L=2, K3=3, K3S=2, TILT=2;
     ma: marker;
-    rf: rfcavity, L=2, VOLT=1, LAG=2, FREQ=3, HARMON=2;  ! ignore N_BESSEL, NO_CAVITY_TOTALPATH
+    rf: rfcavity, L=2, VOLT=1, LAG=2, FREQ=3, HARMON=2, NO_CAVITY_TOTALPATH;  ! ignore N_BESSEL
     mu: multipole, LRAD=1, TILT=2, KNL={3, 4, 5, 6}, KSL={1, 2, 3, 4};
     so: solenoid, l=2, ks=3;  ! ignore ksi
     

xtrack-0.73.2/xtrack/_version.py

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