xtrack 0.93.1__tar.gz → 0.94.0__tar.gz

{xtrack-0.93.1/xtrack.egg-info → xtrack-0.94.0}/PKG-INFO

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

{xtrack-0.93.1 → xtrack-0.94.0}/tests/test_acceleration.py

@@ -256,12 +256,12 @@ def test_acceleration_transverse_shrink(test_context):
 
     # Build a function with these samples and link it to the cavity
     line.functions['fun_f_rf'] = xt.FunctionPieceWiseLinear(x=t_rf, y=f_rf)
-    line.element_refs['br1.acwf5l1.1'].frequency = line.functions['fun_f_rf'](
+    line['br1.acwf5l1.1'].frequency = line.functions['fun_f_rf'](
                                                             line.vars['t_turn_s'])
 
     # Setup voltage and lag
-    line.element_refs['br1.acwf5l1.1'].voltage = 3000 # V
-    line.element_refs['br1.acwf5l1.1'].lag = 0 # degrees (below transition energy)
+    line['br1.acwf5l1.1'].voltage = 3000 # V
+    line['br1.acwf5l1.1'].lag = 0 # degrees (below transition energy)
 
     # When setting line.vars['t_turn_s'] the reference energy and the rf frequency
     # are updated automatically

{xtrack-0.93.1 → xtrack-0.94.0}/tests/test_aperture_table.py

@@ -66,9 +66,9 @@ def test_aperture_table():
         'veba.20250.b_aper', 'drift_334..1', 'vebb.20270.a_aper',
         'drift_334..2', 'mbb.20270', 'drift_335..0', 'vebb.20270.b_aper']))
     xo.assert_allclose(aper_check.s, np.array([
-        1225.8247    , 1225.8247    , 1226.02017417, 1232.28019277,
-        1232.4827    , 1232.4827    , 1232.4847    , 1232.4847    ,
-        1232.67019277, 1238.93021138, 1239.1227    ]), rtol=0, atol=1e-6)
+       1225.8247   , 1225.8247   , 1226.0176907, 1232.2777093,
+       1232.4827   , 1232.4827   , 1232.4847   , 1232.4847   ,
+       1232.6676907, 1238.9277093, 1239.1227   ]), rtol=0, atol=1e-6)
     xo.assert_allclose(aper_check.x_aper_low, np.array(
         [-0.0765, -0.0765, -0.0765, -0.0765, -0.0765, -0.0765, -0.0645,
         -0.0645, -0.0645, -0.0645, -0.0645]), rtol=0, atol=1e-3)

{xtrack-0.93.1 → xtrack-0.94.0}/tests/test_attr_replicas_and_slices.py

@@ -94,63 +94,63 @@ def _make_line_with_expressions():
 
     line.vars['length_drift'] = 999.
 
-    line.element_refs['e0'].k0 = line.vars['k0_bend']
-    line.element_refs['e0'].angle = line.vars['angle_bend']
-    line.element_refs['e0'].length = line.vars['length_bend']
-    line.element_refs['e0'].shift_x = line.vars['shift_x_bend']
-    line.element_refs['e0'].shift_y = line.vars['shift_y_bend']
-    line.element_refs['e0'].shift_s = line.vars['shift_s_bend']
-    line.element_refs['e0'].rot_s_rad = line.vars['rot_s_rad_bend']
-    line.element_refs['e0'].k1 = line.vars['k1_bend']
-    line.element_refs['e0'].knl[0] = line.vars['knl_bend_0']
-    line.element_refs['e0'].knl[1] = line.vars['knl_bend_1']
-    line.element_refs['e0'].knl[2] = line.vars['knl_bend_2']
-    line.element_refs['e0'].knl[3] = line.vars['knl_bend_3']
-    line.element_refs['e0'].ksl[0] = line.vars['ksl_bend_0']
-    line.element_refs['e0'].ksl[1] = line.vars['ksl_bend_1']
-    line.element_refs['e0'].ksl[2] = line.vars['ksl_bend_2']
-    line.element_refs['e0'].ksl[3] = line.vars['ksl_bend_3']
-
-    line.element_refs['e1'].k1 = line.vars['k1_quad']
-    line.element_refs['e1'].k1s = line.vars['k1s_quad']
-    line.element_refs['e1'].length = line.vars['length_quad']
-    line.element_refs['e1'].shift_x = line.vars['shift_x_quad']
-    line.element_refs['e1'].shift_y = line.vars['shift_y_quad']
-    line.element_refs['e1'].shift_s = line.vars['shift_s_quad']
-    line.element_refs['e1'].rot_s_rad = line.vars['rot_s_rad_quad']
-
-    line.element_refs['e2'].k2 = line.vars['k2_sext']
-    line.element_refs['e2'].k2s = line.vars['k2s_sext']
-    line.element_refs['e2'].length = line.vars['length_sext']
-    line.element_refs['e2'].shift_x = line.vars['shift_x_sext']
-    line.element_refs['e2'].shift_y = line.vars['shift_y_sext']
-    line.element_refs['e2'].shift_s = line.vars['shift_s_sext']
-    line.element_refs['e2'].rot_s_rad = line.vars['rot_s_rad_sext']
-
-    line.element_refs['e3'].k3 = line.vars['k3_octu']
-    line.element_refs['e3'].k3s = line.vars['k3s_octu']
-    line.element_refs['e3'].length = line.vars['length_octu']
-    line.element_refs['e3'].shift_x = line.vars['shift_x_octu']
-    line.element_refs['e3'].shift_y = line.vars['shift_y_octu']
-    line.element_refs['e3'].shift_s = line.vars['shift_s_octu']
-    line.element_refs['e3'].rot_s_rad = line.vars['rot_s_rad_octu']
-
-    line.element_refs['e4'].knl[0] = line.vars['knl_mult_0']
-    line.element_refs['e4'].knl[1] = line.vars['knl_mult_1']
-    line.element_refs['e4'].knl[2] = line.vars['knl_mult_2']
-    line.element_refs['e4'].knl[3] = line.vars['knl_mult_3']
-    line.element_refs['e4'].ksl[0] = line.vars['ksl_mult_0']
-    line.element_refs['e4'].ksl[1] = line.vars['ksl_mult_1']
-    line.element_refs['e4'].ksl[2] = line.vars['ksl_mult_2']
-    line.element_refs['e4'].ksl[3] = line.vars['ksl_mult_3']
-    line.element_refs['e4'].length = line.vars['length_mult']
-    line.element_refs['e4'].shift_x = line.vars['shift_x_mult']
-    line.element_refs['e4'].shift_y = line.vars['shift_y_mult']
-    line.element_refs['e4'].shift_s = line.vars['shift_s_mult']
-    line.element_refs['e4'].rot_s_rad = line.vars['rot_s_rad_mult']
-    line.element_refs['e4'].hxl = line.vars['hxl_mult']
-
-    line.element_refs['e5'].length = line.vars['length_drift']
+    line['e0'].k0 = line.vars['k0_bend']
+    line['e0'].angle = line.vars['angle_bend']
+    line['e0'].length = line.vars['length_bend']
+    line['e0'].shift_x = line.vars['shift_x_bend']
+    line['e0'].shift_y = line.vars['shift_y_bend']
+    line['e0'].shift_s = line.vars['shift_s_bend']
+    line['e0'].rot_s_rad = line.vars['rot_s_rad_bend']
+    line['e0'].k1 = line.vars['k1_bend']
+    line['e0'].knl[0] = line.vars['knl_bend_0']
+    line['e0'].knl[1] = line.vars['knl_bend_1']
+    line['e0'].knl[2] = line.vars['knl_bend_2']
+    line['e0'].knl[3] = line.vars['knl_bend_3']
+    line['e0'].ksl[0] = line.vars['ksl_bend_0']
+    line['e0'].ksl[1] = line.vars['ksl_bend_1']
+    line['e0'].ksl[2] = line.vars['ksl_bend_2']
+    line['e0'].ksl[3] = line.vars['ksl_bend_3']
+
+    line['e1'].k1 = line.vars['k1_quad']
+    line['e1'].k1s = line.vars['k1s_quad']
+    line['e1'].length = line.vars['length_quad']
+    line['e1'].shift_x = line.vars['shift_x_quad']
+    line['e1'].shift_y = line.vars['shift_y_quad']
+    line['e1'].shift_s = line.vars['shift_s_quad']
+    line['e1'].rot_s_rad = line.vars['rot_s_rad_quad']
+
+    line['e2'].k2 = line.vars['k2_sext']
+    line['e2'].k2s = line.vars['k2s_sext']
+    line['e2'].length = line.vars['length_sext']
+    line['e2'].shift_x = line.vars['shift_x_sext']
+    line['e2'].shift_y = line.vars['shift_y_sext']
+    line['e2'].shift_s = line.vars['shift_s_sext']
+    line['e2'].rot_s_rad = line.vars['rot_s_rad_sext']
+
+    line['e3'].k3 = line.vars['k3_octu']
+    line['e3'].k3s = line.vars['k3s_octu']
+    line['e3'].length = line.vars['length_octu']
+    line['e3'].shift_x = line.vars['shift_x_octu']
+    line['e3'].shift_y = line.vars['shift_y_octu']
+    line['e3'].shift_s = line.vars['shift_s_octu']
+    line['e3'].rot_s_rad = line.vars['rot_s_rad_octu']
+
+    line['e4'].knl[0] = line.vars['knl_mult_0']
+    line['e4'].knl[1] = line.vars['knl_mult_1']
+    line['e4'].knl[2] = line.vars['knl_mult_2']
+    line['e4'].knl[3] = line.vars['knl_mult_3']
+    line['e4'].ksl[0] = line.vars['ksl_mult_0']
+    line['e4'].ksl[1] = line.vars['ksl_mult_1']
+    line['e4'].ksl[2] = line.vars['ksl_mult_2']
+    line['e4'].ksl[3] = line.vars['ksl_mult_3']
+    line['e4'].length = line.vars['length_mult']
+    line['e4'].shift_x = line.vars['shift_x_mult']
+    line['e4'].shift_y = line.vars['shift_y_mult']
+    line['e4'].shift_s = line.vars['shift_s_mult']
+    line['e4'].rot_s_rad = line.vars['rot_s_rad_mult']
+    line['e4'].hxl = line.vars['hxl_mult']
+
+    line['e5'].length = line.vars['length_drift']
 
     return line
 

{xtrack-0.93.1 → xtrack-0.94.0}/tests/test_cavity_absolute_time.py

@@ -4,6 +4,8 @@ import xobjects as xo
 import xtrack as xt
 from xobjects.test_helpers import for_all_test_contexts
 
+from scipy.constants import c as clight
+
 test_data_folder = pathlib.Path(
     __file__).parent.joinpath('../test_data').absolute()
 
@@ -32,8 +34,8 @@ def test_cavity_absolute_time(test_context):
     line.vars['f_rf'] = f_rf
     tt = line.get_table()
     for nn in tt.rows[tt.element_type=='Cavity'].name:
-        line.element_refs[nn].absolute_time = 1 # Need property
-        line.element_refs[nn].frequency = line.vars['f_rf']
+        line[nn].absolute_time = 1 # Need property
+        line[nn].frequency = line.vars['f_rf']
 
     tw1 = line.twiss(search_for_t_rev=True)
 

{xtrack-0.93.1 → xtrack-0.94.0}/tests/test_coasting.py

@@ -21,7 +21,7 @@ def test_coasting():
     tt = line.get_table()
     ttcav = tt.rows[tt.element_type == 'Cavity']
     for nn in ttcav.name:
-        line.element_refs[nn].voltage=0
+        line[nn].voltage=0
 
     line.configure_bend_model(core='bend-kick-bend', edge='full')
     line.twiss_default['method'] = '4d'

{xtrack-0.93.1 → xtrack-0.94.0}/tests/test_collective_tracker.py

@@ -36,6 +36,7 @@ def test_get_non_collective_line(test_context):
         elements=[xt.Drift(length=1) for i in range(8)],
         element_names=[f'e{i}' for i in range(8)]
     )
+
     line['e3'].iscollective = True
     e3_buffer = line['e3']._buffer
     e3 = line.get('e3')

{xtrack-0.93.1 → xtrack-0.94.0}/tests/test_elements_thick.py

@@ -1474,7 +1474,7 @@ def test_solenoid_shifted_and_rotated_multipolar_kick(test_context):
     line_test = xt.Line(elements=[solenoid])
     line_test.build_tracker(_context=test_context)
 
-    elements_ref = [solenoid_no_kick] + 3 * [
+    elements_sol = [solenoid_no_kick] + 3 * [
         xt.XYShift(dx=mult_shift_x),
         xt.YRotation(angle=np.rad2deg(-mult_rot_y_rad)),
         kick,
@@ -1482,7 +1482,7 @@ def test_solenoid_shifted_and_rotated_multipolar_kick(test_context):
         xt.XYShift(dx=-mult_shift_x),
         solenoid_no_kick
     ]
-    line_ref = xt.Line(elements=elements_ref)
+    line_ref = xt.Line(elements=elements_sol)
     line_ref.build_tracker(_context=test_context)
 
     p0 = xt.Particles(x=1e-2, px=-2e-4, y=-2e-2, py=3e-4, zeta=1e-2, delta=1e-3)