xtrack 0.88.2__tar.gz → 0.88.4__tar.gz

{xtrack-0.88.2/xtrack.egg-info → xtrack-0.88.4}/PKG-INFO

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

{xtrack-0.88.2 → xtrack-0.88.4}/tests/test_aperture_table.py

@@ -14,9 +14,9 @@ def test_aperture_table():
         'vtaf.51632.b_aper', 'vbrta.51633.a_aper', 'vbrta.51633.b_aper',
         'bgiha.51634.a_aper', 'bgiva.51674.a_aper']
 
-    env = xt.load_madx_lattice(test_data_folder /
+    env = xt.load(test_data_folder /
                                'sps_with_apertures/EYETS 2024-2025.seq')
-    env.vars.load_madx(str(test_data_folder / 'sps_with_apertures/lhc_q20.str'))
+    env.vars.load(str(test_data_folder / 'sps_with_apertures/lhc_q20.str'))
     line = env.sps
     line.particle_ref = xt.Particles(mass0=xt.PROTON_MASS_EV, q0=1, p0c=26e9)
 

{xtrack-0.88.2 → xtrack-0.88.4}/tests/test_cavity_absolute_time.py

@@ -9,7 +9,7 @@ test_data_folder = pathlib.Path(
 
 @for_all_test_contexts
 def test_cavity_absolute_time(test_context):
-    line = xt.Line.from_json(test_data_folder /
+    line = xt.load(test_data_folder /
                             'hllhc15_thick/lhc_thick_with_knobs.json')
     line.build_tracker(_context=test_context)
     line.vv['vrf400'] = 16

{xtrack-0.88.2 → xtrack-0.88.4}/tests/test_chromatic_functions_vs_madx.py

@@ -14,7 +14,7 @@ import numpy as np
 @for_all_test_contexts
 def test_chromatic_functions_vs_madx(test_context):
 
-    collider = xt.Environment.from_json(test_data_folder /
+    collider = xt.load(test_data_folder /
                                 'hllhc15_thick/hllhc15_collider_thick.json')
     collider['lhcb1'].twiss_default['method'] = '4d'
     collider['lhcb2'].twiss_default['method'] = '4d'

{xtrack-0.88.2 → xtrack-0.88.4}/tests/test_coasting.py

@@ -14,7 +14,7 @@ test_data_folder = pathlib.Path(
 def test_coasting():
     delta0 = 1e-2
 
-    line = xt.Line.from_json(test_data_folder /
+    line = xt.load(test_data_folder /
                              'psb_injection/line_and_particle.json')
 
     # RF off!

{xtrack-0.88.2 → xtrack-0.88.4}/tests/test_environment.py

@@ -1817,7 +1817,7 @@ def test_select_in_multiline():
     collider_file = test_data_folder / 'hllhc15_collider/collider_00_from_mad.json'
 
     # Load the machine and select line
-    collider= xt.Environment.from_json(collider_file)
+    collider= xt.load(collider_file)
     collider.vars['test_vars'] = 3.1416
     line   = collider[seq]
     line_sel    = line.select(s_marker,e_marker)

{xtrack-0.88.2 → xtrack-0.88.4}/tests/test_footprint.py

@@ -21,7 +21,7 @@ def test_footprint(test_context, freeze_longitudinal):
     nemitt_x = 1e-6
     nemitt_y = 1e-6
 
-    line = xt.Line.from_json(test_data_folder /
+    line = xt.load(test_data_folder /
                 'hllhc15_noerrors_nobb/line_w_knobs_and_particle.json')
     line.particle_ref = xp.Particles(mass0=xp.PROTON_MASS_EV, p0c=7e12)
     line.build_tracker(_context=test_context)
@@ -202,7 +202,7 @@ def test_footprint_delta0(test_context):
     nemitt_x = 1e-6
     nemitt_y = 1e-6
 
-    line = xt.Line.from_json(test_data_folder /
+    line = xt.load(test_data_folder /
                         'hllhc15_noerrors_nobb/line_w_knobs_and_particle.json')
     line.particle_ref = xp.Particles(mass0=xp.PROTON_MASS_EV, p0c=7e12)
     line.build_tracker(_context=test_context)

{xtrack-0.88.2 → xtrack-0.88.4}/tests/test_h6_sps_beamline.py

@@ -31,8 +31,8 @@ def test_h6_sps_beamline():
     ''')
     tw_mad = xt.Table(mad.table.twiss)
 
-    env = xt.load_madx_lattice(sequence_path)
-    env.vars.load_madx(lattice_path)
+    env = xt.load(sequence_path)
+    env.vars.load(lattice_path)
     line = env['h6']
     line.particle_ref = xt.Particles(p0c=120e9, mass0=xt.PROTON_MASS_EV)
     tt = line.get_table(attr=True)

{xtrack-0.88.2 → xtrack-0.88.4}/tests/test_lhc_env.py

@@ -47,7 +47,7 @@ def test_lhc_environment():
 
     env.to_json('lhc.json')
 
-    env = xt.Environment.from_json('lhc.json')
+    env = xt.load('lhc.json')
 
     assert env.lhcb1.element_dict is env.element_dict
     assert env.lhcb2.element_dict is env.element_dict

{xtrack-0.88.2 → xtrack-0.88.4}/tests/test_lhc_match_phase_15.py

@@ -36,7 +36,7 @@ def test_lhc_match_phase_15(config):
 
     staged_match = True
 
-    collider = xt.Environment.from_json(
+    collider = xt.load(
         test_data_folder / 'hllhc15_thick/hllhc15_collider_thick.json')
     collider.build_trackers(_context=test_context)
     collider.vars.load_madx_optics_file(
@@ -269,7 +269,7 @@ def test_lhc_match_phase_15(config):
     print(f"  b2: d_mux={tw.lhcb2['mux', 'ip5'] - tw0.lhcb2['mux', 'ip5']:6f} "
                 f"d_muy={tw.lhcb2['muy', 'ip5'] - tw0.lhcb2['muy', 'ip5']:6f} ")
 
-    collider_ref = xt.Environment.from_json(
+    collider_ref = xt.load(
         test_data_folder / 'hllhc15_thick/hllhc15_collider_thick.json')
     collider_ref.build_trackers()
     collider_ref.vars.load_madx_optics_file(

{xtrack-0.88.2 → xtrack-0.88.4}/tests/test_line.py

@@ -706,7 +706,7 @@ def test_from_json_to_json(tmp_path):
         result.metadata['qx']['lhcb1'] = result.metadata['qx']['lhcb1'] - 1
 
     line.to_json(tmp_path / 'test.json')
-    result = xt.Line.from_json(tmp_path / 'test.json')
+    result = xt.load(tmp_path / 'test.json')
 
     asserts()
 
@@ -779,7 +779,7 @@ def test_config_propagation(test_context):
 def test_pickle():
 
     # Load the line
-    line = xt.Line.from_json(test_data_folder /
+    line = xt.load(test_data_folder /
             'hllhc15_noerrors_nobb/line_w_knobs_and_particle.json')
     line.particle_ref = xp.Particles(p0c=7e12, mass=xp.PROTON_MASS_EV)
     line.build_tracker()
@@ -870,7 +870,7 @@ def test_insert_thin_elements_at_s_basic(test_context):
 @for_all_test_contexts
 def test_insert_thin_elements_at_s_lhc(test_context):
 
-    line = xt.Line.from_json(test_data_folder /
+    line = xt.load(test_data_folder /
                     'hllhc15_thick/lhc_thick_with_knobs.json')
     line.twiss_default['method'] = '4d'
 
@@ -1086,7 +1086,7 @@ def test_multiple_thick_elements():
 
 @for_all_test_contexts
 def test_get_strengths(test_context):
-    collider = xt.Environment.from_json(
+    collider = xt.load(
         test_data_folder / 'hllhc15_thick/hllhc15_collider_thick.json')
     collider.build_trackers(_context=test_context)
 

{xtrack-0.88.2 → xtrack-0.88.4}/tests/test_mad_writer.py

@@ -14,10 +14,10 @@ test_data_folder = pathlib.Path(
 def test_mad_writer(case):
 
     if case == 'thick':
-        line = xt.Line.from_json(
+        line = xt.load(
             test_data_folder / 'hllhc15_thick/lhc_thick_with_knobs.json')
     else:
-        line = xt.Environment.from_json(
+        line = xt.load(
             test_data_folder / 'hllhc15_collider/collider_00_from_mad.json').lhcb1
         # Rotations not supported in thin
         for nn in list(line.element_names):

{xtrack-0.88.2 → xtrack-0.88.4}/tests/test_madloader.py

@@ -688,7 +688,7 @@ def test_selective_expr_import_and_replace_in_expr():
 
 
 def test_load_madx_optics_file():
-    collider = xt.Environment.from_json(
+    collider = xt.load(
         test_data_folder / 'hllhc15_thick/hllhc15_collider_thick.json')
     collider.build_trackers()
 

{xtrack-0.88.2 → xtrack-0.88.4}/tests/test_madnginterface.py

@@ -10,7 +10,7 @@ test_data_folder = pathlib.Path(
 def test_madng_twiss():
     rdts = ["f4000", "f3100", "f2020", "f1120"]
 
-    line = xt.Line.from_json(test_data_folder /
+    line = xt.load(test_data_folder /
                             'hllhc15_thick/lhc_thick_with_knobs.json')
 
     line['test_dk1'] = 0
@@ -46,7 +46,7 @@ def test_madng_twiss():
     assert np.abs(tw_rdt.f1120).max() > 0
 
 def test_madng_interface_with_multipole_errors_and_misalignments():
-    line = xt.Line.from_json(test_data_folder /
+    line = xt.load(test_data_folder /
                             'hllhc15_thick/lhc_thick_with_knobs.json')
 
     tt = line.get_table()
@@ -99,7 +99,7 @@ def test_madng_interface_with_multipole_errors_and_misalignments():
     xo.assert_allclose(tw.by_chrom, tw.by_ng, atol=5e-3*tw.wy_chrom.max(), rtol=0)
 
 def test_madng_survey():
-    line = xt.Line.from_json(test_data_folder /
+    line = xt.load(test_data_folder /
                             'hllhc15_thick/lhc_thick_with_knobs.json')
     survey = line.madng_survey()
 

{xtrack-0.88.2 → xtrack-0.88.4}/tests/test_match_coupling_knob.py

@@ -11,7 +11,7 @@ test_data_folder = pathlib.Path(
 
 @for_all_test_contexts
 def test_match_coupling_knob(test_context):
-    line = xt.Line.from_json(test_data_folder /
+    line = xt.load(test_data_folder /
         'hllhc14_no_errors_with_coupling_knobs/line_b1.json')
     line.particle_ref = xt.Particles(mass0=xt.PROTON_MASS_EV, q0=1, energy0=7e12)
 
@@ -84,7 +84,7 @@ def test_match_coupling_knob(test_context):
     xo.assert_allclose(line.twiss().c_minus/np.sqrt(2), 1e-3, rtol=0, atol=1.5e-5)
 
     # Compare against "legacy" knobs
-    line_legacy = xt.Line.from_json(test_data_folder /
+    line_legacy = xt.load(test_data_folder /
         'hllhc14_no_errors_with_coupling_knobs/line_b1.json')
     line_legacy.cycle('ip1', inplace=True)
 

{xtrack-0.88.2 → xtrack-0.88.4}/tests/test_match_optics_and_ip_knob.py

@@ -12,7 +12,7 @@ test_data_folder = pathlib.Path(
 @for_all_test_contexts
 def test_ip_knob_matching(test_context):
 
-    collider = xt.Environment.from_json(test_data_folder /
+    collider = xt.load(test_data_folder /
                     'hllhc15_thick/hllhc15_collider_thick.json')
     collider.build_trackers(test_context)
 
@@ -330,7 +330,7 @@ def test_ip_knob_matching(test_context):
 @for_all_test_contexts
 def test_match_ir8_optics(test_context):
 
-    collider = xt.Environment.from_json(test_data_folder /
+    collider = xt.load(test_data_folder /
                     'hllhc15_thick/hllhc15_collider_thick.json')
     collider.build_trackers(test_context)
 

{xtrack-0.88.2 → xtrack-0.88.4}/tests/test_match_optics_and_ip_knob_new_optimize_api.py

@@ -12,7 +12,7 @@ test_data_folder = pathlib.Path(
 @for_all_test_contexts
 def test_ip_knob_matching_new_optimize_api(test_context):
 
-    collider = xt.Environment.from_json(test_data_folder /
+    collider = xt.load(test_data_folder /
                     'hllhc15_thick/hllhc15_collider_thick.json')
     collider.build_trackers(test_context)
 
@@ -329,7 +329,7 @@ def test_ip_knob_matching_new_optimize_api(test_context):
 @for_all_test_contexts
 def test_match_ir8_optics_new_optimize_api(test_context):
 
-    collider = xt.Environment.from_json(test_data_folder /
+    collider = xt.load(test_data_folder /
                     'hllhc15_thick/hllhc15_collider_thick.json')
     collider.build_trackers(test_context)
 

{xtrack-0.88.2 → xtrack-0.88.4}/tests/test_match_orbit_bump.py

@@ -569,7 +569,7 @@ def test_bump_step_and_smooth_inequalities(test_context):
 @for_all_test_contexts
 def test_match_bump_sets_implicit_end(test_context):
 
-    line = xt.Line.from_json(test_data_folder /
+    line = xt.load(test_data_folder /
                              'hllhc15_thick/lhc_thick_with_knobs.json')
     line.build_tracker(test_context)
 
@@ -604,7 +604,7 @@ def test_match_bump_sets_implicit_end(test_context):
 @for_all_test_contexts
 def test_match_bump_sets_init_end(test_context):
 
-    line = xt.Line.from_json(test_data_folder /
+    line = xt.load(test_data_folder /
                              'hllhc15_thick/lhc_thick_with_knobs.json')
     line.build_tracker(test_context)
 
@@ -639,7 +639,7 @@ def test_match_bump_sets_init_end(test_context):
 @for_all_test_contexts
 def test_match_bump_sets_init_middle(test_context):
 
-    line = xt.Line.from_json(test_data_folder /
+    line = xt.load(test_data_folder /
                              'hllhc15_thick/lhc_thick_with_knobs.json')
     line.build_tracker(test_context)
 
@@ -676,7 +676,7 @@ def test_match_bump_sets_init_middle(test_context):
 @for_all_test_contexts
 def test_match_bump_sets_init_table(test_context):
 
-    line = xt.Line.from_json(test_data_folder /
+    line = xt.load(test_data_folder /
                              'hllhc15_thick/lhc_thick_with_knobs.json')
     line.build_tracker(test_context)
 
@@ -712,7 +712,7 @@ def test_match_bump_sets_init_table(test_context):
 @for_all_test_contexts
 def test_match_bump_common_elements(test_context):
     # Load a line and build a tracker
-    collider = xt.Environment.from_json(test_data_folder /
+    collider = xt.load(test_data_folder /
                         'hllhc15_thick/hllhc15_collider_thick.json')
     collider.build_trackers(test_context)
 
@@ -756,7 +756,7 @@ def test_match_bump_common_elements(test_context):
 @for_all_test_contexts
 def test_match_bump_common_elements_callables_and_inequalities(test_context):
     # Load a line and build a tracker
-    collider = xt.Environment.from_json(test_data_folder /
+    collider = xt.load(test_data_folder /
                         'hllhc15_thick/hllhc15_collider_thick.json')
     collider.build_trackers(test_context)
 
@@ -805,7 +805,7 @@ def test_match_bump_common_elements_callables_and_inequalities(test_context):
 @for_all_test_contexts
 def test_match_bump_common_elements_targets_from_tables(test_context):
     # Load a line and build a tracker
-    collider = xt.Environment.from_json(test_data_folder /
+    collider = xt.load(test_data_folder /
                         'hllhc15_thick/hllhc15_collider_thick.json')
     collider.build_trackers(test_context)
 
@@ -863,7 +863,7 @@ def test_match_bump_common_elements_targets_from_tables(test_context):
 @for_all_test_contexts
 def test_match_bump_clone_and_ref_in_inequality(test_context):
 
-    line = xt.Line.from_json(test_data_folder /
+    line = xt.load(test_data_folder /
                             'hllhc14_no_errors_with_coupling_knobs/line_b1.json')
     line.build_tracker(test_context)
 
@@ -970,7 +970,7 @@ def test_match_bump_clone_and_ref_in_inequality(test_context):
 
 def test_match_autogen_tags_and_clone_options():
 
-    line = xt.Line.from_json(test_data_folder /
+    line = xt.load(test_data_folder /
         "hllhc15_thick/lhc_thick_with_knobs.json")
 
     opt = line.match(

{xtrack-0.88.2 → xtrack-0.88.4}/tests/test_native_madloader.py

@@ -134,7 +134,7 @@ def test_simple_parser():
     ]
 )
 def test_parse_simple_expression(input, value, expr):
-    env = xt.load_madx_lattice(string=input)
+    env = xt.load(string=input, format='madx')
     assert env['a'] == value
 
     if expr is not None:
@@ -222,7 +222,7 @@ def example_sequence(temp_context_default_mod):
     rx2, angle = 1.5;
     """
 
-    env = xt.load_madx_lattice(string=sequence, reverse_lines=['line_reversed'])
+    env = xt.load(string=sequence, reverse_lines=['line_reversed'], format='madx')
 
     def make_positions(line):
         tt = line.get_table()
@@ -896,7 +896,7 @@ def test_import_seq_length():
     endsequence;
     """
 
-    env = xt.load_madx_lattice(string=sequence)
+    env = xt.load(string=sequence, format='madx')
 
     tt = env.line.get_table()
     assert np.all(tt.name == np.array(['drift_1', 'qu1', 'drift_2', '_end_point']))
@@ -908,17 +908,17 @@ def test_repeated_element_mad_behaviour():
     sequence = """
     mar: marker;
     ben: sbend, l=1;
-    
+
     seq1: sequence, l=10;
       ee: mar, at=5;
     endsequence;
-    
+
     seq2: sequence, l=10;
       ee: ben, at=5;  ! in MAD-X this definition will be ignored
     endsequence;
     """
 
-    env = xt.load_madx_lattice(string=sequence)
+    env = xt.load(string=sequence, format='madx')
 
     element = env['ee']
     assert env.seq1['ee'] == element
@@ -962,7 +962,7 @@ def test_apertures_on_markers(aper_config):
         endsequence;
         """
 
-    env = xt.load_madx_lattice(string=sequence)
+    env = xt.load(string=sequence, format='madx')
     line = env.line
 
     apertures = [ee for ee in line.elements if ee.__class__.__name__.startswith('Limit')]
@@ -1054,7 +1054,7 @@ def test_aperture_setting():
     m_aper, apertype="ellipse", aperture={.5, .6};  ! change apertype
     """
 
-    env = xt.load_madx_lattice(string=sequence)
+    env = xt.load(string=sequence, format='madx')
     line = env.line
 
     assert line['m_ellipse_aper'].a == .3
@@ -1085,7 +1085,7 @@ def test_import_thick_with_apertures_and_slice():
     endsequence;
     """
 
-    env = xt.load_madx_lattice(string=sequence)
+    env = xt.load(string=sequence, format='madx')
     line = env.seq
 
     def _assert_eq(a, b):

{xtrack-0.88.2 → xtrack-0.88.4}/tests/test_radial_steering.py

@@ -11,7 +11,7 @@ test_data_folder = pathlib.Path(
 @for_all_test_contexts
 def test_radial_steering(test_context):
 
-    line = xt.Line.from_json(test_data_folder /
+    line = xt.load(test_data_folder /
                                     'psb_injection/line_and_particle.json')
     line.particle_ref = xp.Particles(
         mass0=(xp.PROTON_MASS_EV), q0=1, energy0=(2*160.+938.)*1.e6)

{xtrack-0.88.2 → xtrack-0.88.4}/tests/test_radiation_equilibrium_emittances.py

@@ -64,7 +64,7 @@ def test_eq_emitt(conf):
     wiggler_on = conf['wiggler_on']
     vertical_orbit_distortion = conf['vertical_orbit_distortion']
 
-    line = xt.Line.from_json(test_data_folder / 'fcc_ee/fccee_h_thin.json')
+    line = xt.load(test_data_folder / 'fcc_ee/fccee_h_thin.json')
     line.build_tracker()
 
     print('Done building tracker')

{xtrack-0.88.2 → xtrack-0.88.4}/tests/test_radiation_equilibrium_emittances_thick.py

@@ -64,7 +64,7 @@ def test_eq_emitt(conf):
     wiggler_on = conf['wiggler_on']
     vertical_orbit_distortion = conf['vertical_orbit_distortion']
 
-    line = xt.Line.from_json(test_data_folder / 'fcc_ee/fccee_h_thick.json')
+    line = xt.load(test_data_folder / 'fcc_ee/fccee_h_thick.json')
     line.build_tracker()
 
     # Wiggler is very strong --> needs more twiss points for accurate eq emittances

{xtrack-0.88.2 → xtrack-0.88.4}/tests/test_radiation_integrals.py

@@ -9,8 +9,8 @@ test_data_folder = pathlib.Path(
         __file__).parent.joinpath('../test_data').absolute()
 
 def test_radiation_wiggler():
-    env = xt.load_madx_lattice(test_data_folder / 'sps_thick/sps.seq')
-    env.vars.load_madx(test_data_folder / 'sps_thick/lhc_q20.str')
+    env = xt.load(test_data_folder / 'sps_thick/sps.seq')
+    env.vars.load(test_data_folder / 'sps_thick/lhc_q20.str')
     line = env.sps
 
     line['actcse.31632'].voltage = 4.2e+08
@@ -92,7 +92,7 @@ def test_radiation_wiggler():
 
 def test_radiation_integrals_sls_combined_function_magnets():
 
-    env = xt.load_madx_lattice(test_data_folder / 'sls_2.0/b075_2024.09.25.madx')
+    env = xt.load(test_data_folder / 'sls_2.0/b075_2024.09.25.madx')
     line = env.ring
     line.particle_ref = xt.Particles(energy0=2.7e9, mass0=xt.ELECTRON_MASS_EV)
     line.configure_bend_model(num_multipole_kicks=20)
@@ -156,8 +156,8 @@ def test_radiation_integrals_sls_combined_function_magnets():
 
 @pytest.mark.parametrize('tilt', [True, False], ids=['tilt', 'no_tilt'])
 def test_radiation_integrals_sps_vs_df(tilt):
-    env = xt.load_madx_lattice(test_data_folder / 'sps_thick/sps.seq')
-    env.vars.load_madx(test_data_folder / 'sps_thick/lhc_q20.str')
+    env = xt.load(test_data_folder / 'sps_thick/sps.seq')
+    env.vars.load(test_data_folder / 'sps_thick/lhc_q20.str')
     line = env.sps
 
     line.particle_ref = xt.Particles(mass0=xt.ELECTRON_MASS_EV, energy0=10e9)