xtrack 0.88.5__tar.gz → 0.88.7__tar.gz

{xtrack-0.88.5/xtrack.egg-info → xtrack-0.88.7}/PKG-INFO

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

{xtrack-0.88.5 → xtrack-0.88.7}/tests/test_elements_thick.py

@@ -2361,4 +2361,161 @@ def test_uniform_solenoid_with_slices(test_context, reference):
     xo.assert_allclose(tw_back.rows[:'e0..0'].ax, tw['ax', 'e0..0'],
                     rtol=0, atol=1e-10)
     xo.assert_allclose(tw_back.rows[:'e0..0'].ay, tw['ay', 'e0..0'],
-                    rtol=0, atol=1e-10)
+                    rtol=0, atol=1e-10)
+
+@for_all_test_contexts
+def test_uniform_solenoid_x0y0(test_context):
+
+    env = xt.Environment()
+    env.particle_ref = xt.Particles(mass0=xt.ELECTRON_MASS_EV, p0c=20e9)
+
+    line_ref = env.new_line(components=[
+        env.new('sol_ref',xt.UniformSolenoid, length=3, ks=0.2),
+        env.new('end', xt.Marker)
+        ])
+    line_ref_thick = line_ref.copy(shallow=True)
+    line_ref.cut_at_s(np.linspace(0, 3, 5))
+    tw_ref = line_ref.twiss(x=0.1, y=0.2, betx=1, bety=1)
+    tw_ref_thick = line_ref_thick.twiss(x=0.1, y=0.2, betx=1, bety=1)
+
+    x0 = 0.05
+    y0 = 0.15
+    line_test = env.new_line(components=[
+        env.new('solt_test', xt.UniformSolenoid, length=3, ks=0.2, x0=x0, y0=y0),
+        env.place('end')
+        ])
+    line_test_thick = line_test.copy(shallow=True)
+    line_test.build_tracker(test_context)
+    line_test.cut_at_s(np.linspace(0, 3, 5))
+    line_test_thick.build_tracker(test_context)
+    tw_test = line_test.twiss(x=x0 + 0.1, y=y0 + 0.2, betx=1, bety=1)
+    tw_test_thick = line_test_thick.twiss(x=x0 + 0.1, y=y0 + 0.2, betx=1, bety=1)
+
+    xo.assert_allclose(tw_test.x, tw_ref.x + x0, rtol=0, atol=1e-14)
+    xo.assert_allclose(tw_test.y, tw_ref.y + y0, rtol=0, atol=1e-14)
+    xo.assert_allclose(tw_test.px, tw_ref.px, rtol=0, atol=1e-14)
+    xo.assert_allclose(tw_test.py, tw_ref.py, rtol=0, atol=1e-14)
+    xo.assert_allclose(tw_test.kin_px, tw_ref.kin_px, rtol=0, atol=1e-14)
+    xo.assert_allclose(tw_test.kin_py, tw_ref.kin_py, rtol=0, atol=1e-14)
+
+    xo.assert_allclose(tw_ref_thick.x[-1], tw_ref.x[-1], rtol=0, atol=1e-14)
+    xo.assert_allclose(tw_ref_thick.y[-1], tw_ref.y[-1], rtol=0, atol=1e-14)
+    xo.assert_allclose(tw_ref_thick.px[-1], tw_ref.px[-1], rtol=0, atol=1e-14)
+    xo.assert_allclose(tw_ref_thick.py[-1], tw_ref.py[-1], rtol=0, atol=1e-14)
+    xo.assert_allclose(tw_ref_thick.kin_px[-1], tw_ref.kin_px[-1], rtol=0, atol=1e-14)
+    xo.assert_allclose(tw_ref_thick.kin_py[-1], tw_ref.kin_py[-1], rtol=0, atol=1e-14)
+
+    xo.assert_allclose(tw_test_thick.x[-1], tw_test.x[-1], rtol=0, atol=1e-14)
+    xo.assert_allclose(tw_test_thick.y[-1], tw_test.y[-1], rtol=0, atol=1e-14)
+    xo.assert_allclose(tw_test_thick.px[-1], tw_test.px[-1], rtol=0, atol=1e-14)
+    xo.assert_allclose(tw_test_thick.py[-1], tw_test.py[-1], rtol=0, atol=1e-14)
+    xo.assert_allclose(tw_test_thick.kin_px[-1], tw_test.kin_px[-1], rtol=0, atol=1e-14)
+    xo.assert_allclose(tw_test_thick.kin_py[-1], tw_test.kin_py[-1], rtol=0, atol=1e-14)
+
+    tw_ref_back = line_ref.twiss(init=tw_ref, init_at='end')
+    tw_test_back = line_test.twiss(init=tw_test, init_at='end')
+    tw_ref_thick_back = line_ref_thick.twiss(init=tw_ref_thick, init_at='end')
+    tw_test_thick_back = line_test_thick.twiss(init=tw_test_thick, init_at='end')
+
+    for ttest, tref in zip([tw_ref_back, tw_test_back, tw_ref_thick_back, tw_test_thick_back],
+                        [tw_ref, tw_test, tw_ref_thick, tw_test_thick]):
+        xo.assert_allclose(ttest.x, tref.x, rtol=0, atol=1e-14)
+        xo.assert_allclose(ttest.y, tref.y, rtol=0, atol=1e-14)
+        xo.assert_allclose(ttest.px, tref.px, rtol=0, atol=1e-14)
+        xo.assert_allclose(ttest.py, tref.py, rtol=0, atol=1e-14)
+        xo.assert_allclose(ttest.kin_px, tref.kin_px, rtol=0, atol=1e-14)
+        xo.assert_allclose(ttest.kin_py, tref.kin_py, rtol=0, atol=1e-14)
+
+    line_test.discard_tracker()
+    line_test_thick.discard_tracker()
+    line_test.build_tracker(xo.context_default)
+    line_test_thick.build_tracker(xo.context_default)
+
+    line_ref.configure_radiation(model='mean')
+    line_test.configure_radiation(model='mean')
+    line_ref_thick.configure_radiation(model='mean')
+    line_test_thick.configure_radiation(model='mean')
+
+    tw_ref_rad = line_ref.twiss(x=0.1, y=0.2, betx=1, bety=1)
+    tw_test_rad = line_test.twiss(x=x0 + 0.1, y=y0 + 0.2, betx=1, bety=1)
+    tw_ref_thick_rad = line_ref_thick.twiss(x=0.1, y=0.2, betx=1, bety=1)
+    tw_test_thick_rad = line_test_thick.twiss(x=x0 + 0.1, y=y0 + 0.2, betx=1, bety=1)
+
+    assert tw_test_rad.delta[-1] < -5e-6
+    xo.assert_allclose(tw_test_rad.x, tw_ref_rad.x + x0, rtol=0, atol=1e-14)
+    xo.assert_allclose(tw_test_rad.y, tw_ref_rad.y + y0, rtol=0, atol=1e-14)
+    xo.assert_allclose(tw_test_rad.px, tw_ref_rad.px, rtol=0, atol=1e-14)
+    xo.assert_allclose(tw_test_rad.py, tw_ref_rad.py, rtol=0, atol=1e-14)
+    xo.assert_allclose(tw_test_rad.kin_px, tw_ref_rad.kin_px, rtol=0, atol=1e-14)
+    xo.assert_allclose(tw_test_rad.kin_py, tw_ref_rad.kin_py, rtol=0, atol=1e-14)
+    xo.assert_allclose(tw_test_rad.delta, tw_ref_rad.delta, rtol=0, atol=1e-14)
+
+    xo.assert_allclose(tw_test_thick_rad.x, tw_ref_thick_rad.x + x0, rtol=0, atol=1e-14)
+    xo.assert_allclose(tw_test_thick_rad.y, tw_ref_thick_rad.y + y0, rtol=0, atol=1e-14)
+    xo.assert_allclose(tw_test_thick_rad.px, tw_ref_thick_rad.px, rtol=0, atol=1e-14)
+    xo.assert_allclose(tw_test_thick_rad.py, tw_ref_thick_rad.py, rtol=0, atol=1e-14)
+    xo.assert_allclose(tw_test_thick_rad.kin_px, tw_ref_thick_rad.kin_px, rtol=0, atol=1e-14)
+    xo.assert_allclose(tw_test_thick_rad.kin_py, tw_ref_thick_rad.kin_py, rtol=0, atol=1e-14)
+    xo.assert_allclose(tw_test_thick_rad.delta, tw_ref_thick_rad.delta, rtol=0, atol=1e-14)
+
+@for_all_test_contexts
+def test_variable_solenoid_x0y0(test_context):
+
+    env = xt.Environment()
+    env.particle_ref = xt.Particles(mass0=xt.ELECTRON_MASS_EV, p0c=20e9)
+
+    line_ref = env.new_line(components=[
+        env.new('sol_ref0', xt.VariableSolenoid, length=3, ks_profile=[0., 0.1]),
+        env.new('sol_ref1', xt.VariableSolenoid, length=3, ks_profile=[0.1, 0.3]),
+        env.new('sol_ref2', xt.VariableSolenoid, length=3, ks_profile=[0.3, 0.]),
+        env.new('end', xt.Marker)
+        ])
+    tw_ref = line_ref.twiss(x=0.1, y=0.2, betx=1, bety=1)
+
+    x0 = 0.05
+    y0 = 0.15
+    line_test = env.new_line(components=[
+        env.new('solt_test0', xt.VariableSolenoid, length=3, ks_profile=[0., 0.1], x0=x0, y0=y0),
+        env.new('solt_test1', xt.VariableSolenoid, length=3, ks_profile=[0.1, 0.3], x0=x0, y0=y0),
+        env.new('solt_test2', xt.VariableSolenoid, length=3, ks_profile=[0.3, 0.], x0=x0, y0=y0),
+        env.place('end')
+        ])
+    line_test.build_tracker(test_context)
+    tw_test = line_test.twiss(x=x0 + 0.1, y=y0 + 0.2, betx=1, bety=1)
+
+    xo.assert_allclose(tw_test.x, tw_ref.x + x0, rtol=0, atol=1e-14)
+    xo.assert_allclose(tw_test.y, tw_ref.y + y0, rtol=0, atol=1e-14)
+    xo.assert_allclose(tw_test.px, tw_ref.px, rtol=0, atol=1e-14)
+    xo.assert_allclose(tw_test.py, tw_ref.py, rtol=0, atol=1e-14)
+    xo.assert_allclose(tw_test.kin_px, tw_ref.kin_px, rtol=0, atol=1e-14)
+    xo.assert_allclose(tw_test.kin_py, tw_ref.kin_py, rtol=0, atol=1e-14)
+
+    tw_ref_back = line_ref.twiss(init=tw_ref, init_at='end')
+    tw_test_back = line_test.twiss(init=tw_test, init_at='end')
+
+    for ttest, tref in zip([tw_ref_back, tw_test_back],
+                        [tw_ref, tw_test]):
+        xo.assert_allclose(ttest.x, tref.x, rtol=0, atol=1e-14)
+        xo.assert_allclose(ttest.y, tref.y, rtol=0, atol=1e-14)
+        xo.assert_allclose(ttest.px, tref.px, rtol=0, atol=1e-14)
+        xo.assert_allclose(ttest.py, tref.py, rtol=0, atol=1e-14)
+        xo.assert_allclose(ttest.kin_px, tref.kin_px, rtol=0, atol=1e-14)
+        xo.assert_allclose(ttest.kin_py, tref.kin_py, rtol=0, atol=1e-14)
+
+    line_ref.configure_radiation(model='mean')
+    line_test.configure_radiation(model='mean')
+
+    line_test.discard_tracker()
+    line_test.build_tracker(xo.context_default)
+
+    tw_ref_rad = line_ref.twiss(x=0.1, y=0.2, betx=1, bety=1)
+    tw_test_rad = line_test.twiss(x=x0 + 0.1, y=y0 + 0.2, betx=1, bety=1)
+
+    assert tw_test_rad.delta[-1] < -5e-5
+    xo.assert_allclose(tw_test_rad.x, tw_ref_rad.x + x0, rtol=0, atol=1e-14)
+    xo.assert_allclose(tw_test_rad.y, tw_ref_rad.y + y0, rtol=0, atol=1e-14)
+    xo.assert_allclose(tw_test_rad.px, tw_ref_rad.px, rtol=0, atol=1e-14)
+    xo.assert_allclose(tw_test_rad.py, tw_ref_rad.py, rtol=0, atol=1e-14)
+    xo.assert_allclose(tw_test_rad.kin_px, tw_ref_rad.kin_px, rtol=0, atol=1e-14)
+    xo.assert_allclose(tw_test_rad.kin_py, tw_ref_rad.kin_py, rtol=0, atol=1e-14)
+    xo.assert_allclose(tw_test_rad.delta, tw_ref_rad.delta, rtol=0, atol=1e-14)

xtrack-0.88.7/xtrack/_version.py

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

{xtrack-0.88.5 → xtrack-0.88.7}/xtrack/base_element.py

@@ -341,21 +341,26 @@ class MetaBeamElement(xo.MetaHybridClass):
 
         data_in = data.copy()
         data = {}
-        is_old_thing = False
-        for bb in bases: # Patch to support old-style "beam element" inheritance used in xcoll
-            if bb.__name__ != 'BeamElement' and'BeamElement' in set(cc.__name__ for cc in bb.__mro__):
-                is_old_thing = True
-                break
-        if not is_old_thing: # Presently we assume that none of the parents is inheriting from BeamElement
-            for bb in bases:
-                if bb.__name__ == 'HybridClass':
+        for bb in bases:
+            if bb.__name__ == 'HybridClass':
+                continue
+            if bb.__name__ == 'BeamElement':
+                continue
+            for kk, vv in bb.__dict__.items():
+                if kk.startswith('__') or kk in data_in.keys():
                     continue
-                if bb.__name__ == 'BeamElement':
-                    continue
-                for kk, vv in bb.__dict__.items():
-                    if kk.startswith('__') or kk in data_in.keys():
-                        continue
-                    data[kk] = vv
+                data[kk] = vv
+
+        # If inheriting _extra_c_sources, remove get_record function
+        if '_extra_c_sources' in data:
+            ii_remove = None
+            for ii, ss in enumerate(data['_extra_c_sources']):
+                if isinstance(ss, str) and '/*---GENERATED GET RECORD FUNCTION---*/' in ss:
+                   ii_remove = ii
+                   break
+            if ii_remove is not None:
+                data['_extra_c_sources'].pop(ii_remove)
+
         data.update(data_in)
 
         # Take xofields from data['_xofields'] or from bases

{xtrack-0.88.5 → xtrack-0.88.7}/xtrack/beam_elements/elements.py

@@ -1939,6 +1939,10 @@ class UniformSolenoid(BeamElement):
         Strength of the solenoid component.
     length : float
         Length of the element in meters along the reference trajectory.
+    x0 : float, optional
+        Horizontal offset of the solenoid center in meters. Defaults to 0.
+    y0 : float, optional
+        Vertical offset of the solenoid center in meters. Defaults to 0.
     order : int, optional
         Maximum order of multipole expansion for this magnet. Defaults to 5.
     knl : list of floats, optional
@@ -1967,6 +1971,8 @@ class UniformSolenoid(BeamElement):
     _xofields={
         'ks': xo.Float64,
         'length': xo.Float64,
+        'x0': xo.Float64,
+        'y0': xo.Float64,
         'order': xo.Int64,
         'inv_factorial_order': xo.Float64,
         'knl': xo.Float64[:],
@@ -2093,6 +2099,8 @@ class VariableSolenoid(BeamElement):
     _xofields={
         'ks_profile': xo.Float64[2],
         'length': xo.Float64,
+        'x0': xo.Float64,
+        'y0': xo.Float64,
         'order': xo.Int64,
         'inv_factorial_order': xo.Float64,
         'knl': xo.Float64[:],

{xtrack-0.88.5 → xtrack-0.88.7}/xtrack/beam_elements/elements_src/bend.h

@@ -45,6 +45,8 @@ void Bend_track_local_particle(
         /*k3s*/                   0.,
         /*ks*/                    0.,
         /*dks_ds*/                0.,
+        /*x0_solenoid*/           0.,
+        /*y0_solenoid*/           0.,
         /*rbend_model*/           -1, // not rbend
         /*rbend_shift*/           0.,
         /*body_active*/           1,

{xtrack-0.88.5 → xtrack-0.88.7}/xtrack/beam_elements/elements_src/magnet.h

@@ -46,6 +46,8 @@ void Magnet_track_local_particle(
         /*k3s*/                   MagnetData_get_k3s(el),
         /*ks*/                    0.,
         /*dks_ds*/                0.,
+        /*x0_solenoid*/           0.,
+        /*y0_solenoid*/           0.,
         /*rbend_model*/           -1, // not rbend
         /*rbend_shift*/           0.,
         /*body_active*/           1,

{xtrack-0.88.5 → xtrack-0.88.7}/xtrack/beam_elements/elements_src/magnet_edge.h

@@ -46,6 +46,8 @@ void MagnetEdge_track_local_particle(MagnetEdgeData el, LocalParticle* part0)
         /* factor_knl_ksl */ 1,
         kl_order,
         ks,
+        0., // x0_solenoid
+        0., // y0_solenoid
         length,
         face_angle,
         face_angle_feed_down,

{xtrack-0.88.5 → xtrack-0.88.7}/xtrack/beam_elements/elements_src/multipole.h

@@ -48,6 +48,8 @@ void Multipole_track_local_particle(MultipoleData el, LocalParticle* part0){
         /*k3s*/                   0.,
         /*ks*/                    0.,
         /*dks_ds*/                0.,
+        /*x0_solenoid*/           0.,
+        /*y0_solenoid*/           0.,
         /*rbend_model*/           -1, // not rbend
         /*rbend_shift*/           0.,
         /*body_active*/           1,

{xtrack-0.88.5 → xtrack-0.88.7}/xtrack/beam_elements/elements_src/octupole.h

@@ -45,6 +45,8 @@ void Octupole_track_local_particle(
         /*k3s*/                   OctupoleData_get_k3s(el),
         /*ks*/                    0.,
         /*dks_ds*/                0.,
+        /*x0_solenoid*/           0.,
+        /*y0_solenoid*/           0.,
         /*rbend_model*/           -1, // not rbend
         /*rbend_shift*/           0.,
         /*body_active*/           1,

{xtrack-0.88.5 → xtrack-0.88.7}/xtrack/beam_elements/elements_src/quadrupole.h

@@ -45,6 +45,8 @@ void Quadrupole_track_local_particle(
         /*k3s*/                   0.,
         /*ks*/                    0.,
         /*dks_ds*/                0.,
+        /*x0_solenoid*/           0.,
+        /*y0_solenoid*/           0.,
         /*rbend_model*/           -1, // not rbend
         /*rbend_shift*/           0.,
         /*body_active*/           1,

{xtrack-0.88.5 → xtrack-0.88.7}/xtrack/beam_elements/elements_src/rbend.h

@@ -45,6 +45,8 @@ void RBend_track_local_particle(
         /*k3s*/                   0.,
         /*ks*/                    0.,
         /*dks_ds*/                0.,
+        /*x0_solenoid*/           0.,
+        /*y0_solenoid*/           0.,
         /*rbend_model*/           RBendData_get_rbend_model(el),
         /*rbend_shift*/           RBendData_get_rbend_shift(el),
         /*body_active*/           1,

{xtrack-0.88.5 → xtrack-0.88.7}/xtrack/beam_elements/elements_src/sextupole.h

@@ -45,6 +45,8 @@ void Sextupole_track_local_particle(
         /*k3s*/                   0.,
         /*ks*/                    0.,
         /*dks_ds*/                0.,
+        /*x0_solenoid*/           0.,
+        /*y0_solenoid*/           0.,
         /*rbend_model*/           -1, // not rbend
         /*rbend_shift*/           0.,
         /*body_active*/           1,

{xtrack-0.88.5 → xtrack-0.88.7}/xtrack/beam_elements/elements_src/slnd.h

@@ -45,6 +45,8 @@ void UniformSolenoid_track_local_particle(
         /*k3s*/                   0.,
         /*ks*/                    UniformSolenoidData_get_ks(el),
         /*dks_ds*/                0.,
+        /*x0_solenoid*/           UniformSolenoidData_get_x0(el),
+        /*y0_solenoid*/           UniformSolenoidData_get_y0(el),
         /*rbend_model*/           -1, // not rbend
         /*rbend_shift*/           0.,
         /*body_active*/           1,

{xtrack-0.88.5 → xtrack-0.88.7}/xtrack/beam_elements/elements_src/thick_slice_bend.h

@@ -48,6 +48,8 @@ void ThickSliceBend_track_local_particle(
         /*k3s*/                   0.,
         /*ks*/                    0.,
         /*dks_ds*/                0.,
+        /*x0_solenoid*/           0.,
+        /*y0_solenoid*/           0.,
         /*rbend_model*/           -1, // not rbend
         /*rbend_shift*/           0.,
         /*body_active*/           1,

{xtrack-0.88.5 → xtrack-0.88.7}/xtrack/beam_elements/elements_src/thick_slice_octupole.h

@@ -48,6 +48,8 @@ void ThickSliceOctupole_track_local_particle(
         /*k3s*/                   ThickSliceOctupoleData_get__parent_k3s(el),
         /*ks*/                    0.,
         /*dks_ds*/                0.,
+        /*x0_solenoid*/           0.,
+        /*y0_solenoid*/           0.,
         /*rbend_model*/           -1, // not rbend
         /*rbend_shift*/           0.,
         /*body_active*/           1,

{xtrack-0.88.5 → xtrack-0.88.7}/xtrack/beam_elements/elements_src/thick_slice_quadrupole.h

@@ -48,6 +48,8 @@ void ThickSliceQuadrupole_track_local_particle(
         /*k3s*/                   0.,
         /*ks*/                    0.,
         /*dks_ds*/                0.,
+        /*x0_solenoid*/           0.,
+        /*y0_solenoid*/           0.,
         /*rbend_model*/           -1, // not rbend
         /*rbend_shift*/           0.,
         /*body_active*/           1,

{xtrack-0.88.5 → xtrack-0.88.7}/xtrack/beam_elements/elements_src/thick_slice_rbend.h

@@ -48,6 +48,8 @@ void ThickSliceRBend_track_local_particle(
         /*k3s*/                   0.,
         /*ks*/                    0.,
         /*dks_ds*/                0.,
+        /*x0_solenoid*/           0.,
+        /*y0_solenoid*/           0.,
         /*rbend_model*/           ThickSliceRBendData_get__parent_rbend_model(el),
         /*rbend_shift*/           ThickSliceRBendData_get__parent_rbend_shift(el),
         /*body_active*/           1,

{xtrack-0.88.5 → xtrack-0.88.7}/xtrack/beam_elements/elements_src/thick_slice_sextupole.h

@@ -48,6 +48,8 @@ void ThickSliceSextupole_track_local_particle(
         /*k3s*/                   0.,
         /*ks*/                    0.,
         /*dks_ds*/                0.,
+        /*x0_solenoid*/           0.,
+        /*y0_solenoid*/           0.,
         /*rbend_model*/           -1, // not rbend
         /*rbend_shift*/           0.,
         /*body_active*/           1,

{xtrack-0.88.5 → xtrack-0.88.7}/xtrack/beam_elements/elements_src/thick_slice_uniform_solenoid.h

@@ -48,6 +48,8 @@ void ThickSliceUniformSolenoid_track_local_particle(
         /*k3s*/                   0.,
         /*ks*/                    ThickSliceUniformSolenoidData_get__parent_ks(el),
         /*dks_ds*/                0.,
+        /*x0_solenoid*/           ThickSliceUniformSolenoidData_get__parent_x0(el),
+        /*y0_solenoid*/           ThickSliceUniformSolenoidData_get__parent_y0(el),
         /*rbend_model*/           -1, // not rbend
         /*rbend_shift*/           0.,
         /*body_active*/           1,

{xtrack-0.88.5 → xtrack-0.88.7}/xtrack/beam_elements/elements_src/thin_slice_bend.h

@@ -48,6 +48,8 @@ void ThinSliceBend_track_local_particle(
         /*k3s*/                   0.,
         /*ks*/                    0.,
         /*dks_ds*/                0.,
+        /*x0_solenoid*/           0.,
+        /*y0_solenoid*/           0.,
         /*rbend_model*/           -1, // not rbend
         /*rbend_shift*/           0.,
         /*body_active*/           1,

{xtrack-0.88.5 → xtrack-0.88.7}/xtrack/beam_elements/elements_src/thin_slice_bend_entry.h

@@ -48,6 +48,8 @@ void ThinSliceBendEntry_track_local_particle(
         /*k3s*/                   0.,
         /*ks*/                    0.,
         /*dks_ds*/                0.,
+        /*x0_solenoid*/           0.,
+        /*y0_solenoid*/           0.,
         /*rbend_model*/           -1, // not rbend
         /*rbend_shift*/           0.,
         /*body_active*/           0, // disabled

{xtrack-0.88.5 → xtrack-0.88.7}/xtrack/beam_elements/elements_src/thin_slice_bend_exit.h

@@ -48,6 +48,8 @@ void ThinSliceBendExit_track_local_particle(
         /*k3s*/                   0.,
         /*ks*/                    0.,
         /*dks_ds*/                0.,
+        /*x0_solenoid*/           0.,
+        /*y0_solenoid*/           0.,
         /*rbend_model*/           -1, // not rbend
         /*rbend_shift*/           0.,
         /*body_active*/           0, // disabled

{xtrack-0.88.5 → xtrack-0.88.7}/xtrack/beam_elements/elements_src/thin_slice_octupole.h

@@ -48,6 +48,8 @@ void ThinSliceOctupole_track_local_particle(
         /*k3s*/                   ThinSliceOctupoleData_get__parent_k3s(el),
         /*ks*/                    0.,
         /*dks_ds*/                0.,
+        /*x0_solenoid*/           0.,
+        /*y0_solenoid*/           0.,
         /*rbend_model*/           -1, // not rbend
         /*rbend_shift*/           0.,
         /*body_active*/           1,

{xtrack-0.88.5 → xtrack-0.88.7}/xtrack/beam_elements/elements_src/thin_slice_octupole_entry.h

@@ -48,6 +48,8 @@ void ThinSliceOctupoleEntry_track_local_particle(
         /*k3s*/                   ThinSliceOctupoleEntryData_get__parent_k3s(el),
         /*ks*/                    0.,
         /*dks_ds*/                0.,
+        /*x0_solenoid*/           0.,
+        /*y0_solenoid*/           0.,
         /*rbend_model*/           -1, // not rbend
         /*rbend_shift*/           0.,
         /*body_active*/           0, // disabled

{xtrack-0.88.5 → xtrack-0.88.7}/xtrack/beam_elements/elements_src/thin_slice_octupole_exit.h

@@ -48,6 +48,8 @@ void ThinSliceOctupoleExit_track_local_particle(
         /*k3s*/                   ThinSliceOctupoleExitData_get__parent_k3s(el),
         /*ks*/                    0.,
         /*dks_ds*/                0.,
+        /*x0_solenoid*/           0.,
+        /*y0_solenoid*/           0.,
         /*rbend_model*/           -1, // not rbend
         /*rbend_shift*/           0.,
         /*body_active*/           0, // disabled

{xtrack-0.88.5 → xtrack-0.88.7}/xtrack/beam_elements/elements_src/thin_slice_quadrupole.h

@@ -48,6 +48,8 @@ void ThinSliceQuadrupole_track_local_particle(
         /*k3s*/                   0.,
         /*ks*/                    0.,
         /*dks_ds*/                0.,
+        /*x0_solenoid*/           0.,
+        /*y0_solenoid*/           0.,
         /*rbend_model*/           -1, // not rbend
         /*rbend_shift*/           0.,
         /*body_active*/           1,

{xtrack-0.88.5 → xtrack-0.88.7}/xtrack/beam_elements/elements_src/thin_slice_quadrupole_entry.h

@@ -48,6 +48,8 @@ void ThinSliceQuadrupoleEntry_track_local_particle(
         /*k3s*/                   0.,
         /*ks*/                    0.,
         /*dks_ds*/                0.,
+        /*x0_solenoid*/           0.,
+        /*y0_solenoid*/           0.,
         /*rbend_model*/           -1, // not rbend
         /*rbend_shift*/           0.,
         /*body_active*/           0, // disabled

{xtrack-0.88.5 → xtrack-0.88.7}/xtrack/beam_elements/elements_src/thin_slice_quadrupole_exit.h

@@ -48,6 +48,8 @@ void ThinSliceQuadrupoleExit_track_local_particle(
         /*k3s*/                   0.,
         /*ks*/                    0.,
         /*dks_ds*/                0.,
+        /*x0_solenoid*/           0.,
+        /*y0_solenoid*/           0.,
         /*rbend_model*/           -1, // not rbend
         /*rbend_shift*/           0.,
         /*body_active*/           0, // disabled

{xtrack-0.88.5 → xtrack-0.88.7}/xtrack/beam_elements/elements_src/thin_slice_rbend.h

@@ -48,6 +48,8 @@ void ThinSliceRBend_track_local_particle(
         /*k3s*/                   0.,
         /*ks*/                    0.,
         /*dks_ds*/                0.,
+        /*x0_solenoid*/           0.,
+        /*y0_solenoid*/           0.,
         /*rbend_model*/           ThinSliceRBendData_get__parent_rbend_model(el),
         /*rbend_shift*/           ThinSliceRBendData_get__parent_rbend_shift(el),
         /*body_active*/           1,

{xtrack-0.88.5 → xtrack-0.88.7}/xtrack/beam_elements/elements_src/thin_slice_rbend_entry.h

@@ -48,6 +48,8 @@ void ThinSliceRBendEntry_track_local_particle(
         /*k3s*/                   0.,
         /*ks*/                    0.,
         /*dks_ds*/                0.,
+        /*x0_solenoid*/           0.,
+        /*y0_solenoid*/           0.,
         /*rbend_model*/           ThinSliceRBendEntryData_get__parent_rbend_model(el),
         /*rbend_shift*/           ThinSliceRBendEntryData_get__parent_rbend_shift(el),
         /*body_active*/           0, // disabled

{xtrack-0.88.5 → xtrack-0.88.7}/xtrack/beam_elements/elements_src/thin_slice_rbend_exit.h

@@ -48,6 +48,8 @@ void ThinSliceRBendExit_track_local_particle(
         /*k3s*/                   0.,
         /*ks*/                    0.,
         /*dks_ds*/                0.,
+        /*x0_solenoid*/           0.,
+        /*y0_solenoid*/           0.,
         /*rbend_model*/           ThinSliceRBendExitData_get__parent_rbend_model(el),
         /*rbend_shift*/           ThinSliceRBendExitData_get__parent_rbend_shift(el),
         /*body_active*/           0, // disabled

{xtrack-0.88.5 → xtrack-0.88.7}/xtrack/beam_elements/elements_src/thin_slice_sextupole.h

@@ -48,6 +48,8 @@ void ThinSliceSextupole_track_local_particle(
         /*k3s*/                   0.,
         /*ks*/                    0.,
         /*dks_ds*/                0.,
+        /*x0_solenoid*/           0.,
+        /*y0_solenoid*/           0.,
         /*rbend_model*/           -1, // not rbend
         /*rbend_shift*/           0.,
         /*body_active*/           1,

{xtrack-0.88.5 → xtrack-0.88.7}/xtrack/beam_elements/elements_src/thin_slice_sextupole_entry.h

@@ -48,6 +48,8 @@ void ThinSliceSextupoleEntry_track_local_particle(
         /*k3s*/                   0.,
         /*ks*/                    0.,
         /*dks_ds*/                0.,
+        /*x0_solenoid*/           0.,
+        /*y0_solenoid*/           0.,
         /*rbend_model*/           -1, // not rbend
         /*rbend_shift*/           0.,
         /*body_active*/           0, // disabled

{xtrack-0.88.5 → xtrack-0.88.7}/xtrack/beam_elements/elements_src/thin_slice_sextupole_exit.h

@@ -48,6 +48,8 @@ void ThinSliceSextupoleExit_track_local_particle(
         /*k3s*/                   0.,
         /*ks*/                    0.,
         /*dks_ds*/                0.,
+        /*x0_solenoid*/           0.,
+        /*y0_solenoid*/           0.,
         /*rbend_model*/           -1, // not rbend
         /*rbend_shift*/           0.,
         /*body_active*/           0, // disabled

{xtrack-0.88.5 → xtrack-0.88.7}/xtrack/beam_elements/elements_src/thin_slice_uniform_solenoid_entry.h

@@ -48,6 +48,8 @@ void ThinSliceUniformSolenoidEntry_track_local_particle(
         /*k3s*/                   0.,
         /*ks*/                    ThinSliceUniformSolenoidEntryData_get__parent_ks(el),
         /*dks_ds*/                0.,
+        /*x0_solenoid*/           ThinSliceUniformSolenoidEntryData_get__parent_x0(el),
+        /*y0_solenoid*/           ThinSliceUniformSolenoidEntryData_get__parent_y0(el),
         /*rbend_model*/           -1, // not rbend
         /*rbend_shift*/           0.,
         /*body_active*/           0, // disabled

{xtrack-0.88.5 → xtrack-0.88.7}/xtrack/beam_elements/elements_src/thin_slice_uniform_solenoid_exit.h

@@ -48,6 +48,8 @@ void ThinSliceUniformSolenoidExit_track_local_particle(
         /*k3s*/                   0.,
         /*ks*/                    ThinSliceUniformSolenoidExitData_get__parent_ks(el),
         /*dks_ds*/                0.,
+        /*x0_solenoid*/           ThinSliceUniformSolenoidExitData_get__parent_x0(el),
+        /*y0_solenoid*/           ThinSliceUniformSolenoidExitData_get__parent_y0(el),
         /*rbend_model*/           -1, // not rbend
         /*rbend_shift*/           0.,
         /*body_active*/           0, // disabled

{xtrack-0.88.5 → xtrack-0.88.7}/xtrack/beam_elements/elements_src/track_magnet.h

@@ -201,6 +201,8 @@ void track_magnet_body_single_particle(
     const double k2s,
     const double k3s,
     const double dks_ds,
+    const double x0_solenoid,
+    const double y0_solenoid,
     const int64_t radiation_flag,
     const int64_t spin_flag,
     SynchrotronRadiationRecordData radiation_record,
@@ -219,7 +221,8 @@ void track_magnet_body_single_particle(
 
     #define MAGNET_DRIFT(part, dlength) \
         track_magnet_drift_single_particle(\
-            part, (dlength), k0_drift, k1_drift, ks_drift, h_drift, drift_model\
+            part, (dlength), k0_drift, k1_drift, ks_drift, h_drift,\
+            x0_solenoid, y0_solenoid, drift_model\
         )
 
     #ifdef XTRACK_MULTIPOLE_NO_SYNRAD
@@ -271,6 +274,8 @@ void track_magnet_body_single_particle(
                     k3s, \
                     ks_drift, \
                     dks_ds, \
+                    x0_solenoid, \
+                    y0_solenoid, \
                     &Bx_T, \
                     &By_T, \
                     &Bz_T \
@@ -436,6 +441,8 @@ void track_magnet_particles(
     double k3s,
     double ks,
     double dks_ds,
+    double x0_solenoid,
+    double y0_solenoid,
     int64_t rbend_model, // -1: not used, 0: auto, 1: curved body, 2: straight body
     double rbend_shift,
     int64_t body_active,
@@ -582,6 +589,8 @@ void track_magnet_particles(
             factor_knl_ksl_edge,
             order,
             ks,
+            x0_solenoid,
+            y0_solenoid,
             length,
             edge_entry_angle,
             edge_entry_angle_fdown,
@@ -659,6 +668,7 @@ void track_magnet_particles(
                 k0_h_correction, k1_h_correction,
                 k2, k3, k0s, k1s, k2s, k3s,
                 dks_ds,
+                x0_solenoid, y0_solenoid,
                 radiation_flag,
                 1, // spin_flag
                 radiation_record,
@@ -693,6 +703,8 @@ void track_magnet_particles(
             factor_knl_ksl_edge,
             order,
             ks,
+            x0_solenoid,
+            y0_solenoid,
             length,
             edge_exit_angle,
             edge_exit_angle_fdown,