Merge branch 'release/0.95.0'

Author: szymonlopaciuk

examples/acceleration/000_acceleration.py

@@ -13,7 +13,6 @@
 
 energy_increase = xt.ReferenceEnergyIncrease(Delta_p0c=Delta_p0c)
 line.append_element(energy_increase, 'energy_increase')
-line.build_tracker()
 
 particles = xt.Particles(p0c=26e9, zeta=np.linspace(-1, 1, 40))
 

examples/acceleration/001_energy_ramp.py

@@ -2,13 +2,9 @@
 from cpymad.madx import Madx
 import xtrack as xt
 
-# Import a line and build a tracker
-line = xt.load(
-    '../../test_data/psb_injection/line_and_particle.json')
-e_kin_start_eV = 160e6
-line.particle_ref = xt.Particles(mass0=xt.PROTON_MASS_EV, q0=1.,
-                                 energy0=xt.PROTON_MASS_EV + e_kin_start_eV)
-line.build_tracker()
+# Import a line
+line = xt.load('../../test_data/psb_injection/line_and_particle.json')
+line.set_particle_ref('proton', kinetic_energy0=160e6)
 
 tw0 = line.twiss4d()
 

examples/acceleration/002_energy_ramp_transverse.py

@@ -1,26 +1,11 @@
 import numpy as np
-from cpymad.madx import Madx
 import xtrack as xt
 
 # Import a line and build a tracker
-
-test_data_folder = '../../test_data'
-
-mad = Madx(stdout=False)
-
-# Load mad model and apply element shifts
-mad.input(f'''
-call, file = '{str(test_data_folder)}/psb_chicane/psb.seq';
-call, file = '{str(test_data_folder)}/psb_chicane/psb_fb_lhc.str';
-beam;
-use, sequence=psb1;
-''')
-
-line = xt.Line.from_madx_sequence(mad.sequence.psb1,
-                                    deferred_expressions=True)
-e_kin_start_eV = 160e6
-line.particle_ref = xt.Particles(mass0=xt.PROTON_MASS_EV, q0=1.,
-                                 energy0=xt.PROTON_MASS_EV + e_kin_start_eV)
+env = xt.load('../../test_data/psb_chicane/psb.seq')
+env.vars.load('../../test_data/psb_chicane/psb_fb_lhc.str')
+line = env.psb1
+line.set_particle_ref('proton', kinetic_energy0=160e6)
 
 # Slice to gain some tracking speed
 line.slice_thick_elements(

examples/amplitude_detuning/000_detuning.py

@@ -7,8 +7,7 @@
 
 line = xt.Line(elements=[xt.LineSegmentMap(qx=62.31, qy=60.32,
                         det_xx=1000, det_xy=10, det_yx=20, det_yy=2000)])
-line.particle_ref = xt.Particles(p0c=7e9)
-line.build_tracker()
+line.set_particle_ref('proton', p0c=7e12)
 
 nemitt_x = 2.5e-6
 nemitt_y = 2.5e-6

examples/boris_spatial/000_conventional_boris.py

@@ -181,7 +181,6 @@
 line = xt.Line(elements=[xt.VariableSolenoid(length=dz,
                                     ks_profile=[ks_entry[ii], ks_exit[ii]])
                             for ii in range(len(z_axis)-1)])
-line.build_tracker()
 line.configure_radiation(model='mean')
 
 p_xt = p0.copy()

examples/boris_spatial/001_spatial_boris.py

@@ -51,7 +51,6 @@
 line = xt.Line(elements=[xt.VariableSolenoid(length=dz,
                                     ks_profile=[ks_entry[ii], ks_exit[ii]])
                             for ii in range(len(z_axis)-1)])
-line.build_tracker()
 
 p_xt = p0.copy()
 line.track(p_xt, turn_by_turn_monitor='ONE_TURN_EBE')

examples/boris_spatial/004_study_convergence.py

@@ -66,7 +66,6 @@ def get_field(self, x, y, s):
                                             s_end=sf.s4,
                                             n_steps=n_steps)
     line = xt.Line(elements=[integrator])
-    line.build_tracker()
     R_obj = line.compute_one_turn_matrix_finite_differences(particle_on_co=p0.copy(),
                                                         include_collective=True
                                                     )

examples/collimation/001_loss_location_refinement.py

@@ -17,20 +17,17 @@
 # Build test line #
 ###################
 
-ctx = xo.context_default
-buf = ctx.new_buffer()
-
 # We build a test line having two aperture elements which are shifted and
 # rotated w.r.t. the accelerator reference frame.
 
 # Define aper_0
-aper_0 = xt.LimitEllipse(_buffer=buf, a=2e-2, b=1e-2)
+aper_0 = xt.LimitEllipse(a=2e-2, b=1e-2)
 shift_aper_0 = (1e-2, 0.5e-2)
 rot_deg_aper_0 = 10.
 
 # Define aper_1
-aper_1 = xt.LimitRect(_buffer=buf, min_x=-1e-2, max_x=1e-2,
-                                   min_y=-2e-2, max_y=2e-2)
+aper_1 = xt.LimitRect(min_x=-1e-2, max_x=1e-2,
+                      min_y=-2e-2, max_y=2e-2)
 shift_aper_1 = (-5e-3, 1e-2)
 rot_deg_aper_1 = 10.
 aper_1.shift_x = shift_aper_1[0]
@@ -40,39 +37,35 @@
 
 # aper_0_sandwitch
 line_aper_0 = xt.Line(
-    elements=[xt.XYShift(_buffer=buf, dx=shift_aper_0[0], dy=shift_aper_0[1]),
-              xt.SRotation(_buffer=buf, angle=rot_deg_aper_0),
+    elements=[xt.XYShift(dx=shift_aper_0[0], dy=shift_aper_0[1]),
+              xt.SRotation(angle=rot_deg_aper_0),
               aper_0,
-              xt.Multipole(_buffer=buf, knl=[0.001]),
-              xt.SRotation(_buffer=buf, angle=-rot_deg_aper_0),
-              xt.XYShift(_buffer=buf, dx=-shift_aper_0[0], dy=-shift_aper_0[1])])
-line_aper_0.build_tracker(_buffer=buf)
+              xt.Multipole(knl=[0.001]),
+              xt.SRotation(angle=-rot_deg_aper_0),
+              xt.XYShift(dx=-shift_aper_0[0], dy=-shift_aper_0[1])])
 
 # aper_1_sandwitch
 line_aper_1 = xt.Line(
     elements=[aper_1,
-              xt.Multipole(_buffer=buf, knl=[0.001])
+              xt.Multipole(knl=[0.001])
         ])
-line_aper_1.build_tracker(_buffer=buf)
 
 #################
 # Build tracker #
 #################
 
 line=xt.Line(
-    elements = ((xt.Drift(_buffer=buf, length=0.5),)
+    elements = ((xt.Drift(length=0.5),)
                 + line_aper_0.elements
-                + (xt.Drift(_buffer=buf, length=1),
-                   xt.Drift(_buffer=buf, length=1),
-                   xt.Drift(_buffer=buf, length=1.),)
+                + (xt.Drift(length=1),
+                   xt.Drift(length=1),
+                   xt.Drift(length=1.),)
                 + line_aper_1.elements))
-line.build_tracker(_buffer=buf)
 num_elements = len(line.element_names)
 
 # Generate test particles
-particles = xt.Particles(_context=ctx,
-            px=np.random.uniform(-0.01, 0.01, 10000),
-            py=np.random.uniform(-0.01, 0.01, 10000))
+particles = xt.Particles(px=np.random.uniform(-0.01, 0.01, 10000),
+                         py=np.random.uniform(-0.01, 0.01, 10000))
 
 #########
 # Track #
@@ -111,8 +104,8 @@
                                 loss_loc_refinement.i_apertures[1]]
 s0 = interp_line.s0
 s1 = interp_line.s1
-polygon_0 = interp_line.elements[0]
-polygon_1 = interp_line.elements[-1]
+polygon_0 = interp_line._elements[0]
+polygon_1 = interp_line._elements[-1]
 for ii, (ln, poly) in enumerate(
                          zip([line_aper_0, line_aper_1],
                              [polygon_0, polygon_1])):
@@ -127,7 +120,6 @@
     ln.track(pp)
     ids = pp.particle_id
 
-
     fig = plt.figure(ii+1)
     ax = fig.add_subplot(111)
     plt.plot(x0, y0, '.', color='red')

examples/collimation/001b_loss_location_refinement_thick_elements.py

@@ -17,20 +17,17 @@
 # Build test line #
 ###################
 
-ctx = xo.context_default
-buf = ctx.new_buffer()
-
 # We build a test line having two aperture elements which are shifted and
 # rotated w.r.t. the accelerator reference frame.
 
 # Define aper_0
-aper_0 = xt.LimitEllipse(_buffer=buf, a=2e-2, b=1e-2)
+aper_0 = xt.LimitEllipse(a=2e-2, b=1e-2)
 shift_aper_0 = (1e-2, 0.5e-2)
 rot_deg_aper_0 = 10.
 
 # Define aper_1
-aper_1 = xt.LimitRect(_buffer=buf, min_x=-1e-2, max_x=1e-2,
-                                   min_y=-2e-2, max_y=2e-2)
+aper_1 = xt.LimitRect(min_x=-1e-2, max_x=1e-2,
+                      min_y=-2e-2, max_y=2e-2)
 shift_aper_1 = (-5e-3, 1e-2)
 rot_deg_aper_1 = 10.
 aper_1.shift_x = shift_aper_1[0]
@@ -40,39 +37,35 @@
 
 # aper_0_sandwitch
 line_aper_0 = xt.Line(
-    elements=[xt.XYShift(_buffer=buf, dx=shift_aper_0[0], dy=shift_aper_0[1]),
-              xt.SRotation(_buffer=buf, angle=rot_deg_aper_0),
+    elements=[xt.XYShift(dx=shift_aper_0[0], dy=shift_aper_0[1]),
+              xt.SRotation(angle=rot_deg_aper_0),
               aper_0,
-              xt.Multipole(_buffer=buf, knl=[0.001]),
-              xt.SRotation(_buffer=buf, angle=-rot_deg_aper_0),
-              xt.XYShift(_buffer=buf, dx=-shift_aper_0[0], dy=-shift_aper_0[1])])
-line_aper_0.build_tracker(_buffer=buf)
+              xt.Multipole(knl=[0.001]),
+              xt.SRotation(angle=-rot_deg_aper_0),
+              xt.XYShift(dx=-shift_aper_0[0], dy=-shift_aper_0[1])])
 
 # aper_1_sandwitch
 line_aper_1 = xt.Line(
     elements=[aper_1,
-              xt.Multipole(_buffer=buf, knl=[0.001])
+              xt.Multipole(knl=[0.001])
         ])
-line_aper_1.build_tracker(_buffer=buf)
 
 #################
 # Build tracker #
 #################
 
 line=xt.Line(
-    elements = ((xt.Drift(_buffer=buf, length=0.5),)
+    elements = ((xt.Drift(length=0.5),)
                 + line_aper_0.elements
-                + (xt.Quadrupole(_buffer=buf, length=1),
-                   xt.Quadrupole(_buffer=buf, length=1),
-                   xt.Quadrupole(_buffer=buf, length=1.),)
+                + (xt.Quadrupole(length=1),
+                   xt.Quadrupole(length=1),
+                   xt.Quadrupole(length=1.),)
                 + line_aper_1.elements))
-line.build_tracker(_buffer=buf)
 num_elements = len(line.element_names)
 
 # Generate test particles
-particles = xt.Particles(_context=ctx,
-            px=np.random.uniform(-0.01, 0.01, 10000),
-            py=np.random.uniform(-0.01, 0.01, 10000))
+particles = xt.Particles(px=np.random.uniform(-0.01, 0.01, 10000),
+                         py=np.random.uniform(-0.01, 0.01, 10000))
 
 #########
 # Track #
@@ -111,8 +104,8 @@
                                 loss_loc_refinement.i_apertures[1]]
 s0 = interp_line.s0
 s1 = interp_line.s1
-polygon_0 = interp_line.elements[0]
-polygon_1 = interp_line.elements[-1]
+polygon_0 = interp_line._elements[0]
+polygon_1 = interp_line._elements[-1]
 for ii, (ln, poly) in enumerate(
                          zip([line_aper_0, line_aper_1],
                              [polygon_0, polygon_1])):

examples/collimation/002_loss_refinement_check_cone.py

@@ -18,67 +18,59 @@
 shift_x = 0.3e-2
 shift_y = 0.5e-2
 
-ctx = xo.context_default
-buf = ctx.new_buffer()
-
 logger = logging.getLogger('xtrack')
 logger.setLevel(logging.DEBUG)
 
 # Define aper_0
-aper_0 = xt.LimitEllipse(_buffer=buf, a=2e-2, b=2e-2)
+aper_0 = xt.LimitEllipse(a=2e-2, b=2e-2)
 shift_aper_0 = (shift_x, shift_y)
 rot_deg_aper_0 = 10.
 
 # Define aper_1
-aper_1 = xt.LimitEllipse(_buffer=buf, a=1e-2, b=1e-2)
+aper_1 = xt.LimitEllipse(a=1e-2, b=1e-2)
 shift_aper_1 = (shift_x, shift_y)
 rot_deg_aper_1 = 10.
 
 # aper_0_sandwitch
 line_aper_0 = xt.Line(
-    elements=[xt.XYShift(_buffer=buf, dx=shift_aper_0[0], dy=shift_aper_0[1]),
-              xt.SRotation(_buffer=buf, angle=rot_deg_aper_0),
+    elements=[xt.XYShift(dx=shift_aper_0[0], dy=shift_aper_0[1]),
+              xt.SRotation(angle=rot_deg_aper_0),
               aper_0,
-              xt.Multipole(_buffer=buf, knl=[0.00]),
-              xt.SRotation(_buffer=buf, angle=-rot_deg_aper_0),
-              xt.XYShift(_buffer=buf, dx=-shift_aper_0[0], dy=-shift_aper_0[1])])
-line_aper_0.build_tracker(_buffer=buf)
+              xt.Multipole(knl=[0.00]),
+              xt.SRotation(angle=-rot_deg_aper_0),
+              xt.XYShift(dx=-shift_aper_0[0], dy=-shift_aper_0[1])])
 
 # aper_1_sandwitch
 line_aper_1 = xt.Line(
-    elements=[xt.XYShift(_buffer=buf, dx=shift_aper_1[0], dy=shift_aper_1[1]),
-              xt.SRotation(_buffer=buf, angle=rot_deg_aper_1),
+    elements=[xt.XYShift(dx=shift_aper_1[0], dy=shift_aper_1[1]),
+              xt.SRotation(angle=rot_deg_aper_1),
               aper_1,
-              xt.Multipole(_buffer=buf, knl=[0.00]),
-              xt.SRotation(_buffer=buf, angle=-rot_deg_aper_1),
-              xt.XYShift(_buffer=buf, dx=-shift_aper_1[0], dy=-shift_aper_1[1])])
-line_aper_1.build_tracker(_buffer=buf)
+              xt.Multipole(knl=[0.00]),
+              xt.SRotation(angle=-rot_deg_aper_1),
+              xt.XYShift(dx=-shift_aper_1[0], dy=-shift_aper_1[1])])
 
 # Build example line
 line=xt.Line(
-    elements = ((xt.Drift(_buffer=buf, length=0.5),)
+    elements = ((xt.Drift(length=0.5),)
                 + line_aper_0.elements
-                + (xt.Drift(_buffer=buf, length=1),
-                   xt.Multipole(_buffer=buf, knl=[0.]),
-                   xt.Drift(_buffer=buf, length=1),
-                   xt.Cavity(_buffer=buf, voltage=3e6, frequency=400e6),
-                   xt.Drift(_buffer=buf, length=1.),)
+                + (xt.Drift(length=1),
+                   xt.Multipole(knl=[0.]),
+                   xt.Drift(length=1),
+                   xt.Cavity(voltage=3e6, frequency=400e6),
+                   xt.Drift(length=1.),)
                 + line_aper_1.elements))
 num_elements = len(line)
 
-line.build_tracker()
-
 # Test on full line
 r = np.linspace(0, 0.018, n_part)
 theta = np.linspace(0, 8*np.pi, n_part)
-particles = xt.Particles(_context=ctx,
+particles = xt.Particles(
         p0c=6500e9,
         x=r*np.cos(theta)+shift_x,
         y=r*np.sin(theta)+shift_y)
 
 line.track(particles)
 
-
 loss_loc_refinement = xt.LossLocationRefinement(line,
                                             n_theta = 360,
                                             r_max = 0.5, # m
@@ -118,8 +110,8 @@
                                     loss_loc_refinement.i_apertures[1]]
 s0 = interp_line.s0
 s1 = interp_line.s1
-polygon_0 = interp_line.elements[0]
-polygon_1 = interp_line.elements[-1]
+polygon_0 = interp_line._elements[0]
+polygon_1 = interp_line._elements[-1]
 for ii, (trkr, poly) in enumerate(
                          zip([line_aper_0,line_aper_1],
                              [polygon_0, polygon_1])):