xtrack 0.78.0__tar.gz → 0.79.0__tar.gz

{xtrack-0.78.0/xtrack.egg-info → xtrack-0.79.0}/PKG-INFO

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

{xtrack-0.78.0 → xtrack-0.79.0}/tests/test_elements_thick.py

@@ -61,7 +61,7 @@ def test_combined_function_dipole_against_ptc(test_context, k0, k1, k2, length,
     line_thick = ml.make_line()
     line_thick.config.XTRACK_USE_EXACT_DRIFTS = True # to be consistent with mad
     line_thick.build_tracker(_context=test_context)
-    line_thick.configure_bend_model(core=model, edge='full')
+    line_thick.configure_bend_model(core=model, edge='dipole-only')
 
     if use_multipole:
         line_thick['b'].knl[1] = k1 * length
@@ -144,7 +144,7 @@ def test_combined_function_dipole_expanded(test_context):
     line_thick.build_tracker(_context=test_context)
 
     line_thick.configure_bend_model(core='expanded', num_multipole_kicks=100)
-    assert line_thick['b'].model == 'expanded'
+    assert line_thick['b'].model == 'mat-kick-mat'
     p_test = p0.copy(_context=test_context)
     line_thick.track(p_test)
     p_test.move(_context=xo.context_default)
@@ -230,7 +230,8 @@ def test_thick_bend_survey():
 def test_thick_multipolar_component(test_context, element_type, h):
     bend_length = 1.0
     k0 = h
-    knl = np.array([0.0, 0.01, -0.02, 0.03])
+    knl = np.array([0.0, 0.0, -0.02, 0.03]) # I need to keep knl[1] = 0 because
+                                            # the bend with hxl = 0 would not apply the corretion h*k1
     ksl = np.array([0.0, -0.03, 0.02, -0.01])
     num_kicks = 2
 
@@ -243,12 +244,13 @@ def test_thick_multipolar_component(test_context, element_type, h):
         ksl=ksl,
         num_multipole_kicks=num_kicks,
     )
+    bend_with_mult.integrator = 'uniform'
 
     # Separate bend and a corresponding multipole
     bend_no_mult = element_type(
         k0=k0,
         h=h,
-        length=bend_length / (num_kicks + 1),
+        length=bend_length / num_kicks / 2,
         num_multipole_kicks=0,
     )
     multipole = xt.Multipole(
@@ -264,7 +266,7 @@ def test_thick_multipolar_component(test_context, element_type, h):
     line_no_slices.configure_bend_model(core='expanded')
     line_with_slices = xt.Line(
         elements={'bend_no_mult': bend_no_mult, 'multipole': multipole},
-        element_names=(['bend_no_mult', 'multipole'] * num_kicks) + ['bend_no_mult'],
+        element_names=(['bend_no_mult', 'multipole', 'bend_no_mult'] * num_kicks)
     )
 
     # Track some particles
@@ -622,7 +624,7 @@ def test_import_thick_bend_from_madx(use_true_thick_bends, with_knobs, bend_type
     elem = line['elem']
 
     # Check that the line has correct values to start with
-    assert elem.model == {False: 'expanded', True: 'full'}[use_true_thick_bends]
+    assert elem.model == {False: 'mat-kick-mat', True: 'full'}[use_true_thick_bends]
 
     # Element:
     xo.assert_allclose(elem.length, 2.0, atol=1e-16)
@@ -1862,6 +1864,7 @@ def test_skew_quadrupole(test_context):
     length = 0.5
 
     quad = xt.Quadrupole(k1=k1, k1s=k1s, length=length, _context=test_context)
+    quad.num_multipole_kicks = 1000
 
     n_slices = 1000
     ele_thin = []
@@ -2044,4 +2047,106 @@ def test_knl_knl_kick_present_with_default_num_kicks():
     env['rb1'].knl[2] = 0.1
     p = p0.copy()
     l5.track(p)
-    assert np.abs(p.px[0]) > 1e-7
+    assert np.abs(p.px[0]) > 1e-7
+
+def test_sextupole_num_kicks():
+
+    line = xt.Line(elements={
+        's1': xt.Sextupole(k2=0.1, length=9.0, integrator='teapot')
+    })
+    line.particle_ref = xt.Particles(p0c=7000e9)
+
+    line_1slice = line.copy(shallow=True)
+    line_1slice.slice_thick_elements(
+        slicing_strategies=[
+            xt.Strategy(slicing=xt.Teapot(1), element_type=xt.Sextupole),
+        ])
+
+    line_3slices = line.copy(shallow=True)
+    line_3slices.slice_thick_elements(
+        slicing_strategies=[
+            xt.Strategy(slicing=xt.Teapot(3), element_type=xt.Sextupole),
+        ])
+
+    tw_1slice = line_1slice.twiss(betx=1, bety=1, x=1e-2)
+    tw_3slices = line_3slices.twiss(betx=1, bety=1, x=1e-2)
+
+    tw_1kick = line.twiss(betx=1, bety=1, x=1e-2)
+
+    line.configure_sextupole_model(num_multipole_kicks=3)
+
+    assert line['s1'].num_multipole_kicks == 3
+    tw_3kicks = line.twiss(betx=1, bety=1, x=1e-2)
+
+    assert np.abs(tw_1slice.x[-1] - tw_3slices.x[-1]) > 1e-6
+
+    xo.assert_allclose(tw_1slice.s[-1], tw_1kick.s[-1], atol=1e-15, rtol=0)
+    xo.assert_allclose(tw_1slice.x[-1], tw_1kick.x[-1], atol=1e-15, rtol=0)
+    xo.assert_allclose(tw_1slice.px[-1], tw_1kick.px[-1], atol=1e-15, rtol=0)
+    xo.assert_allclose(tw_1slice.y[-1], tw_1kick.y[-1], atol=1e-15, rtol=0)
+    xo.assert_allclose(tw_1slice.py[-1], tw_1kick.py[-1], atol=1e-15, rtol=0)
+    xo.assert_allclose(tw_1slice.zeta[-1], tw_1kick.zeta[-1], atol=1e-15, rtol=0)
+    xo.assert_allclose(tw_1slice.ptau[-1], tw_1kick.ptau[-1], atol=1e-15, rtol=0)
+    xo.assert_allclose(tw_1slice.betx[-1], tw_1kick.betx[-1], atol=1e-10, rtol=0)
+    xo.assert_allclose(tw_1slice.bety[-1], tw_1kick.bety[-1], atol=1e-10, rtol=0)
+
+    xo.assert_allclose(tw_3slices.s[-1], tw_3kicks.s[-1], atol=1e-15, rtol=0)
+    xo.assert_allclose(tw_3slices.x[-1], tw_3kicks.x[-1], atol=1e-15, rtol=0)
+    xo.assert_allclose(tw_3slices.px[-1], tw_3kicks.px[-1], atol=1e-15, rtol=0)
+    xo.assert_allclose(tw_3slices.y[-1], tw_3kicks.y[-1], atol=1e-15, rtol=0)
+    xo.assert_allclose(tw_3slices.py[-1], tw_3kicks.py[-1], atol=1e-15, rtol=0)
+    xo.assert_allclose(tw_3slices.zeta[-1], tw_3kicks.zeta[-1], atol=1e-15, rtol=0)
+    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_octupole_num_kicks():
+
+    line = xt.Line(elements={
+        's1': xt.Octupole(k3=100., length=9.0, integrator='teapot')
+    })
+    line.particle_ref = xt.Particles(p0c=7000e9)
+
+    line_1slice = line.copy(shallow=True)
+    line_1slice.slice_thick_elements(
+        slicing_strategies=[
+            xt.Strategy(slicing=xt.Teapot(1), element_type=xt.Octupole),
+        ])
+
+    line_3slices = line.copy(shallow=True)
+    line_3slices.slice_thick_elements(
+        slicing_strategies=[
+            xt.Strategy(slicing=xt.Teapot(3), element_type=xt.Octupole),
+        ])
+
+    tw_1slice = line_1slice.twiss(betx=1, bety=1, x=1e-2)
+    tw_3slices = line_3slices.twiss(betx=1, bety=1, x=1e-2)
+
+    tw_1kick = line.twiss(betx=1, bety=1, x=1e-2)
+
+    line.configure_octupole_model(num_multipole_kicks=3)
+    tw_3kicks = line.twiss(betx=1, bety=1, x=1e-2)
+
+    assert line['s1'].num_multipole_kicks == 3
+
+    assert np.abs(tw_1slice.x[-1] - tw_3slices.x[-1]) > 1e-6
+
+    xo.assert_allclose(tw_1slice.s[-1], tw_1kick.s[-1], atol=1e-15, rtol=0)
+    xo.assert_allclose(tw_1slice.x[-1], tw_1kick.x[-1], atol=1e-15, rtol=0)
+    xo.assert_allclose(tw_1slice.px[-1], tw_1kick.px[-1], atol=1e-15, rtol=0)
+    xo.assert_allclose(tw_1slice.y[-1], tw_1kick.y[-1], atol=1e-15, rtol=0)
+    xo.assert_allclose(tw_1slice.py[-1], tw_1kick.py[-1], atol=1e-15, rtol=0)
+    xo.assert_allclose(tw_1slice.zeta[-1], tw_1kick.zeta[-1], atol=1e-15, rtol=0)
+    xo.assert_allclose(tw_1slice.ptau[-1], tw_1kick.ptau[-1], atol=1e-15, rtol=0)
+    xo.assert_allclose(tw_1slice.betx[-1], tw_1kick.betx[-1], atol=1e-10, rtol=0)
+    xo.assert_allclose(tw_1slice.bety[-1], tw_1kick.bety[-1], atol=1e-10, rtol=0)
+
+    xo.assert_allclose(tw_3slices.s[-1], tw_3kicks.s[-1], atol=1e-15, rtol=0)
+    xo.assert_allclose(tw_3slices.x[-1], tw_3kicks.x[-1], atol=1e-15, rtol=0)
+    xo.assert_allclose(tw_3slices.px[-1], tw_3kicks.px[-1], atol=1e-15, rtol=0)
+    xo.assert_allclose(tw_3slices.y[-1], tw_3kicks.y[-1], atol=1e-15, rtol=0)
+    xo.assert_allclose(tw_3slices.py[-1], tw_3kicks.py[-1], atol=1e-15, rtol=0)
+    xo.assert_allclose(tw_3slices.zeta[-1], tw_3kicks.zeta[-1], atol=1e-15, rtol=0)
+    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)

{xtrack-0.78.0 → xtrack-0.79.0}/tests/test_environment.py

@@ -1412,7 +1412,7 @@ def test_assemble_ring_repeated_elements():
     xo.assert_allclose(twarc.s[0], 0, atol=1e-12, rtol=0)
     xo.assert_allclose(twarc.s[-1], 228, atol=1e-10, rtol=0)
     twarc_start_end = arc.twiss4d(start=xt.START, end=xt.END, init=twarc)
-    xo.assert_allclose(twarc_start_end.betx, twarc.betx, atol=1e-12, rtol=0)
+    xo.assert_allclose(twarc_start_end.betx, twarc.betx, atol=1e-11, rtol=0)
 
     tw_one_cell_ref = twarc.rows['mid::2':'mid::3']
     tw_one_cell = arc.twiss4d(start='mid::2', end='mid::3', init='periodic')
@@ -2185,11 +2185,11 @@ def test_insert_anchors_special_cases():
 
     assert np.all(tt.name == np.array(
         ['drift_1', 'm5.0', 'm5.1', 'q5', 'm5.2', 'm5.3', 'drift_2',
-        'q0_entry', 'q0..0', 'q4', 'drift_3..1', 'mr.0', 'mr.1', 'q6',
-        'mr.2', 'mr.3', 'drift_4', 'end', '_end_point']))
+       'q0_entry', 'q0..entry_map', 'q0..0', 'q4', 'drift_3..1', 'mr.0',
+       'mr.1', 'q6', 'mr.2', 'mr.3', 'drift_4', 'end', '_end_point']))
     xo.assert_allclose(tt.s_center, np.array(
-        np.array([ 4.5,  9. ,  9. , 10. , 11. , 11. , 15. , 19. , 19.5, 21. , 25.5,
-        29. , 29. , 30. , 31. , 31. , 40.5, 50. , 50.])),
+        np.array([ 4.5,  9. ,  9. , 10. , 11. , 11. , 15. , 19. , 19. , 19.5, 21. ,
+                   25.5, 29. , 29. , 30. , 31. , 31. , 40.5, 50. , 50. ])),
         rtol=0., atol=1e-14)
 
 def test_insert_providing_object():
@@ -2306,10 +2306,10 @@ def test_individual_insertions_anchors():
 
     assert np.all(tt.name == np.array(
         ['drift_1', 'm5.0', 'm5.1', 'q5', 'm5.2', 'm5.3', 'drift_2',
-        'q0_entry', 'q0..0', 'q4', 'drift_3..1', 'mr.0', 'mr.1', 'q6',
-        'mr.2', 'mr.3', 'drift_4', 'end', '_end_point']))
+       'q0_entry', 'q0..entry_map', 'q0..0', 'q4', 'drift_3..1', 'mr.0',
+       'mr.1', 'q6', 'mr.2', 'mr.3', 'drift_4', 'end', '_end_point']))
     xo.assert_allclose(tt.s_center, np.array(
-        np.array([ 4.5,  9. ,  9. , 10. , 11. , 11. , 15. , 19. , 19.5, 21. , 25.5,
+        np.array([ 4.5,  9. ,  9. , 10. , 11. , 11. , 15. , 19., 19. , 19.5, 21. , 25.5,
         29. , 29. , 30. , 31. , 31. , 40.5, 50. , 50.])),
         rtol=0., atol=1e-14)
 
@@ -3072,64 +3072,90 @@ def test_enviroment_from_two_lines():
     # _end_point                                         None
 
     assert np.all(tt1.name == np.array([
-        'drift_1', 'qq1_thick_entry', 'qq1_thick..0', 'qq1_thick..1',
-        'qq1_thick_exit', 'drift_2', 'qq1_thin_entry', 'drift_qq1_thin..0',
-        'qq1_thin..0', 'drift_qq1_thin..1', 'qq1_thin..1',
-        'drift_qq1_thin..2', 'qq1_thin_exit', 'drift_3',
-        'qq_shared_thick_entry', 'qq_shared_thick..0/line1',
-        'qq_shared_thick..1/line1', 'qq_shared_thick_exit', 'drift_4',
-        'qq_shared_thin_entry', 'drift_qq_shared_thin..0/line1',
-        'qq_shared_thin..0/line1', 'drift_qq_shared_thin..1/line1',
-        'qq_shared_thin..1/line1', 'drift_qq_shared_thin..2/line1',
-        'qq_shared_thin_exit', '_end_point']))
+       'drift_1', 'qq1_thick_entry', 'qq1_thick..entry_map',
+       'qq1_thick..0', 'qq1_thick..1', 'qq1_thick..exit_map',
+       'qq1_thick_exit', 'drift_2', 'qq1_thin_entry',
+       'qq1_thin..entry_map', 'drift_qq1_thin..0', 'qq1_thin..0',
+       'drift_qq1_thin..1', 'qq1_thin..1', 'drift_qq1_thin..2',
+       'qq1_thin..exit_map', 'qq1_thin_exit', 'drift_3',
+       'qq_shared_thick_entry', 'qq_shared_thick..entry_map/line1',
+       'qq_shared_thick..0/line1', 'qq_shared_thick..1/line1',
+       'qq_shared_thick..exit_map/line1', 'qq_shared_thick_exit',
+       'drift_4', 'qq_shared_thin_entry',
+       'qq_shared_thin..entry_map/line1', 'drift_qq_shared_thin..0/line1',
+       'qq_shared_thin..0/line1', 'drift_qq_shared_thin..1/line1',
+       'qq_shared_thin..1/line1', 'drift_qq_shared_thin..2/line1',
+       'qq_shared_thin..exit_map/line1', 'qq_shared_thin_exit',
+       '_end_point']))
 
     assert np.all(tt1.element_type == np.array([
-        'Drift', 'Marker', 'ThickSliceQuadrupole', 'ThickSliceQuadrupole',
-        'Marker', 'Drift', 'Marker', 'DriftSliceQuadrupole',
-        'ThinSliceQuadrupole', 'DriftSliceQuadrupole',
-        'ThinSliceQuadrupole', 'DriftSliceQuadrupole', 'Marker', 'Drift',
-        'Marker', 'ThickSliceQuadrupole', 'ThickSliceQuadrupole', 'Marker',
-        'Drift', 'Marker', 'DriftSliceQuadrupole', 'ThinSliceQuadrupole',
-        'DriftSliceQuadrupole', 'ThinSliceQuadrupole',
-        'DriftSliceQuadrupole', 'Marker', '']))
+       'Drift', 'Marker', 'ThinSliceQuadrupoleEntry',
+       'ThickSliceQuadrupole', 'ThickSliceQuadrupole',
+       'ThinSliceQuadrupoleExit', 'Marker', 'Drift', 'Marker',
+       'ThinSliceQuadrupoleEntry', 'DriftSliceQuadrupole',
+       'ThinSliceQuadrupole', 'DriftSliceQuadrupole',
+       'ThinSliceQuadrupole', 'DriftSliceQuadrupole',
+       'ThinSliceQuadrupoleExit', 'Marker', 'Drift', 'Marker',
+       'ThinSliceQuadrupoleEntry', 'ThickSliceQuadrupole',
+       'ThickSliceQuadrupole', 'ThinSliceQuadrupoleExit', 'Marker',
+       'Drift', 'Marker', 'ThinSliceQuadrupoleEntry',
+       'DriftSliceQuadrupole', 'ThinSliceQuadrupole',
+       'DriftSliceQuadrupole', 'ThinSliceQuadrupole',
+       'DriftSliceQuadrupole', 'ThinSliceQuadrupoleExit', 'Marker', '']))
 
     assert np.all(tt1.parent_name == np.array([
-        None, None, 'qq1_thick', 'qq1_thick', None, None, None, 'qq1_thin',
-        'qq1_thin', 'qq1_thin', 'qq1_thin', 'qq1_thin', None, None, None,
-        'qq_shared_thick/line1', 'qq_shared_thick/line1', None, None, None,
-        'qq_shared_thin/line1', 'qq_shared_thin/line1',
-        'qq_shared_thin/line1', 'qq_shared_thin/line1',
-        'qq_shared_thin/line1', None, None]))
+       None, None, 'qq1_thick', 'qq1_thick', 'qq1_thick', 'qq1_thick',
+       None, None, None, 'qq1_thin', 'qq1_thin', 'qq1_thin', 'qq1_thin',
+       'qq1_thin', 'qq1_thin', 'qq1_thin', None, None, None,
+       'qq_shared_thick/line1', 'qq_shared_thick/line1',
+       'qq_shared_thick/line1', 'qq_shared_thick/line1', None, None, None,
+       'qq_shared_thin/line1', 'qq_shared_thin/line1',
+       'qq_shared_thin/line1', 'qq_shared_thin/line1',
+       'qq_shared_thin/line1', 'qq_shared_thin/line1',
+       'qq_shared_thin/line1', None, None]))
 
     assert np.all(tt2.name == np.array([
-        'drift_5', 'qq2_thick_entry', 'qq2_thick..0', 'qq2_thick..1',
-        'qq2_thick_exit', 'drift_6', 'qq2_thin_entry', 'drift_qq2_thin..0',
-        'qq2_thin..0', 'drift_qq2_thin..1', 'qq2_thin..1',
-        'drift_qq2_thin..2', 'qq2_thin_exit', 'drift_7',
-        'qq_shared_thick_entry', 'qq_shared_thick..0/line2',
-        'qq_shared_thick..1/line2', 'qq_shared_thick_exit', 'drift_8',
-        'qq_shared_thin_entry', 'drift_qq_shared_thin..0/line2',
-        'qq_shared_thin..0/line2', 'drift_qq_shared_thin..1/line2',
-        'qq_shared_thin..1/line2', 'drift_qq_shared_thin..2/line2',
-        'qq_shared_thin_exit', '_end_point']))
+        'drift_5', 'qq2_thick_entry', 'qq2_thick..entry_map',
+       'qq2_thick..0', 'qq2_thick..1', 'qq2_thick..exit_map',
+       'qq2_thick_exit', 'drift_6', 'qq2_thin_entry',
+       'qq2_thin..entry_map', 'drift_qq2_thin..0', 'qq2_thin..0',
+       'drift_qq2_thin..1', 'qq2_thin..1', 'drift_qq2_thin..2',
+       'qq2_thin..exit_map', 'qq2_thin_exit', 'drift_7',
+       'qq_shared_thick_entry', 'qq_shared_thick..entry_map/line2',
+       'qq_shared_thick..0/line2', 'qq_shared_thick..1/line2',
+       'qq_shared_thick..exit_map/line2', 'qq_shared_thick_exit',
+       'drift_8', 'qq_shared_thin_entry',
+       'qq_shared_thin..entry_map/line2', 'drift_qq_shared_thin..0/line2',
+       'qq_shared_thin..0/line2', 'drift_qq_shared_thin..1/line2',
+       'qq_shared_thin..1/line2', 'drift_qq_shared_thin..2/line2',
+       'qq_shared_thin..exit_map/line2', 'qq_shared_thin_exit',
+       '_end_point']))
 
     assert np.all(tt2.element_type == np.array([
-        'Drift', 'Marker', 'ThickSliceQuadrupole', 'ThickSliceQuadrupole',
-        'Marker', 'Drift', 'Marker', 'DriftSliceQuadrupole',
-        'ThinSliceQuadrupole', 'DriftSliceQuadrupole',
-        'ThinSliceQuadrupole', 'DriftSliceQuadrupole', 'Marker', 'Drift',
-        'Marker', 'ThickSliceQuadrupole', 'ThickSliceQuadrupole', 'Marker',
-        'Drift', 'Marker', 'DriftSliceQuadrupole', 'ThinSliceQuadrupole',
-        'DriftSliceQuadrupole', 'ThinSliceQuadrupole',
-        'DriftSliceQuadrupole', 'Marker', '']))
+        'Drift', 'Marker', 'ThinSliceQuadrupoleEntry',
+       'ThickSliceQuadrupole', 'ThickSliceQuadrupole',
+       'ThinSliceQuadrupoleExit', 'Marker', 'Drift', 'Marker',
+       'ThinSliceQuadrupoleEntry', 'DriftSliceQuadrupole',
+       'ThinSliceQuadrupole', 'DriftSliceQuadrupole',
+       'ThinSliceQuadrupole', 'DriftSliceQuadrupole',
+       'ThinSliceQuadrupoleExit', 'Marker', 'Drift', 'Marker',
+       'ThinSliceQuadrupoleEntry', 'ThickSliceQuadrupole',
+       'ThickSliceQuadrupole', 'ThinSliceQuadrupoleExit', 'Marker',
+       'Drift', 'Marker', 'ThinSliceQuadrupoleEntry',
+       'DriftSliceQuadrupole', 'ThinSliceQuadrupole',
+       'DriftSliceQuadrupole', 'ThinSliceQuadrupole',
+       'DriftSliceQuadrupole', 'ThinSliceQuadrupoleExit', 'Marker', '']))
 
     assert np.all(tt2.parent_name == np.array([
-        None, None, 'qq2_thick', 'qq2_thick', None, None, None, 'qq2_thin',
-        'qq2_thin', 'qq2_thin', 'qq2_thin', 'qq2_thin', None, None, None,
-        'qq_shared_thick/line2', 'qq_shared_thick/line2', None, None, None,
-        'qq_shared_thin/line2', 'qq_shared_thin/line2',
-        'qq_shared_thin/line2', 'qq_shared_thin/line2',
-        'qq_shared_thin/line2', None, None]))
+       None, None, 'qq2_thick', 'qq2_thick', 'qq2_thick', 'qq2_thick',
+       None, None, None, 'qq2_thin', 'qq2_thin', 'qq2_thin', 'qq2_thin',
+       'qq2_thin', 'qq2_thin', 'qq2_thin', None, None, None,
+       'qq_shared_thick/line2', 'qq_shared_thick/line2',
+       'qq_shared_thick/line2', 'qq_shared_thick/line2', None, None, None,
+       'qq_shared_thin/line2', 'qq_shared_thin/line2',
+       'qq_shared_thin/line2', 'qq_shared_thin/line2',
+       'qq_shared_thin/line2', 'qq_shared_thin/line2',
+       'qq_shared_thin/line2', None, None]))
 
     assert 'qq1_thick' in env.element_dict
     assert 'qq1_thin' in env.element_dict

{xtrack-0.78.0 → xtrack-0.79.0}/tests/test_line.py

@@ -943,7 +943,8 @@ def test_insert_thin_elements_at_s_lhc(test_context):
                         'drift_mb.a29r3.b1..1..1', 'mb.a29r3.b1..1']))
 
     assert np.all(tt.rows['mq.29r3.b1_exit<<3':'mq.29r3.b1_exit'].name
-            == np.array(['m0_at_c', 'm1_at_c', 'm2_at_c', 'mq.29r3.b1_exit']))
+            == np.array(
+                ['m1_at_c', 'm2_at_c', 'mq.29r3.b1..exit_map', 'mq.29r3.b1_exit']))
 
     assert np.all(tt.rows['m0_at_d':'m0_at_d>>4'].name
                 == np.array(['m0_at_d', 'm1_at_d', 'm2_at_d',