Merge branch 'release/0.25.5'

Author: szymonlopaciuk

examples/005_ibs/000_growth_rates_no_vdisp.py

@@ -9,8 +9,7 @@
 # Load xt.Line from file #
 ##########################
 
-fname_line_particles = "../../../xtrack/test_data/sps_ions/line_and_particle.json"
-line = xt.Line.from_json(fname_line_particles)
+line = xt.load("../../../xtrack/test_data/sps_ions/line_and_particle.json")
 tw = line.twiss(method="4d")
 
 #####################

examples/005_ibs/001_growth_rates_with_vdisp.py

@@ -3,22 +3,14 @@
 # Copyright (c) CERN, 2021.                   #
 # ########################################### #
 
-import json
-
 import xtrack as xt
 
 ##########################
 # Load xt.Line from file #
 ##########################
 
-fname_line_particles = "../../../xtrack/test_data/lhc_no_bb/" \
-                       "line_and_particle.json"
-
-with open(fname_line_particles, "r") as fid:
-    input_data = json.load(fid)
-
-line = xt.Line.from_json(fname_line_particles)
-line.particle_ref = xt.Particles.from_dict(input_data["particle"])
+line = xt.load( "../../../xtrack/test_data/lhc_no_bb/line_and_particle.json")
+line.set_particle_ref('proton', p0c=7e12)
 tw = line.twiss(method="4d")
 
 #####################

examples/005_ibs/002_growth_rates_conventions.py

@@ -9,8 +9,7 @@
 # Load xt.Line from file #
 ##########################
 
-fname_line_particles = "../../../xtrack/test_data/sps_ions/line_and_particle.json"
-line = xt.Line.from_json(fname_line_particles)
+line = xt.load("../../../xtrack/test_data/sps_ions/line_and_particle.json")
 tw = line.twiss(method="4d")
 
 #####################

examples/005_ibs/003_tracking_with_kicks.py

@@ -16,7 +16,7 @@
 # This is SPS line with proton as particle ref
 fname_line_particles = "../../../xtrack/test_data/sps_w_spacecharge/"\
                        "line_no_spacecharge_and_particle.json"
-line: xt.Line = xt.Line.from_json(fname_line_particles)
+line = xt.load(fname_line_particles)
 line.build_tracker(_context=context)
 
 #######################################
@@ -56,7 +56,6 @@
     nemitt_y=nemitt_y,
     sigma_z=bunch_length,
     line=line,
-    _context=context,
 )
 
 ##############################################

examples/005_ibs/004_tracking_with_kicks_tbt_emittances.py

@@ -10,16 +10,11 @@
 import numpy as np
 import matplotlib.pyplot as plt
 
-# context = xo.ContextCupy()
-context = xo.ContextCpu(omp_num_threads="auto")
-
 ##########################
 # Load xt.Line from file #
 ##########################
 
-fname_line_particles = "../../../xtrack/test_data/clic_dr/line.json"
-line: xt.Line = xt.Line.from_json(fname_line_particles)
-line.build_tracker(_context=context)
+line = xt.load("../../../xtrack/test_data/clic_dr/line.json")
 cavities = [element for element in line.elements if isinstance(element, xt.Cavity)]
 for cavity in cavities:
     cavity.lag = 180
@@ -49,10 +44,10 @@
     nemitt_y=3.7e-9,
     sigma_z=1.58e-3,
     line=line,
-    _context=context,
 )
 
 for turn in range(nturns):
+    print(f"Tracking turn {turn+1}/{nturns}     ", end="\r", flush=True)    
     line.track(particles, num_turns=1)
     epsx.append(_gemitt_x(particles, tw.betx[0], tw.dx[0]))
     epsy.append(_gemitt_y(particles, tw.bety[0], tw.dy[0]))

examples/005_ibs/005_steady_state_emittances_coupling.py

@@ -10,9 +10,7 @@
 # Load xt.Line from file #
 ##########################
 
-fname_line_particles = "../../../xtrack/test_data/bessy3/bessy3.json"
-line = xt.Line.from_json(fname_line_particles)  # has particle_ref
-line.build_tracker()
+line = xt.load("../../../xtrack/test_data/bessy3/bessy3.json")
 
 ########################
 # Twiss with Radiation #

examples/005_ibs/006_steady_state_emittances_excitation.py

@@ -10,9 +10,7 @@
 # Load xt.Line from file #
 ##########################
 
-fname_line_particles = "../../../xtrack/test_data/bessy3/bessy3.json"
-line = xt.Line.from_json(fname_line_particles)  # has particle_ref
-line.build_tracker()
+line = xt.load("../../../xtrack/test_data/bessy3/bessy3.json")
 
 ########################
 # Twiss with Radiation #