xtrack 0.86.2__tar.gz → 0.86.4__tar.gz

{xtrack-0.86.2/xtrack.egg-info → xtrack-0.86.4}/PKG-INFO

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

{xtrack-0.86.2 → xtrack-0.86.4}/tests/test_collimation.py

@@ -166,7 +166,7 @@ def test_aperture_refinement(sandwitch_aper):
                     + line_aper_0.elements
                     + (xt.Drift(_buffer=buf, length=1),
                        xt.Multipole(_buffer=buf, knl=[0.]),
-                       xt.Drift(_buffer=buf, length=1),
+                       xt.Quadrupole(_buffer=buf, length=1),
                        xt.Cavity(_buffer=buf, voltage=3e6, frequency=400e6),
                        xt.ParticlesMonitor(_buffer=buf,
                             start_at_turn=0, stop_at_turn=10, num_particles=3),
@@ -439,7 +439,6 @@ def test_losslocationrefinement_skip_refinement_for_collimators():
                                                 dr = 50e-6,
                                                 ds = 0.05,
                                                 save_refine_lines=True)
-
     loss_loc_refinement.refine_loss_location(particles)
 
     assert np.all(part_before.s == particles.s)

{xtrack-0.86.2 → xtrack-0.86.4}/tests/test_element_characterization_functions.py

@@ -50,9 +50,9 @@ def test_has_backtrack(test_context):
     assert _has_backtrack(line['a1'], line)
     assert _has_backtrack(line['a2'], line)
 
-    assert not _allow_loss_refinement(line['e0'], line)
-    assert not _allow_loss_refinement(line['e1'], line)
-    assert not _allow_loss_refinement(line['e2'], line)
+    assert _allow_loss_refinement(line['e0'], line)
+    assert _allow_loss_refinement(line['e1'], line)
+    assert _allow_loss_refinement(line['e2'], line)
     assert _allow_loss_refinement(line['a0'], line)
     assert _allow_loss_refinement(line['a1'], line)
     assert _allow_loss_refinement(line['a2'], line)

{xtrack-0.86.2 → xtrack-0.86.4}/tests/test_radiation_equilibrium_emittances.py

@@ -124,32 +124,32 @@ def test_eq_emitt(conf):
     if not tilt_machine_by_90_degrees and not vertical_orbit_distortion and not wiggler_on:
         xo.assert_allclose(ex, 7.09232e-10, atol=0,     rtol=1e-4)
         xo.assert_allclose(ey, 0,           atol=1e-14, rtol=0)
-        xo.assert_allclose(ez, 3.43821e-06, atol=0,     rtol=1e-4)
+        xo.assert_allclose(ez, 3.36956e-06, atol=0,     rtol=1e-4)
         checked = True
     elif tilt_machine_by_90_degrees and not vertical_orbit_distortion and not wiggler_on:
         xo.assert_allclose(ex, 0,           atol=1e-14, rtol=0)
         xo.assert_allclose(ey, 7.09232e-10, atol=0,     rtol=1e-4)
-        xo.assert_allclose(ez, 3.43821e-6,  atol=0,     rtol=1e-4)
+        xo.assert_allclose(ez, 3.36956e-6,  atol=0,     rtol=1e-4)
         checked = True
     elif not tilt_machine_by_90_degrees and not vertical_orbit_distortion and wiggler_on:
         xo.assert_allclose(ex, 7.0283e-10, atol=0,     rtol=1e-4)
         xo.assert_allclose(ey, 5.5765e-13, atol=0,     rtol=4e-3)
-        xo.assert_allclose(ez, 3.6860e-6,  atol=0,     rtol=1e-4)
+        xo.assert_allclose(ez, 3.6042e-6,  atol=0,     rtol=1e-4)
         checked = True
     elif tilt_machine_by_90_degrees and not vertical_orbit_distortion and wiggler_on:
         xo.assert_allclose(ex, 5.5790e-13, atol=0,     rtol=4e-3)  # Quite large, to be kept in mind
         xo.assert_allclose(ey, 7.0283e-10, atol=0,     rtol=1e-4)
-        xo.assert_allclose(ez, 3.6860e-6,  atol=0,     rtol=1e-4)
+        xo.assert_allclose(ez, 3.6042e-6,  atol=0,     rtol=1e-4)
         checked = True
     elif not tilt_machine_by_90_degrees and vertical_orbit_distortion and not wiggler_on:
         xo.assert_allclose(ex, 7.0911e-10, atol=0,     rtol=1e-4)
         xo.assert_allclose(ey, 2.1821e-12, atol=0,     rtol=1e-2)
-        xo.assert_allclose(ez, 3.4221e-6,  atol=0,     rtol=1e-4)
+        xo.assert_allclose(ez, 3.3536e-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.1828e-12, atol=0,     rtol=7e-3)
         xo.assert_allclose(ey, 7.0911e-10, atol=0,     rtol=1e-4)
-        xo.assert_allclose(ez, 3.4221e-6,  atol=0,     rtol=1e-4)
+        xo.assert_allclose(ez, 3.3536e-6,  atol=0,     rtol=1e-4)
         checked = True
     else:
         raise ValueError('Unknown configuration')
@@ -159,11 +159,11 @@ def test_eq_emitt(conf):
     # Check radiation integrals
     tw_integ = line.twiss(radiation_integrals=True)
     xo.assert_allclose(tw_integ.rad_int_damping_constant_x_s,
-                       tw_rad.damping_constants_s[0], rtol=0.02, atol=0)
+                       tw_rad.damping_constants_s[0], rtol=0.025, atol=0)
     xo.assert_allclose(tw_integ.rad_int_damping_constant_y_s,
-                       tw_rad.damping_constants_s[1], rtol=0.02, atol=0)
+                       tw_rad.damping_constants_s[1], rtol=0.025, atol=0)
     xo.assert_allclose(tw_integ.rad_int_damping_constant_zeta_s,
-                       tw_rad.damping_constants_s[2], rtol=0.02, atol=0)
+                       tw_rad.damping_constants_s[2], rtol=0.025, atol=0)
     xo.assert_allclose(tw_integ.rad_int_eq_gemitt_x, ex, rtol=0.15, atol=1e-14)
     xo.assert_allclose(tw_integ.rad_int_eq_gemitt_y, ey, rtol=0.15, atol=1e-14)
 

{xtrack-0.86.2 → xtrack-0.86.4}/tests/test_radiation_equilibrium_emittances_thick.py

@@ -131,32 +131,32 @@ def test_eq_emitt(conf):
     if not tilt_machine_by_90_degrees and not vertical_orbit_distortion and not wiggler_on:
         xo.assert_allclose(ex, 7.0923e-10, atol=0,     rtol=1e-4)
         xo.assert_allclose(ey, 0,          atol=1e-14, rtol=0)
-        xo.assert_allclose(ez, 3.5778e-6,  atol=0,     rtol=1e-4)
+        xo.assert_allclose(ez, 3.5064e-6,  atol=0,     rtol=1e-4)
         checked = True
     elif tilt_machine_by_90_degrees and not vertical_orbit_distortion and not wiggler_on:
         xo.assert_allclose(ex, 0,          atol=1e-14, rtol=0)
         xo.assert_allclose(ey, 7.0923e-10, atol=0,     rtol=1e-4)
-        xo.assert_allclose(ez, 3.5778e-6,  atol=0,     rtol=1e-4)
+        xo.assert_allclose(ez, 3.5064e-6,  atol=0,     rtol=1e-4)
         checked = True
     elif not tilt_machine_by_90_degrees and not vertical_orbit_distortion and wiggler_on:
         xo.assert_allclose(ex, 7.0283e-10, atol=0,     rtol=1e-4)
         xo.assert_allclose(ey, 5.6461e-13, atol=0,     rtol=4e-3)
-        xo.assert_allclose(ez, 3.8357e-6,  atol=0,     rtol=1e-4)
+        xo.assert_allclose(ez, 3.7506e-6,  atol=0,     rtol=1e-4)
         checked = True
     elif tilt_machine_by_90_degrees and not vertical_orbit_distortion and wiggler_on:
         xo.assert_allclose(ex, 5.6448e-13, atol=0,     rtol=1e-2)  # Quite large, to be kept in mind
         xo.assert_allclose(ey, 7.0283e-10, atol=0,     rtol=1e-4)
-        xo.assert_allclose(ez, 3.8357e-6,  atol=0,     rtol=1e-4)
+        xo.assert_allclose(ez, 3.7506e-6,  atol=0,     rtol=1e-4)
         checked = True
     elif not tilt_machine_by_90_degrees and vertical_orbit_distortion and not wiggler_on:
         xo.assert_allclose(ex, 7.0910e-10, atol=0,     rtol=1e-4)
         xo.assert_allclose(ey, 2.2195e-12, atol=0,     rtol=7e-3)
-        xo.assert_allclose(ez, 3.5607e-6,  atol=0,     rtol=2e-4)
+        xo.assert_allclose(ez, 3.4899e-6,  atol=0,     rtol=2e-4)
         checked = True
     elif tilt_machine_by_90_degrees and vertical_orbit_distortion and not wiggler_on:
         xo.assert_allclose(ex, 2.2154e-12, atol=0,     rtol=7e-3)
         xo.assert_allclose(ey, 7.0911e-10, atol=0,     rtol=1e-4)
-        xo.assert_allclose(ez, 3.5607e-6,  atol=0,     rtol=2e-4)
+        xo.assert_allclose(ez, 3.4899e-6,  atol=0,     rtol=2e-4)
         checked = True
     else:
         raise ValueError('Unknown configuration')
@@ -166,11 +166,11 @@ def test_eq_emitt(conf):
     # Check radiation integrals
     tw_integ = line.twiss(radiation_integrals=True)
     xo.assert_allclose(tw_integ.rad_int_damping_constant_x_s,
-                       tw_rad.damping_constants_s[0], rtol=0.02, atol=0)
+                       tw_rad.damping_constants_s[0], rtol=0.025, atol=0)
     xo.assert_allclose(tw_integ.rad_int_damping_constant_y_s,
-                       tw_rad.damping_constants_s[1], rtol=0.02, atol=0)
+                       tw_rad.damping_constants_s[1], rtol=0.025, atol=0)
     xo.assert_allclose(tw_integ.rad_int_damping_constant_zeta_s,
-                       tw_rad.damping_constants_s[2], rtol=0.02, atol=0)
+                       tw_rad.damping_constants_s[2], rtol=0.025, atol=0)
     xo.assert_allclose(tw_integ.rad_int_eq_gemitt_x, ex, rtol=0.15, atol=1e-14)
     xo.assert_allclose(tw_integ.rad_int_eq_gemitt_y, ey, rtol=0.15, atol=1e-14)
 

{xtrack-0.86.2 → xtrack-0.86.4}/tests/test_tapering.py

@@ -37,7 +37,7 @@ def test_tapering_and_twiss_with_radiation():
     line.configure_radiation(model='mean')
     # - Set cavity lags to compensate energy loss
     # - Taper magnet strengths
-    line.compensate_radiation_energy_loss()
+    line.compensate_radiation_energy_loss(delta0=0)
 
     for conf in configs:
         print(f'Running test with conf: {conf}')
@@ -126,3 +126,64 @@ def test_tapering_and_twiss_with_radiation():
         xo.assert_allclose(
             line['rf3'].voltage*np.sin((line['rf'].lag + line['rf'].lag_taper)/180*np.pi),
             eneloss/4, rtol=3e-5)
+
+def test_tapering_zero_mean():
+
+    filename = test_data_folder / 'clic_dr/line_for_taper.json'
+    with open(filename, 'r') as f:
+        line = xt.Line.from_dict(json.load(f))
+
+    line.build_tracker()
+
+    line['rf3'].voltage = 0. # desymmetrize the rf
+    line['rf'].voltage = 0.  # desymmetrize the rf
+
+    line['rf1'].voltage *= 2
+    line['rf2b'].voltage *= 2
+    line['rf2a'].voltage *= 2
+
+    line.particle_ref.p0c = 4e9  # eV
+
+    line.configure_radiation(model=None)
+    tw_no_rad = line.twiss(method='4d', freeze_longitudinal=True)
+
+    ###############################################
+    # Enable radiation and compensate energy loss #
+    ###############################################
+
+    line.configure_radiation(model='mean')
+
+    # - Set cavity lags to compensate energy loss
+    # - Taper magnet strengths to avoid optics and orbit distortions
+    line.compensate_radiation_energy_loss(max_iter=100, delta0='zero_mean')
+
+    ##############################
+    # Twiss to check the results #
+    ##############################
+
+    tw = line.twiss(method='6d')
+
+    tw.delta # contains the momentum deviation along the ring
+
+    #!end-doc-part
+
+    p0corr = 1 + tw.delta
+
+    delta_ave = np.trapezoid(tw.delta, tw.s)/tw.s[-1]
+    xo.assert_allclose(delta_ave, 0, rtol=0, atol=1e-6)
+
+    xo.assert_allclose(tw.qx, tw_no_rad.qx, rtol=0, atol=5e-4)
+    xo.assert_allclose(tw.qy, tw_no_rad.qy, rtol=0, atol=5e-4)
+
+    xo.assert_allclose(tw.dqx, tw_no_rad.dqx, rtol=0, atol=1.5e-2*tw.qx)
+    xo.assert_allclose(tw.dqy, tw_no_rad.dqy, rtol=0, atol=1.5e-2*tw.qy)
+
+    xo.assert_allclose(tw.x, tw_no_rad.x, rtol=0, atol=1e-7)
+    xo.assert_allclose(tw.y, tw_no_rad.y, rtol=0, atol=1e-7)
+
+    xo.assert_allclose(tw.betx*p0corr, tw_no_rad.betx, rtol=2e-2, atol=0)
+    xo.assert_allclose(tw.bety*p0corr, tw_no_rad.bety, rtol=2e-2, atol=0)
+
+    xo.assert_allclose(tw.dx, tw.dx, rtol=0.0, atol=0.1e-3)
+
+    xo.assert_allclose(tw.dy, tw.dy, rtol=0.0, atol=0.1e-3)

xtrack-0.86.4/xtrack/_version.py

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

{xtrack-0.86.2 → xtrack-0.86.4}/xtrack/beam_elements/elements.py

@@ -701,6 +701,7 @@ class _BendCommon:
     """Common properties for Bend and RBend: see their respective docstrings."""
     isthick = True
     has_backtrack = True
+    allow_loss_refinement = True
 
     _skip_in_to_dict = ['_order', 'inv_factorial_order']  # defined by knl, etc.
 
@@ -973,6 +974,8 @@ class Bend(_BendCommon, BeamElement):
         A value added to delta for the purposes of tapering. Default is 0.
     """
 
+    allow_loss_refinement = True
+
     _xofields = _BendCommon._common_xofields
     _rename = _BendCommon._common_rename
 
@@ -1185,6 +1188,8 @@ class RBend(_BendCommon, BeamElement):
         'length_straight': xo.Float64,
     }
 
+    allow_loss_refinement = True
+
     _rename = {
         **_BendCommon._common_rename,
         'length_straight': '_length_straight',
@@ -1442,6 +1447,7 @@ class Sextupole(BeamElement):
 
     isthick = True
     has_backtrack = True
+    allow_loss_refinement = True
 
     _xofields={
         'k2': xo.Float64,
@@ -1600,6 +1606,7 @@ class Octupole(BeamElement):
 
     isthick = True
     has_backtrack = True
+    allow_loss_refinement = True
 
     _xofields={
         'k3': xo.Float64,
@@ -1755,6 +1762,7 @@ class Quadrupole(BeamElement):
     """
     isthick = True
     has_backtrack = True
+    allow_loss_refinement = True
 
     _xofields = {
         'k1': xo.Float64,
@@ -1911,6 +1919,7 @@ class UniformSolenoid(BeamElement):
 
     isthick = True
     has_backtrack = True
+    allow_loss_refinement = True
 
     _xofields={
         'ks': xo.Float64,
@@ -2153,6 +2162,7 @@ class Solenoid(BeamElement):
     """
     isthick = True
     has_backtrack = True
+    allow_loss_refinement = True
 
     _xofields = {
         'length': xo.Float64,

{xtrack-0.86.2 → xtrack-0.86.4}/xtrack/beam_elements/slice_elements_thick.py

@@ -20,6 +20,7 @@ COMMON_SLICE_XO_FIELDS = {
 
 class ThickSliceBend(BeamElement):
     allow_rot_and_shift = False
+    allow_loss_refinement = True
     rot_and_shift_from_parent = True
     _skip_in_to_dict = ['_parent']
     has_backtrack = True
@@ -49,6 +50,7 @@ class ThickSliceBend(BeamElement):
 
 class ThickSliceRBend(BeamElement):
     allow_rot_and_shift = False
+    allow_loss_refinement = True
     rot_and_shift_from_parent = True
     _skip_in_to_dict = ['_parent']
     has_backtrack = True
@@ -78,6 +80,7 @@ class ThickSliceRBend(BeamElement):
 
 class ThickSliceQuadrupole(BeamElement):
     allow_rot_and_shift = False
+    allow_loss_refinement = True
     rot_and_shift_from_parent = True
     _skip_in_to_dict = ['_parent']
     has_backtrack = True
@@ -107,6 +110,7 @@ class ThickSliceQuadrupole(BeamElement):
 
 class ThickSliceSextupole(BeamElement):
     allow_rot_and_shift = False
+    allow_loss_refinement = True
     rot_and_shift_from_parent = True
     _skip_in_to_dict = ['_parent']
     has_backtrack = True
@@ -139,6 +143,7 @@ class ThickSliceSextupole(BeamElement):
 
 class ThickSliceOctupole(BeamElement):
     allow_rot_and_shift = False
+    allow_loss_refinement = True
     rot_and_shift_from_parent = True
     _skip_in_to_dict = ['_parent']
     has_backtrack = True
@@ -171,6 +176,7 @@ class ThickSliceOctupole(BeamElement):
 
 class ThickSliceUniformSolenoid(BeamElement):
     allow_rot_and_shift = False
+    allow_loss_refinement = True
     rot_and_shift_from_parent = True
     _skip_in_to_dict = ['_parent']
     has_backtrack = True
@@ -203,6 +209,7 @@ class ThickSliceUniformSolenoid(BeamElement):
 
 class ThickSliceSolenoid(BeamElement):
     allow_rot_and_shift = False
+    allow_loss_refinement = True
     rot_and_shift_from_parent = True
     _skip_in_to_dict = ['_parent']
     has_backtrack = True
@@ -235,10 +242,10 @@ class ThickSliceSolenoid(BeamElement):
 
 class DriftSliceBend(BeamElement):
     allow_rot_and_shift = False
+    allow_loss_refinement = True
     rot_and_shift_from_parent = False
     _skip_in_to_dict = ['_parent']
     has_backtrack = True
-    allow_loss_refinement = True
     _force_moveable = True
     isthick = True
     _inherit_strengths = False
@@ -270,10 +277,10 @@ class DriftSliceBend(BeamElement):
 
 class DriftSliceRBend(BeamElement):
     allow_rot_and_shift = False
+    allow_loss_refinement = True
     rot_and_shift_from_parent = False
     _skip_in_to_dict = ['_parent']
     has_backtrack = True
-    allow_loss_refinement = True
     _force_moveable = True
     isthick = True
     _inherit_strengths = False
@@ -305,10 +312,10 @@ class DriftSliceRBend(BeamElement):
 
 class DriftSliceQuadrupole(BeamElement):
     allow_rot_and_shift = False
+    allow_loss_refinement = True
     rot_and_shift_from_parent = False
     _skip_in_to_dict = ['_parent']
     has_backtrack = True
-    allow_loss_refinement = True
     _force_moveable = True
     isthick = True
     _inherit_strengths = False
@@ -340,10 +347,10 @@ class DriftSliceQuadrupole(BeamElement):
 
 class DriftSliceSextupole(BeamElement):
     allow_rot_and_shift = False
+    allow_loss_refinement = True
     rot_and_shift_from_parent = False
     _skip_in_to_dict = ['_parent']
     has_backtrack = True
-    allow_loss_refinement = True
     _force_moveable = True
     isthick = True
     _inherit_strengths = False
@@ -375,10 +382,10 @@ class DriftSliceSextupole(BeamElement):
 
 class DriftSliceOctupole(BeamElement):
     allow_rot_and_shift = False
+    allow_loss_refinement = True
     rot_and_shift_from_parent = False
     _skip_in_to_dict = ['_parent']
     has_backtrack = True
-    allow_loss_refinement = True
     _force_moveable = True
     isthick = True
     _inherit_strengths = False
@@ -410,10 +417,10 @@ class DriftSliceOctupole(BeamElement):
 
 class DriftSlice(BeamElement):
     allow_rot_and_shift = False
+    allow_loss_refinement = True
     rot_and_shift_from_parent = False
     _skip_in_to_dict = ['_parent']
     has_backtrack = True
-    allow_loss_refinement = True
     _force_moveable = True
     isthick = True
     _inherit_strengths = False

{xtrack-0.86.2 → xtrack-0.86.4}/xtrack/line.py

@@ -3232,7 +3232,7 @@ class Line:
             self, element=element, update_every=update_every, **kwargs
         )
 
-    def compensate_radiation_energy_loss(self, delta0=0, rtol_eneloss=1e-10,
+    def compensate_radiation_energy_loss(self, delta0='zero_mean', rtol_eneloss=1e-10,
                                     max_iter=100, **kwargs):
 
         """
@@ -3242,7 +3242,9 @@ class Line:
         Parameters
         ----------
         delta0: float
-            Initial energy deviation.
+            Initial energy deviation. If `delta0='zero_mean'` is specified, the
+            compensation is done such that the mean energy deviation along the
+            ring is zero.
         rtol_eneloss: float
             Relative tolerance on energy loss.
         max_iter: int

{xtrack-0.86.2 → xtrack-0.86.4}/xtrack/loss_location_refinement/loss_location_refinement.py

@@ -9,9 +9,9 @@ from scipy.spatial import ConvexHull
 import xobjects as xo
 import xtrack as xt
 
-from ..beam_elements import LimitPolygon, XYShift, SRotation, Drift, Marker
-from ..line import (Line, _is_thick, _behaves_like_drift, _allow_loss_refinement,
-                    _has_backtrack, _is_aperture)
+from ..beam_elements import LimitPolygon, XYShift, SRotation
+from ..line import (Line, _is_thick, _allow_loss_refinement, _has_backtrack,
+                    _is_aperture)
 
 from ..general import _print
 
@@ -68,6 +68,7 @@ class LossLocationRefinement:
         if line.iscollective:
             self._original_line = line
             self.line = line._get_non_collective_line()
+            self.line.build_tracker(_buffer=line._buffer)
         else:
             self._original_line = line
             self.line = line
@@ -136,6 +137,11 @@ class LossLocationRefinement:
                 i_aper_0 = self.i_apertures[self.i_apertures.index(i_ap) - 1]
                 logger.debug(f'i_aper_1={i_aper_1}, i_aper_0={i_aper_0}')
 
+                for ii in range(i_aper_0, i_aper_1):
+                    ee = self._original_line[ii]
+                    if _skip_in_loss_location_refinement(ee, self._original_line):
+                        return
+
                 s0, s1, _ = generate_interp_aperture_locations(self.line,
                                                    i_aper_0, i_aper_1, self.ds)
                 assert s1 >= s0
@@ -312,10 +318,8 @@ def interp_aperture_replicate(context, line,
                               i_aper_0, i_aper_1,
                               ds, _ln_gen, mode='end',):
 
-    temp_buf = context.new_buffer()
-
-    i_start_thin_1 = find_adjacent_drift(line, i_aper_1, direction='upstream') + 1
-    i_end_thin_0 = find_adjacent_drift(line, i_aper_0, direction='downstream') - 1
+    i_start_thin_1 = find_adjacent_thick(line, i_aper_1, direction='upstream') + 1
+    i_end_thin_0 = find_adjacent_thick(line, i_aper_0, direction='downstream') - 1
 
     s0, s1, s_vect = generate_interp_aperture_locations(line,
                                                    i_aper_0, i_aper_1, ds)
@@ -328,13 +332,13 @@ def interp_aperture_replicate(context, line,
         raise ValueError(f'Invalid mode: {mode}')
     interp_apertures = []
     for ss in s_vect:
-        interp_apertures.append(aper_to_copy.copy(_buffer=temp_buf))
+        interp_apertures.append(aper_to_copy.copy(_buffer=line._buffer))
 
     interp_line = build_interp_line(
-            _buffer=temp_buf,
+            _buffer=line._buffer,
             s0=s0, s1=s1, s_interp=s_vect,
-            aper_0=aper_to_copy.copy(_buffer=temp_buf),
-            aper_1=aper_to_copy.copy(_buffer=temp_buf),
+            aper_0=aper_to_copy.copy(_buffer=line._buffer),
+            aper_1=aper_to_copy.copy(_buffer=line._buffer),
             aper_interp=interp_apertures,
             line=line, i_start_thin_0=i_end_thin_0,
             i_start_thin_1=i_start_thin_1,
@@ -346,16 +350,15 @@ def interp_aperture_using_polygons(context, line,
                        i_aper_0, i_aper_1,
                        n_theta, r_max, dr, ds, _ln_gen):
 
-    temp_buf = context.new_buffer()
 
     polygon_1, i_start_thin_1 = characterize_aperture(line,
                                  i_aper_1, n_theta, r_max, dr,
-                                 buffer_for_poly=temp_buf,
+                                 buffer_for_poly=line._buffer,
                                  coming_from='upstream')
 
     polygon_0, i_end_thin_0 = characterize_aperture(line, i_aper_0,
                                  n_theta, r_max, dr,
-                                 buffer_for_poly=temp_buf,
+                                 buffer_for_poly=line._buffer,
                                  coming_from='downstream')
 
     s0, s1, s_vect = generate_interp_aperture_locations(line,
@@ -373,12 +376,12 @@ def interp_aperture_using_polygons(context, line,
         x_hull = x_non_convex[i_hull]
         y_hull = y_non_convex[i_hull]
         interp_polygons.append(LimitPolygon(
-            _buffer=temp_buf,
+            _buffer=line._buffer,
             x_vertices=x_hull,
             y_vertices=y_hull))
 
     interp_line = build_interp_line(
-            _buffer=temp_buf,
+            _buffer=line._buffer,
             s0=s0, s1=s1, s_interp=s_vect,
             aper_0=polygon_0, aper_1=polygon_1,
             aper_interp=interp_polygons,
@@ -401,47 +404,60 @@ def generate_interp_aperture_locations(line, i_aper_0, i_aper_1, ds):
 
     return s0, s1, s_vect
 
+class InterpAperNameGenerator:
+    def __init__(self, line):
+        self.counter = 0
+        self.line = line
+
+    def get_name(self):
+        nn_insert = f'_interp_aper_{self.counter}'
+        while nn_insert in self.line.element_names:
+            self.counter += 1
+            nn_insert = f'_interp_aper_{self.counter}'
+        name = nn_insert
+        self.counter += 1
+        return name
+
 def build_interp_line(_buffer, s0, s1, s_interp, aper_0, aper_1, aper_interp,
                          line, i_start_thin_0, i_start_thin_1, _ln_gen):
 
-    # Build interp line
-    s_elements = [s0] + list(s_interp) +[s1]
-    elements = [aper_0] + aper_interp + [aper_1]
+    env = line.env
 
-    for i_ele in range(i_start_thin_0+1, i_start_thin_1):
-        ee = line.elements[i_ele]
-        if not _behaves_like_drift(ee, line):
-            assert not _is_thick(ee, line)
-            ss_ee = line.tracker._tracker_data_base.element_s_locations[i_ele]
-            elements.append(ee.copy(_buffer=_buffer))
-            s_elements.append(ss_ee)
-    i_sorted = np.argsort(s_elements)
-    s_sorted = list(np.take(s_elements, i_sorted))
-    ele_sorted = list(np.take(elements, i_sorted))
+    interp_line = env.new_line(
+        components=line.element_names[i_start_thin_0+1 : i_start_thin_1])
 
-    s_all = [s_sorted[0]]
-    ele_all = [ele_sorted[0]]
+    namegen = InterpAperNameGenerator(line=interp_line)
+    nn0 = namegen.get_name()
 
-    for ii in range(1, len(s_sorted)):
-        ss = s_sorted[ii]
+    # Start aperture
+    assert aper_0._buffer is _buffer
+    env.elements[nn0] = aper_0
+    interp_line.element_names.insert(0, nn0)
 
-        if ss-s_all[-1]>1e-14:
-            ele_all.append(Drift(_buffer=_buffer, length=ss-s_all[-1]))
-            s_all.append(ss)
-        ele_all.append(ele_sorted[ii])
-        s_all.append(s_sorted[ii])
+    # Interpolated apertures
+    insertions = []
+    for ss, aa in zip(s_interp, aper_interp):
+        nn_insert = namegen.get_name()
+        assert aa._buffer is _buffer
+        interp_line.env.elements[nn_insert] = aa
+        insertions.append(interp_line.env.place(nn_insert, at=ss-s0))
+    interp_line.insert(insertions)
 
-    interp_line = Line(elements=ele_all)
+    # End aperture
+    nn_1 = namegen.get_name()
+    assert aper_1._buffer is _buffer
+    interp_line.env.elements[nn_1] = aper_1
+    interp_line.element_names.append(nn_1)
 
+    # Build it
     interp_line.build_tracker(_buffer=_buffer,
                               track_kernel=_ln_gen.tracker.track_kernel)
     interp_line.reset_s_at_end_turn = False
     interp_line.config.XTRACK_GLOBAL_XY_LIMIT = _ln_gen.config.XTRACK_GLOBAL_XY_LIMIT
 
-
     return interp_line
 
-def find_adjacent_drift(line, i_element, direction):
+def find_adjacent_thick(line, i_element, direction):
 
     ii=i_element
     found = False
@@ -454,18 +470,14 @@ def find_adjacent_drift(line, i_element, direction):
         ee = line.element_dict[line.element_names[ii]]
         if isinstance(ee, xt.Replica):
             ee = ee.resolve(line)
-        ccnn = ee.__class__.__name__
-        #_print(ccnn)
-        if ccnn.startswith('Drift'):
-            found = True
-        elif _behaves_like_drift(ee, line):
+        if _is_thick(ee, line):
             found = True
         else:
             ii += increment
 
     return ii
 
-def find_previous_drift(line, i_aperture):
+def find_previous_thick(line, i_aperture):
 
     ii=i_aperture
     found = False
@@ -473,10 +485,7 @@ def find_previous_drift(line, i_aperture):
         ee = line.element_dict[line.element_names[ii]]
         if isinstance(ee, xt.Replica):
             ee = ee.resolve(line)
-        ccnn = ee.__class__.__name__
-        if ccnn == 'Drift':
-            found = True
-        elif _behaves_like_drift(ee, line):
+        if _is_thick(ee, line):
             found = True
         else:
             ii -= 1
@@ -493,14 +502,14 @@ def characterize_aperture(line, i_aperture, n_theta, r_max, dr,
 
     assert coming_from in ['upstream', 'downstream']
 
-    # find previous drift
+    # find previous thick
     if coming_from == 'upstream':
-        i_start = find_adjacent_drift(line, i_aperture, 'upstream') + 1
+        i_start = find_adjacent_thick(line, i_aperture, 'upstream') + 1
         i_stop = i_aperture + 1
         backtrack = False
         index_start_thin = i_start
     elif coming_from == 'downstream':
-        i_stop = find_adjacent_drift(line, i_aperture, 'downstream')
+        i_stop = find_adjacent_thick(line, i_aperture, 'downstream')
         i_start = i_aperture
         backtrack = 'force'
         assert np.all([_has_backtrack(ee, line) for ee in