xtrack 0.98.6__tar.gz → 0.98.8__tar.gz

{xtrack-0.98.6/xtrack.egg-info → xtrack-0.98.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xtrack
-Version: 0.98.6
+Version: 0.98.8
 Summary: Tracking library for particle accelerators
 Author: G. Iadarola et al.
 License-Expression: Apache-2.0

{xtrack-0.98.6 → xtrack-0.98.8}/tests/test_cavity_absolute_time.py

@@ -35,6 +35,7 @@ def test_cavity_absolute_time(test_context):
     tt = line.get_table()
     for nn in tt.rows[tt.element_type=='Cavity'].name:
         line[nn].absolute_time = 1 # Need property
+        line[nn].harmonic = 0
         line[nn].frequency = line.vars['f_rf']
 
     tw1 = line.twiss(search_for_t_rev=True)

xtrack-0.98.8/tests/test_cavity_harmonic.py

@@ -0,0 +1,282 @@
+import xtrack as xt
+import xpart as xp
+import xobjects as xo
+import numpy as np
+import pathlib
+from cpymad.madx import Madx
+
+test_data_folder = pathlib.Path(
+    __file__).parent.joinpath('../test_data').absolute()
+
+def test_cavity_harmonic():
+
+    # Fix numpy random seed for reproducibility
+    np.random.seed(42)
+
+    line = xt.load(test_data_folder /
+                   'hllhc15_thick/lhc_thick_with_knobs.json')
+
+    tt_harm = line.get_table(attr=True)
+    tt_harm_cav = tt_harm.rows.match(element_type='Cavity')
+
+    for nn in tt_harm_cav.name:
+        assert line[nn].frequency == 0
+        assert line[nn].harmonic == 35640
+
+    line['vrf400'] = 16
+    tw_harm = line.twiss6d()
+
+    pp_harm = xp.generate_matched_gaussian_bunch(line=line,
+                                            num_particles=100_000,
+                                            nemitt_x=2e-6,
+                                            nemitt_y=2.5e-6,
+                                            sigma_z=0.08)
+
+    # Switch to frequency mode
+    for nn in tt_harm_cav.name:
+        line[nn].harmonic = 0
+        line[nn].frequency=400.79e6
+
+    tt_freq = line.get_table(attr=True)
+    tt_freq_cav = tt_freq.rows.match(element_type='Cavity')
+
+    pp_freq = xp.generate_matched_gaussian_bunch(line=line,
+                                            num_particles=100_000,
+                                            nemitt_x=2e-6,
+                                            nemitt_y=2.5e-6,
+                                            sigma_z=0.08)
+
+    tt_freq = line.get_table(attr=True)
+    tt_freq_cav = tt_freq.rows.match(element_type='Cavity')
+    tw_freq = line.twiss6d()
+
+    xo.assert_allclose(tw_harm.qs, tw_freq.qs, rtol=0, atol=1e-7)
+    xo.assert_allclose(pp_harm.zeta.std(), pp_freq.zeta.std(), rtol=0.01)
+    xo.assert_allclose(pp_harm.delta.std(), pp_freq.delta.std(), rtol=0.01)
+
+    xo.assert_allclose(tt_harm_cav.frequency, 0, rtol=1e-15)
+    xo.assert_allclose(tt_freq_cav.frequency, 400.79e6, rtol=1e-15)
+    xo.assert_allclose(tt_harm_cav.harmonic, 35640, rtol=1e-15)
+    xo.assert_allclose(tt_freq_cav.harmonic, 0, rtol=1e-15)
+
+
+    # Getting a mix of the two modes
+    for nn in tt_harm_cav.name:
+        line[nn].frequency = 0
+        line[nn].harmonic = 0
+
+    line['acsca.d5l4.b1'].harmonic = 35640
+    line['acsca.c5l4.b1'].frequency = 400.79e6
+    line['acsca.b5l4.b1'].harmonic = 35640
+    line['acsca.a5l4.b1'].frequency = 400.79e6
+    line['acsca.a5r4.b1'].harmonic = 35640
+    line['acsca.b5r4.b1'].frequency = 400.79e6
+    line['acsca.c5r4.b1'].harmonic = 35640
+    line['acsca.d5r4.b1'].frequency = 400.79e6
+
+    mad_src = line.to_madx_sequence('seq')
+
+    env2 = xt.load(string=mad_src, format='madx')
+    line2 = env2['seq']
+
+    tt3 = line2.get_table(attr=True)
+    tt3_cav = tt3.rows.match(element_type='Cavity')
+    xo.assert_allclose(tt3_cav.frequency, [0, 400.79e6, 0, 400.79e6, 0, 400.79e6, 0, 400.79e6], rtol=1e-15)
+    xo.assert_allclose(tt3_cav.harmonic, [35640, 0, 35640, 0, 35640, 0, 35640, 0], rtol=1e-15)
+
+    line2.set_particle_ref('proton', p0c=7e12)
+    tw3 = line2.twiss6d()
+    xo.assert_allclose(tw_harm.qs, tw3.qs, rtol=0, atol=1e-7)
+
+    line_slice_thick = line.copy()
+    line_slice_thick.slice_thick_elements([
+        xt.Strategy(slicing=None),
+        xt.Strategy(slicing=xt.Uniform(3, mode='thick'), name='acsca.*'),
+    ])
+
+    tt_sliced = line_slice_thick.get_table(attr=True)
+    tt_sliced_cav = tt_sliced.rows.match(element_type='ThickSliceCav.*')
+
+    assert np.all(tt_sliced_cav.name == np.array([
+        'acsca.d5l4.b1..0', 'acsca.d5l4.b1..1', 'acsca.d5l4.b1..2',
+        'acsca.c5l4.b1..0', 'acsca.c5l4.b1..1', 'acsca.c5l4.b1..2',
+        'acsca.b5l4.b1..0', 'acsca.b5l4.b1..1', 'acsca.b5l4.b1..2',
+        'acsca.a5l4.b1..0', 'acsca.a5l4.b1..1', 'acsca.a5l4.b1..2',
+        'acsca.a5r4.b1..0', 'acsca.a5r4.b1..1', 'acsca.a5r4.b1..2',
+        'acsca.b5r4.b1..0', 'acsca.b5r4.b1..1', 'acsca.b5r4.b1..2',
+        'acsca.c5r4.b1..0', 'acsca.c5r4.b1..1', 'acsca.c5r4.b1..2',
+        'acsca.d5r4.b1..0', 'acsca.d5r4.b1..1', 'acsca.d5r4.b1..2']))
+
+    xo.assert_allclose(tt_sliced_cav.frequency,
+                    [0, 0, 0, 400.79e6, 400.79e6, 400.79e6,
+                        0, 0, 0, 400.79e6, 400.79e6, 400.79e6,
+                        0, 0, 0, 400.79e6, 400.79e6, 400.79e6,
+                        0, 0, 0, 400.79e6, 400.79e6, 400.79e6], rtol=1e-15)
+    xo.assert_allclose(tt_sliced_cav.harmonic,
+                        [35640, 35640, 35640, 0, 0, 0,
+                        35640, 35640, 35640, 0, 0, 0,
+                        35640, 35640, 35640, 0, 0, 0,
+                        35640, 35640, 35640, 0, 0, 0], rtol=1e-15)
+    xo.assert_allclose(tt_sliced_cav.voltage, 16 / 8 / 3 * 1e6, rtol=1e-3)
+
+    tw_slice_thick = line_slice_thick.twiss6d()
+    xo.assert_allclose(tw_harm.qs, tw_slice_thick.qs, rtol=0, atol=1e-7)
+
+    line_slice_thin = line.copy()
+    line_slice_thin.slice_thick_elements([
+        xt.Strategy(slicing=None),
+        xt.Strategy(slicing=xt.Uniform(2, mode='thin'), name='acsca.*'),
+    ])
+
+    tt_sliced_thin = line_slice_thin.get_table(attr=True)
+    tt_sliced_thin_cav = tt_sliced_thin.rows.match(element_type='.*SliceCav.*')
+
+    assert np.all(tt_sliced_thin_cav.name == np.array(['drift_acsca.d5l4.b1..0', 'acsca.d5l4.b1..0',
+        'drift_acsca.d5l4.b1..1', 'acsca.d5l4.b1..1',
+        'drift_acsca.d5l4.b1..2', 'drift_acsca.c5l4.b1..0',
+        'acsca.c5l4.b1..0', 'drift_acsca.c5l4.b1..1', 'acsca.c5l4.b1..1',
+        'drift_acsca.c5l4.b1..2', 'drift_acsca.b5l4.b1..0',
+        'acsca.b5l4.b1..0', 'drift_acsca.b5l4.b1..1', 'acsca.b5l4.b1..1',
+        'drift_acsca.b5l4.b1..2', 'drift_acsca.a5l4.b1..0',
+        'acsca.a5l4.b1..0', 'drift_acsca.a5l4.b1..1', 'acsca.a5l4.b1..1',
+        'drift_acsca.a5l4.b1..2', 'drift_acsca.a5r4.b1..0',
+        'acsca.a5r4.b1..0', 'drift_acsca.a5r4.b1..1', 'acsca.a5r4.b1..1',
+        'drift_acsca.a5r4.b1..2', 'drift_acsca.b5r4.b1..0',
+        'acsca.b5r4.b1..0', 'drift_acsca.b5r4.b1..1', 'acsca.b5r4.b1..1',
+        'drift_acsca.b5r4.b1..2', 'drift_acsca.c5r4.b1..0',
+        'acsca.c5r4.b1..0', 'drift_acsca.c5r4.b1..1', 'acsca.c5r4.b1..1',
+        'drift_acsca.c5r4.b1..2', 'drift_acsca.d5r4.b1..0',
+        'acsca.d5r4.b1..0', 'drift_acsca.d5r4.b1..1', 'acsca.d5r4.b1..1',
+        'drift_acsca.d5r4.b1..2']))
+    xo.assert_allclose(tt_sliced_thin_cav.frequency,
+                    [0.0000e+00, 0.0000e+00, 0.0000e+00, 0.0000e+00, 0.0000e+00,
+                        0.0000e+00, 4.0079e+08, 0.0000e+00, 4.0079e+08, 0.0000e+00,
+                        0.0000e+00, 0.0000e+00, 0.0000e+00, 0.0000e+00, 0.0000e+00,
+                        0.0000e+00, 4.0079e+08, 0.0000e+00, 4.0079e+08, 0.0000e+00,
+                        0.0000e+00, 0.0000e+00, 0.0000e+00, 0.0000e+00, 0.0000e+00,
+                        0.0000e+00, 4.0079e+08, 0.0000e+00, 4.0079e+08, 0.0000e+00,
+                        0.0000e+00, 0.0000e+00, 0.0000e+00, 0.0000e+00, 0.0000e+00,
+                        0.0000e+00, 4.0079e+08, 0.0000e+00, 4.0079e+08, 0.0000e+00], rtol=1e-15)
+
+    xo.assert_allclose(tt_sliced_thin_cav.harmonic,
+                    [    0., 35640.,     0., 35640.,     0.,     0.,     0.,     0.,
+                            0.,     0.,     0., 35640.,     0., 35640.,     0.,     0.,
+                            0.,     0.,     0.,     0.,     0., 35640.,     0., 35640.,
+                            0.,     0.,     0.,     0.,     0.,     0.,     0., 35640.,
+                            0., 35640.,     0.,     0.,     0.,     0.,     0.,     0.], rtol=1e-15)
+
+    xo.assert_allclose(tt_sliced_thin_cav.voltage,
+                    [      0., 1000000.,       0., 1000000.,       0.,       0.,
+                        1000000.,       0., 1000000.,       0.,       0., 1000000.,
+                            0., 1000000.,       0.,       0., 1000000.,       0.,
+                        1000000.,       0.,       0., 1000000.,       0., 1000000.,
+                            0.,       0., 1000000.,       0., 1000000.,       0.,
+                            0., 1000000.,       0., 1000000.,       0.,       0.,
+                        1000000.,       0., 1000000.,       0.], rtol=1e-15)
+
+def test_cavity_harmonic_loader_native():
+
+    env = xt.load([test_data_folder / 'lhc_2024/lhc.seq',
+                test_data_folder / 'lhc_2024/injection_optics.madx'],
+                reverse_lines=['lhcb2'])
+    env.lhcb1.set_particle_ref('proton', p0c=450e9)
+    env.lhcb2.set_particle_ref('proton', p0c=450e9)
+
+    tt1 = env.lhcb1.get_table(attr=True)
+    tt2 = env.lhcb2.get_table(attr=True)
+
+    tt1_cav = tt1.rows.match(element_type='Cavity')
+    tt2_cav = tt2.rows.match(element_type='Cavity')
+
+    assert len(tt1_cav) == 8
+    assert len(tt2_cav) == 8
+    xo.assert_allclose(tt1_cav.frequency, 0)
+    xo.assert_allclose(tt2_cav.frequency, 0)
+    xo.assert_allclose(tt1_cav.harmonic, 35640)
+    xo.assert_allclose(tt2_cav.harmonic, 35640)
+
+    env['vrf400'] = 8
+    env['lagrf400.b1'] = 0.5
+
+    tw_harm = env.lhcb1.twiss6d()
+
+    for nn in tt1_cav.name:
+        env[nn].harmonic = 0
+        env[nn].frequency = 400.79e6
+
+    tw_freq = env.lhcb1.twiss6d()
+
+    xo.assert_allclose(tw_freq.qs, tw_harm.qs, rtol=0, atol=1e-7)
+
+def test_cavity_harmonic_loader_cpymad():
+
+    mad = Madx()
+    mad.call(str(test_data_folder / 'lhc_2024/lhc.seq'))
+    mad.call(str(test_data_folder / 'lhc_2024/injection_optics.madx'))
+    mad.beam()
+    mad.use('lhcb1')
+
+    line = xt.Line.from_madx_sequence(mad.sequence.lhcb1,
+                                    deferred_expressions=True)
+
+    line.set_particle_ref('proton', p0c=450e9)
+
+    tt1 = line.get_table(attr=True)
+    tt1_cav = tt1.rows.match(element_type='Cavity')
+
+    assert len(tt1_cav) == 8
+    xo.assert_allclose(tt1_cav.frequency, 0)
+    xo.assert_allclose(tt1_cav.harmonic, 35640)
+
+    line['vrf400'] = 8
+    line['lagrf400.b1'] = 0.5
+
+    tw_harm = line.twiss6d()
+
+    for nn in tt1_cav.name:
+        line[nn].harmonic = 0
+        line[nn].frequency = 400.79e6
+
+    tw_freq = line.twiss6d()
+
+    xo.assert_allclose(tw_freq.qs, tw_harm.qs, rtol=0, atol=1e-7)
+
+def test_cavity_harmonic_more_loader_checks():
+    from cpymad.madx import Madx
+    import xtrack as xt
+    import xobjects as xo
+
+    madx_src = """
+    hh = 5;
+    ff = 100;
+    cav_harm: rfcavity, harmon:=hh;
+    cav_freq: rfcavity, freq:=ff;
+
+    seq: sequence, l=10;
+        cav_harm, at=5;
+        cav_freq, at=7;
+    endsequence;
+
+    """
+
+    mad = Madx()
+    mad.input(madx_src)
+    mad.input('''
+    beam;
+    use, sequence=seq;
+    ''')
+
+    lcpymad = xt.Line.from_madx_sequence(mad.sequence.seq,
+                                        deferred_expressions=True)
+
+    env_native = xt.load(string=madx_src, format='madx')
+    lnative = env_native['seq']
+
+    for ll in [lcpymad, lnative]:
+        assert str(ll.ref['cav_harm'].harmonic._expr) == "vars['hh']"
+        assert ll.ref['cav_harm'].frequency._expr is None
+        assert ll.ref['cav_harm'].frequency._value == 0
+
+        assert str(ll.ref['cav_freq'].frequency._expr) == "(vars['ff'] * 1000000.0)"
+        assert ll.ref['cav_freq'].harmonic._expr is None
+        assert ll.ref['cav_freq'].harmonic._value == 0

{xtrack-0.98.6 → xtrack-0.98.8}/tests/test_madloader.py

@@ -602,8 +602,7 @@ def test_mad_elements_import():
 
         assert isinstance(line['c1'], xt.Cavity)
         assert line.get_s_position('c1') == 0.2
-        xo.assert_allclose(line['c1'].frequency, clight * line.particle_ref.beta0 / 10. * 8,
-                           rtol=0, atol=1e-7)
+        xo.assert_allclose(line['c1'].harmonic, 8, rtol=0, atol=1e-12)
         assert line['c1'].lag == 180
         assert line['c1'].voltage == 6e6
 

{xtrack-0.98.6 → xtrack-0.98.8}/tests/test_native_madloader.py

@@ -164,7 +164,7 @@ def example_sequence(temp_context_default_mod):
     se: sextupole, L=1, K2=2, K2S=3, TILT=2;  ! ignore ktap
     oc: octupole, L=2, K3=3, K3S=2, TILT=2;
     ma: marker;
-    rf: rfcavity, L=2, VOLT=1, LAG=2, FREQ=3, HARMON=2, NO_CAVITY_TOTALPATH;  ! ignore N_BESSEL
+    rf: rfcavity, L=2, VOLT=1, LAG=2, FREQ=3, NO_CAVITY_TOTALPATH;  ! ignore N_BESSEL
     mu: multipole, LRAD=1, TILT=2, KNL={3, 4, 5, 6}, KSL={1, 2, 3, 4};
     so: solenoid, l=2, ks=3;  ! ignore ksi
 
@@ -450,7 +450,7 @@ def test_marker(example_sequence):
 
 def test_rfcavity(example_sequence):
     env, positions, _ = example_sequence
-    # rf: rfcavity, L=2, VOLT=1, LAG=2, FREQ=3, HARMON=2;  ! ignore N_BESSEL, NO_CAVITY_TOTALPATH
+    # rf: rfcavity, L=2, VOLT=1, LAG=2, FREQ=3;  ! ignore N_BESSEL, NO_CAVITY_TOTALPATH
     rf1 = env['rf1/line']
     xo.assert_allclose(positions['rf1/line'], 27, atol=1e-14)
     assert isinstance(rf1, xt.Cavity)
@@ -655,7 +655,7 @@ def test_reversed_marker(example_sequence):
 
 
 def test_reversed_rfcavity(example_sequence):
-    env, _, positions_reversed = example_sequence    # ma: marker;    # rf: rfcavity, L=2, VOLT=1, LAG=2, FREQ=3, HARMON=2;  ! ignore N_BESSEL, NO_CAVITY_TOTALPATH
+    env, _, positions_reversed = example_sequence    # ma: marker;    # rf: rfcavity, L=2, VOLT=1, LAG=2, FREQ=3;  ! ignore N_BESSEL, NO_CAVITY_TOTALPATH
     rf1 = env['rf1/line_reversed']
     xo.assert_allclose(positions_reversed['rf1/line_reversed'], 36 - 27, atol=1e-14)
     assert isinstance(rf1, xt.Cavity)

{xtrack-0.98.6 → xtrack-0.98.8}/tests/test_tapering.py

@@ -2,6 +2,7 @@ import json
 import pathlib
 
 import numpy as np
+from scipy.constants import c as clight
 
 import xobjects as xo
 import xtrack as xt
@@ -25,6 +26,12 @@ def test_tapering_and_twiss_with_radiation():
     with open(filename, 'r') as f:
         line = xt.Line.from_dict(json.load(f))
 
+    # Use harmonic for one of the cavities
+    t_rev = line.get_length() / clight
+    harm = line['rf1'].frequency * t_rev
+    line['rf1'].frequency = 0
+    line['rf1'].harmonic = harm
+
     line.build_tracker()
 
     # Initial twiss (no radiation)
@@ -142,6 +149,12 @@ def test_tapering_zero_mean():
     line['rf2b'].voltage *= 2
     line['rf2a'].voltage *= 2
 
+    # Use harmonic for one of the cavities
+    t_rev = line.get_length() / clight
+    harm = line['rf1'].frequency * t_rev
+    line['rf1'].frequency = 0
+    line['rf1'].harmonic = line['rf1'].frequency * t_rev
+
     line.particle_ref.p0c = 4e9  # eV
 
     line.configure_radiation(model=None)

{xtrack-0.98.6 → xtrack-0.98.8}/tests/test_twiss.py

@@ -3,6 +3,7 @@ import pathlib
 from itertools import product
 
 import numpy as np
+from scipy.constants import c as clight
 import pytest
 from cpymad.madx import Madx
 
@@ -68,9 +69,6 @@ def test_coupled_beta(test_context):
     line = env['lhcb1']
     line.set_particle_ref('proton', p0c=7e12)
     line['mqwa.a4r3.b1..1'].ksl[1] = 1e-4
-    tt_cav = line.get_table().rows.match('Cavity', 'element_type')
-    for nn in tt_cav.name:
-        line[nn].frequency = 400.79e6
 
     line.build_tracker(_context=test_context)
 
@@ -107,10 +105,6 @@ def test_twiss_zeta0_delta0(test_context):
     line = env['lhcb1']
     line.set_particle_ref('proton', p0c=7e12)
 
-    tt_cav = line.get_table().rows.match('Cavity', 'element_type')
-    for nn in tt_cav.name:
-        line[nn].frequency = 400.79e6
-
     env['on_crab1'] = -190
     env['on_crab5'] = -190
 
@@ -1024,6 +1018,11 @@ def test_longitudinal_plane_against_matrix(machine, test_context):
         tw = line.twiss()
         circumference = tw.circumference
 
+        if line[cavity_name].harmonic:
+            frequency_rf = line[cavity_name].harmonic / (line.get_length() / tw.beta0 / clight)
+        else:
+            frequency_rf = line[cavity_name].frequency
+
         if longitudinal_mode == 'nonlinear':
             matrix = xt.LineSegmentMap(
                 qx=tw.qx, qy=tw.qy,
@@ -1033,7 +1032,7 @@ def test_longitudinal_plane_against_matrix(machine, test_context):
                 dx=tw.dx[0], dpx=tw.dpx[0],
                 dy=tw.dy[0], dpy=tw.dpy[0],
                 voltage_rf=line[cavity_name].voltage,
-                frequency_rf=line[cavity_name].frequency,
+                frequency_rf=frequency_rf,
                 lag_rf=line[cavity_name].lag,
                 momentum_compaction_factor=tw.momentum_compaction_factor,
                 length=circumference)
@@ -1047,7 +1046,7 @@ def test_longitudinal_plane_against_matrix(machine, test_context):
                 dx=tw.dx[0], dpx=tw.dpx[0],
                 dy=tw.dy[0], dpy=tw.dpy[0],
                 voltage_rf=line[cavity_name].voltage,
-                frequency_rf=line[cavity_name].frequency,
+                frequency_rf=frequency_rf,
                 lag_rf=line[cavity_name].lag,
                 momentum_compaction_factor=tw.momentum_compaction_factor,
                 length=circumference)
@@ -1592,14 +1591,17 @@ def test_longitudinal_beam_sizes(test_context):
         beam_sizes.sigma_zeta / beam_sizes.sigma_pzeta, tw.bets0, atol=0, rtol=5e-5)
 
 @for_all_test_contexts(excluding=('ContextCupy', 'ContextPyopencl'))
-def test_second_order_chromaticity_and_dispersion(test_context):
+@pytest.mark.parametrize('method', ['6d', '4d'])
+def test_second_order_chromaticity_and_dispersion(test_context, method):
 
     line = xt.load(test_data_folder /
                              'hllhc15_thick/lhc_thick_with_knobs.json')
     line.vars['on_x5'] = 300
+    line.vars['vrf400'] = 16
+
     line.build_tracker(_context=test_context)
 
-    tw = line.twiss(method='4d')
+    tw = line.twiss(method=method)
     tw_fw = line.twiss(start='ip4', end='ip6', init_at='ip4',
                 x=tw['x', 'ip4'], px=tw['px', 'ip4'],
                 y=tw['y', 'ip4'], py=tw['py', 'ip4'],
@@ -1643,14 +1645,14 @@ def test_second_order_chromaticity_and_dispersion(test_context):
     pxs_qy = np.polyfit(delta, qy_xs, 3)
 
     xo.assert_allclose(delta, nlchr.delta0, atol=1e-6, rtol=0)
-    xo.assert_allclose(tw['dx', location], pxs_x[-2], atol=0, rtol=1e-4)
-    xo.assert_allclose(tw['dpx', location], pxs_px[-2], atol=0, rtol=1e-4)
-    xo.assert_allclose(tw['dy', location], pxs_y[-2], atol=0, rtol=1e-4)
-    xo.assert_allclose(tw['dpy', location], pxs_py[-2], atol=0, rtol=1e-4)
-    xo.assert_allclose(tw['ddx', location], 2*pxs_x[-3], atol=0, rtol=1e-4)
-    xo.assert_allclose(tw['ddpx', location], 2*pxs_px[-3], atol=0, rtol=1e-4)
-    xo.assert_allclose(tw['ddy', location], 2*pxs_y[-3], atol=0, rtol=1e-4)
-    xo.assert_allclose(tw['ddpy', location], 2*pxs_py[-3], atol=0, rtol=1e-4)
+    xo.assert_allclose(tw['dx', location], pxs_x[-2], atol=0, rtol=5e-4)
+    xo.assert_allclose(tw['dpx', location], pxs_px[-2], atol=0, rtol=5e-4)
+    xo.assert_allclose(tw['dy', location], pxs_y[-2], atol=0, rtol=5e-4)
+    xo.assert_allclose(tw['dpy', location], pxs_py[-2], atol=0, rtol=5e-4)
+    xo.assert_allclose(tw['ddx', location], 2*pxs_x[-3], atol=0, rtol=5e-4)
+    xo.assert_allclose(tw['ddpx', location], 2*pxs_px[-3], atol=0, rtol=5e-4)
+    xo.assert_allclose(tw['ddy', location], 2*pxs_y[-3], atol=0, rtol=5e-4)
+    xo.assert_allclose(tw['ddpy', location], 2*pxs_py[-3], atol=0, rtol=5e-4)
     xo.assert_allclose(tw['dqx'], pxs_qx[-2], atol=0, rtol=1e-3)
     xo.assert_allclose(tw['ddqx'], pxs_qx[-3]*2, atol=0, rtol=1e-2)
     xo.assert_allclose(tw['dqy'], pxs_qy[-2], atol=0, rtol=1e-3)

{xtrack-0.98.6 → xtrack-0.98.8}/tests/test_twiss_vs_madx_psb.py

@@ -27,7 +27,6 @@ def test_twiss_psb(test_context):
     env = xt.load(test_data_folder / 'psb_injection/psb_injection.seq')
     line = env['psb']
     line.set_particle_ref('proton', gamma0=mad.sequence['psb'].beam.gamma)
-    line['br.c02'].frequency = 1 / line_ref.get_length() * clight * line_ref.particle_ref.beta0[0] # h_rf = 1
 
     line.build_tracker(_context=test_context)
     beta0 = line.particle_ref.beta0[0]

xtrack-0.98.8/xtrack/_version.py

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

{xtrack-0.98.6 → xtrack-0.98.8}/xtrack/base_element.py

@@ -531,14 +531,13 @@ class BeamElement(xo.HybridClass, metaclass=MetaBeamElement):
             raise ValueError("Invalid array type")
 
     def xoinitialize(self, **kwargs):
-        rot_s_rad = kwargs.pop('rot_s_rad', None)
-        # For the shifts we accept both shift_x and _shift_x for backward compatibility
+        rot_s_rad = kwargs.pop('rot_s_rad', kwargs.pop('_rot_s_rad', None))
         shift_x = kwargs.pop('shift_x', kwargs.pop('_shift_x', None))
         shift_y = kwargs.pop('shift_y', kwargs.pop('_shift_y', None))
         shift_s = kwargs.pop('shift_s', kwargs.pop('_shift_s', None))
-        rot_x_rad = kwargs.pop('rot_x_rad', None)
-        rot_y_rad = kwargs.pop('rot_y_rad', None)
-        rot_s_rad_no_frame = kwargs.pop('rot_s_rad_no_frame', None)
+        rot_x_rad = kwargs.pop('rot_x_rad', kwargs.pop('_rot_x_rad', None))
+        rot_y_rad = kwargs.pop('rot_y_rad', kwargs.pop('_rot_y_rad', None))
+        rot_s_rad_no_frame = kwargs.pop('rot_s_rad_no_frame', kwargs.pop('_rot_s_rad_no_frame', None))
 
         xo.HybridClass.xoinitialize(self, **kwargs)
 

{xtrack-0.98.6 → xtrack-0.98.8}/xtrack/beam_elements/elements.py

@@ -523,6 +523,7 @@ class Cavity(_HasModelRF, _HasIntegrator, BeamElement):
         'voltage': xo.Float64,
         'frequency': xo.Float64,
         'lag': xo.Float64,
+        'harmonic': xo.Float64,
         'lag_taper': xo.Float64,
         'absolute_time': xo.Int64,
         'num_kicks': xo.Int64,
@@ -539,8 +540,13 @@ class Cavity(_HasModelRF, _HasIntegrator, BeamElement):
     _rename = {
         'model': '_model',
         'integrator': '_integrator',
+        'frequency': '_frequency',
+        'harmonic': '_harmonic',
     }
 
+    _default_frequency = 0.0
+    _default_harmonic = 0.0
+
     _noexpr_fields = _NOEXPR_FIELDS
 
     def __init__(self, **kwargs):
@@ -551,6 +557,8 @@ class Cavity(_HasModelRF, _HasIntegrator, BeamElement):
 
         model = kwargs.pop('model', None)
         integrator = kwargs.pop('integrator', None)
+        frequency = kwargs.pop('frequency', None)
+        harmonic = kwargs.pop('harmonic', None)
 
         self.xoinitialize(**kwargs)
 
@@ -561,6 +569,41 @@ class Cavity(_HasModelRF, _HasIntegrator, BeamElement):
         if integrator is not None:
             self.integrator = integrator
 
+        if frequency is not None:
+            self.frequency = frequency
+
+        if harmonic is not None:
+            self.harmonic = harmonic
+
+    def track(self, particles, *args, **kwargs):
+
+        if self.harmonic != 0:
+            raise RuntimeError("Cavity cannot be used in standalone tracking "
+                               "when harmonic is not zero. Please use the "
+                               "cavity within a Line or set frequency instead"
+                               " of harmonic.")
+        return super().track(particles, *args, **kwargs)
+
+    @property
+    def frequency(self):
+        return self._frequency
+
+    @frequency.setter
+    def frequency(self, value):
+        if self._harmonic != 0 and value != 0:
+            raise ValueError("Cannot set non-zero frequency when harmonic is not zero.")
+        self._frequency = value
+
+    @property
+    def harmonic(self):
+        return self._harmonic
+
+    @harmonic.setter
+    def harmonic(self, value):
+        if self._frequency != 0 and value != 0:
+            raise ValueError("Cannot set non-zero harmonic when frequency is not zero.")
+        self._harmonic = value
+
     @property
     def _thin_slice_class(self):
         return xt.ThinSliceCavity

{xtrack-0.98.6 → xtrack-0.98.8}/xtrack/beam_elements/elements_src/cavity.h

@@ -18,6 +18,7 @@ void Cavity_track_local_particle(CavityData el, LocalParticle* part0)
         /*voltage*/               CavityData_get_voltage(el),
         /*frequency*/             CavityData_get_frequency(el),
         /*lag*/                   CavityData_get_lag(el),
+        /*harmonic*/              CavityData_get_harmonic(el),
         /*transverse_voltage*/    0.,
         /*transverse_lag*/        0.,
         /*absolute_time*/         CavityData_get_absolute_time(el),

{xtrack-0.98.6 → xtrack-0.98.8}/xtrack/beam_elements/elements_src/crab_cavity.h

@@ -17,6 +17,7 @@ void CrabCavity_track_local_particle(CrabCavityData el, LocalParticle* part0)
         /*length*/                CrabCavityData_get_length(el),
         /*voltage*/               0,
         /*frequency*/             CrabCavityData_get_frequency(el),
+        /*harmonic*/              0.,
         /*lag*/                   0.,
         /*transverse_voltage*/    CrabCavityData_get_crab_voltage(el),
         /*transverse_lag*/        CrabCavityData_get_lag(el),

{xtrack-0.98.6 → xtrack-0.98.8}/xtrack/beam_elements/elements_src/rfmultipole.h

@@ -14,10 +14,11 @@ void RFMultipole_track_local_particle(RFMultipoleData el, LocalParticle* part0){
     track_rf_particles(
         /*weight*/                1.,
         /*part0*/                 part0,
-        /*length*/                0,
+        /*length*/                0.,
         /*voltage*/               RFMultipoleData_get_voltage(el),
         /*frequency*/             RFMultipoleData_get_frequency(el),
         /*lag*/                   RFMultipoleData_get_lag(el),
+        /*harmonic*/              0.,
         /*transverse_voltage*/    0.,
         /*transverse_lag*/        0.,
         /*absolute_time*/         0, // not used here

{xtrack-0.98.6 → xtrack-0.98.8}/xtrack/beam_elements/elements_src/thick_slice_cavity.h

@@ -21,6 +21,7 @@ void ThickSliceCavity_track_local_particle(ThickSliceCavityData el, LocalParticl
         /*voltage*/               ThickSliceCavityData_get__parent_voltage(el),
         /*frequency*/             ThickSliceCavityData_get__parent_frequency(el),
         /*lag*/                   ThickSliceCavityData_get__parent_lag(el),
+        /*harmonic*/              ThickSliceCavityData_get__parent_harmonic(el),
         /*transverse_voltage*/    0.,
         /*transverse_lag*/        0.,
         /*absolute_time*/         ThickSliceCavityData_get__parent_absolute_time(el),

{xtrack-0.98.6 → xtrack-0.98.8}/xtrack/beam_elements/elements_src/thick_slice_crab_cavity.h

@@ -20,6 +20,7 @@ void ThickSliceCrabCavity_track_local_particle(ThickSliceCrabCavityData el, Loca
         /*length*/                ThickSliceCrabCavityData_get__parent_length(el),
         /*voltage*/               0,
         /*frequency*/             ThickSliceCrabCavityData_get__parent_frequency(el),
+        /*harmonic*/              0.,
         /*lag*/                   0.,
         /*transverse_voltage*/    ThickSliceCrabCavityData_get__parent_crab_voltage(el),
         /*transverse_lag*/        ThickSliceCrabCavityData_get__parent_lag(el),

{xtrack-0.98.6 → xtrack-0.98.8}/xtrack/beam_elements/elements_src/thin_slice_cavity.h

@@ -21,6 +21,7 @@ void ThinSliceCavity_track_local_particle(ThinSliceCavityData el, LocalParticle*
         /*voltage*/               ThinSliceCavityData_get__parent_voltage(el),
         /*frequency*/             ThinSliceCavityData_get__parent_frequency(el),
         /*lag*/                   ThinSliceCavityData_get__parent_lag(el),
+        /*harmonic*/              ThinSliceCavityData_get__parent_harmonic(el),
         /*transverse_voltage*/    0.,
         /*transverse_lag*/        0.,
         /*absolute_time*/         ThinSliceCavityData_get__parent_absolute_time(el),

{xtrack-0.98.6 → xtrack-0.98.8}/xtrack/beam_elements/elements_src/thin_slice_crab_cavity.h

@@ -20,6 +20,7 @@ void ThinSliceCrabCavity_track_local_particle(ThinSliceCrabCavityData el, LocalP
         /*length*/                ThinSliceCrabCavityData_get__parent_length(el),
         /*voltage*/               0,
         /*frequency*/             ThinSliceCrabCavityData_get__parent_frequency(el),
+        /*harmonic*/              0.,
         /*lag*/                   0.,
         /*transverse_voltage*/    ThinSliceCrabCavityData_get__parent_crab_voltage(el),
         /*transverse_lag*/        ThinSliceCrabCavityData_get__parent_lag(el),