xtrack 0.86.1__tar.gz → 0.86.3__tar.gz

{xtrack-0.86.1/xtrack.egg-info → xtrack-0.86.3}/PKG-INFO

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

{xtrack-0.86.1 → xtrack-0.86.3}/tests/test_radiation_equilibrium_emittances.py

@@ -124,32 +124,32 @@ def test_eq_emitt(conf):
     if not tilt_machine_by_90_degrees and not vertical_orbit_distortion and not wiggler_on:
         xo.assert_allclose(ex, 7.09232e-10, atol=0,     rtol=1e-4)
         xo.assert_allclose(ey, 0,           atol=1e-14, rtol=0)
-        xo.assert_allclose(ez, 3.43821e-06, atol=0,     rtol=1e-4)
+        xo.assert_allclose(ez, 3.36956e-06, atol=0,     rtol=1e-4)
         checked = True
     elif tilt_machine_by_90_degrees and not vertical_orbit_distortion and not wiggler_on:
         xo.assert_allclose(ex, 0,           atol=1e-14, rtol=0)
         xo.assert_allclose(ey, 7.09232e-10, atol=0,     rtol=1e-4)
-        xo.assert_allclose(ez, 3.43821e-6,  atol=0,     rtol=1e-4)
+        xo.assert_allclose(ez, 3.36956e-6,  atol=0,     rtol=1e-4)
         checked = True
     elif not tilt_machine_by_90_degrees and not vertical_orbit_distortion and wiggler_on:
         xo.assert_allclose(ex, 7.0283e-10, atol=0,     rtol=1e-4)
         xo.assert_allclose(ey, 5.5765e-13, atol=0,     rtol=4e-3)
-        xo.assert_allclose(ez, 3.6860e-6,  atol=0,     rtol=1e-4)
+        xo.assert_allclose(ez, 3.6042e-6,  atol=0,     rtol=1e-4)
         checked = True
     elif tilt_machine_by_90_degrees and not vertical_orbit_distortion and wiggler_on:
         xo.assert_allclose(ex, 5.5790e-13, atol=0,     rtol=4e-3)  # Quite large, to be kept in mind
         xo.assert_allclose(ey, 7.0283e-10, atol=0,     rtol=1e-4)
-        xo.assert_allclose(ez, 3.6860e-6,  atol=0,     rtol=1e-4)
+        xo.assert_allclose(ez, 3.6042e-6,  atol=0,     rtol=1e-4)
         checked = True
     elif not tilt_machine_by_90_degrees and vertical_orbit_distortion and not wiggler_on:
         xo.assert_allclose(ex, 7.0911e-10, atol=0,     rtol=1e-4)
         xo.assert_allclose(ey, 2.1821e-12, atol=0,     rtol=1e-2)
-        xo.assert_allclose(ez, 3.4221e-6,  atol=0,     rtol=1e-4)
+        xo.assert_allclose(ez, 3.3536e-6,  atol=0,     rtol=1e-4)
         checked = True
     elif tilt_machine_by_90_degrees and vertical_orbit_distortion and not wiggler_on:
         xo.assert_allclose(ex, 2.1828e-12, atol=0,     rtol=7e-3)
         xo.assert_allclose(ey, 7.0911e-10, atol=0,     rtol=1e-4)
-        xo.assert_allclose(ez, 3.4221e-6,  atol=0,     rtol=1e-4)
+        xo.assert_allclose(ez, 3.3536e-6,  atol=0,     rtol=1e-4)
         checked = True
     else:
         raise ValueError('Unknown configuration')
@@ -159,11 +159,11 @@ def test_eq_emitt(conf):
     # Check radiation integrals
     tw_integ = line.twiss(radiation_integrals=True)
     xo.assert_allclose(tw_integ.rad_int_damping_constant_x_s,
-                       tw_rad.damping_constants_s[0], rtol=0.02, atol=0)
+                       tw_rad.damping_constants_s[0], rtol=0.025, atol=0)
     xo.assert_allclose(tw_integ.rad_int_damping_constant_y_s,
-                       tw_rad.damping_constants_s[1], rtol=0.02, atol=0)
+                       tw_rad.damping_constants_s[1], rtol=0.025, atol=0)
     xo.assert_allclose(tw_integ.rad_int_damping_constant_zeta_s,
-                       tw_rad.damping_constants_s[2], rtol=0.02, atol=0)
+                       tw_rad.damping_constants_s[2], rtol=0.025, atol=0)
     xo.assert_allclose(tw_integ.rad_int_eq_gemitt_x, ex, rtol=0.15, atol=1e-14)
     xo.assert_allclose(tw_integ.rad_int_eq_gemitt_y, ey, rtol=0.15, atol=1e-14)
 

{xtrack-0.86.1 → xtrack-0.86.3}/tests/test_radiation_equilibrium_emittances_thick.py

@@ -131,32 +131,32 @@ def test_eq_emitt(conf):
     if not tilt_machine_by_90_degrees and not vertical_orbit_distortion and not wiggler_on:
         xo.assert_allclose(ex, 7.0923e-10, atol=0,     rtol=1e-4)
         xo.assert_allclose(ey, 0,          atol=1e-14, rtol=0)
-        xo.assert_allclose(ez, 3.5778e-6,  atol=0,     rtol=1e-4)
+        xo.assert_allclose(ez, 3.5064e-6,  atol=0,     rtol=1e-4)
         checked = True
     elif tilt_machine_by_90_degrees and not vertical_orbit_distortion and not wiggler_on:
         xo.assert_allclose(ex, 0,          atol=1e-14, rtol=0)
         xo.assert_allclose(ey, 7.0923e-10, atol=0,     rtol=1e-4)
-        xo.assert_allclose(ez, 3.5778e-6,  atol=0,     rtol=1e-4)
+        xo.assert_allclose(ez, 3.5064e-6,  atol=0,     rtol=1e-4)
         checked = True
     elif not tilt_machine_by_90_degrees and not vertical_orbit_distortion and wiggler_on:
         xo.assert_allclose(ex, 7.0283e-10, atol=0,     rtol=1e-4)
         xo.assert_allclose(ey, 5.6461e-13, atol=0,     rtol=4e-3)
-        xo.assert_allclose(ez, 3.8357e-6,  atol=0,     rtol=1e-4)
+        xo.assert_allclose(ez, 3.7506e-6,  atol=0,     rtol=1e-4)
         checked = True
     elif tilt_machine_by_90_degrees and not vertical_orbit_distortion and wiggler_on:
         xo.assert_allclose(ex, 5.6448e-13, atol=0,     rtol=1e-2)  # Quite large, to be kept in mind
         xo.assert_allclose(ey, 7.0283e-10, atol=0,     rtol=1e-4)
-        xo.assert_allclose(ez, 3.8357e-6,  atol=0,     rtol=1e-4)
+        xo.assert_allclose(ez, 3.7506e-6,  atol=0,     rtol=1e-4)
         checked = True
     elif not tilt_machine_by_90_degrees and vertical_orbit_distortion and not wiggler_on:
         xo.assert_allclose(ex, 7.0910e-10, atol=0,     rtol=1e-4)
         xo.assert_allclose(ey, 2.2195e-12, atol=0,     rtol=7e-3)
-        xo.assert_allclose(ez, 3.5607e-6,  atol=0,     rtol=2e-4)
+        xo.assert_allclose(ez, 3.4899e-6,  atol=0,     rtol=2e-4)
         checked = True
     elif tilt_machine_by_90_degrees and vertical_orbit_distortion and not wiggler_on:
         xo.assert_allclose(ex, 2.2154e-12, atol=0,     rtol=7e-3)
         xo.assert_allclose(ey, 7.0911e-10, atol=0,     rtol=1e-4)
-        xo.assert_allclose(ez, 3.5607e-6,  atol=0,     rtol=2e-4)
+        xo.assert_allclose(ez, 3.4899e-6,  atol=0,     rtol=2e-4)
         checked = True
     else:
         raise ValueError('Unknown configuration')
@@ -166,11 +166,11 @@ def test_eq_emitt(conf):
     # Check radiation integrals
     tw_integ = line.twiss(radiation_integrals=True)
     xo.assert_allclose(tw_integ.rad_int_damping_constant_x_s,
-                       tw_rad.damping_constants_s[0], rtol=0.02, atol=0)
+                       tw_rad.damping_constants_s[0], rtol=0.025, atol=0)
     xo.assert_allclose(tw_integ.rad_int_damping_constant_y_s,
-                       tw_rad.damping_constants_s[1], rtol=0.02, atol=0)
+                       tw_rad.damping_constants_s[1], rtol=0.025, atol=0)
     xo.assert_allclose(tw_integ.rad_int_damping_constant_zeta_s,
-                       tw_rad.damping_constants_s[2], rtol=0.02, atol=0)
+                       tw_rad.damping_constants_s[2], rtol=0.025, atol=0)
     xo.assert_allclose(tw_integ.rad_int_eq_gemitt_x, ex, rtol=0.15, atol=1e-14)
     xo.assert_allclose(tw_integ.rad_int_eq_gemitt_y, ey, rtol=0.15, atol=1e-14)
 

{xtrack-0.86.1 → xtrack-0.86.3}/tests/test_tapering.py

@@ -37,7 +37,7 @@ def test_tapering_and_twiss_with_radiation():
     line.configure_radiation(model='mean')
     # - Set cavity lags to compensate energy loss
     # - Taper magnet strengths
-    line.compensate_radiation_energy_loss()
+    line.compensate_radiation_energy_loss(delta0=0)
 
     for conf in configs:
         print(f'Running test with conf: {conf}')
@@ -126,3 +126,64 @@ def test_tapering_and_twiss_with_radiation():
         xo.assert_allclose(
             line['rf3'].voltage*np.sin((line['rf'].lag + line['rf'].lag_taper)/180*np.pi),
             eneloss/4, rtol=3e-5)
+
+def test_tapering_zero_mean():
+
+    filename = test_data_folder / 'clic_dr/line_for_taper.json'
+    with open(filename, 'r') as f:
+        line = xt.Line.from_dict(json.load(f))
+
+    line.build_tracker()
+
+    line['rf3'].voltage = 0. # desymmetrize the rf
+    line['rf'].voltage = 0.  # desymmetrize the rf
+
+    line['rf1'].voltage *= 2
+    line['rf2b'].voltage *= 2
+    line['rf2a'].voltage *= 2
+
+    line.particle_ref.p0c = 4e9  # eV
+
+    line.configure_radiation(model=None)
+    tw_no_rad = line.twiss(method='4d', freeze_longitudinal=True)
+
+    ###############################################
+    # Enable radiation and compensate energy loss #
+    ###############################################
+
+    line.configure_radiation(model='mean')
+
+    # - Set cavity lags to compensate energy loss
+    # - Taper magnet strengths to avoid optics and orbit distortions
+    line.compensate_radiation_energy_loss(max_iter=100, delta0='zero_mean')
+
+    ##############################
+    # Twiss to check the results #
+    ##############################
+
+    tw = line.twiss(method='6d')
+
+    tw.delta # contains the momentum deviation along the ring
+
+    #!end-doc-part
+
+    p0corr = 1 + tw.delta
+
+    delta_ave = np.trapezoid(tw.delta, tw.s)/tw.s[-1]
+    xo.assert_allclose(delta_ave, 0, rtol=0, atol=1e-6)
+
+    xo.assert_allclose(tw.qx, tw_no_rad.qx, rtol=0, atol=5e-4)
+    xo.assert_allclose(tw.qy, tw_no_rad.qy, rtol=0, atol=5e-4)
+
+    xo.assert_allclose(tw.dqx, tw_no_rad.dqx, rtol=0, atol=1.5e-2*tw.qx)
+    xo.assert_allclose(tw.dqy, tw_no_rad.dqy, rtol=0, atol=1.5e-2*tw.qy)
+
+    xo.assert_allclose(tw.x, tw_no_rad.x, rtol=0, atol=1e-7)
+    xo.assert_allclose(tw.y, tw_no_rad.y, rtol=0, atol=1e-7)
+
+    xo.assert_allclose(tw.betx*p0corr, tw_no_rad.betx, rtol=2e-2, atol=0)
+    xo.assert_allclose(tw.bety*p0corr, tw_no_rad.bety, rtol=2e-2, atol=0)
+
+    xo.assert_allclose(tw.dx, tw.dx, rtol=0.0, atol=0.1e-3)
+
+    xo.assert_allclose(tw.dy, tw.dy, rtol=0.0, atol=0.1e-3)

xtrack-0.86.3/xtrack/_version.py

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

{xtrack-0.86.1 → xtrack-0.86.3}/xtrack/beam_elements/__init__.py

@@ -8,9 +8,10 @@ from .exciter import Exciter
 from .apertures import *
 from .magnets import Magnet
 from .beam_interaction import BeamInteraction, ParticlesInjectionSample
-from .slice_elements import (ThinSliceQuadrupole, ThinSliceSextupole,
+from .slice_elements_thin import (ThinSliceQuadrupole, ThinSliceSextupole,
                              ThinSliceOctupole, ThinSliceBend,
-                             ThinSliceRBend,
+                             ThinSliceRBend)
+from .slice_elements_edge import (
                              ThinSliceBendEntry, ThinSliceBendExit,
                              ThinSliceRBendEntry, ThinSliceRBendExit,
                              ThinSliceQuadrupoleEntry, ThinSliceQuadrupoleExit,

{xtrack-0.86.1 → xtrack-0.86.3}/xtrack/beam_elements/elements_src/bend.h

@@ -8,6 +8,7 @@
 
 #include <headers/track.h>
 #include <beam_elements/elements_src/track_magnet.h>
+#include <beam_elements/elements_src/default_magnet_config.h>
 
 GPUFUN
 void Bend_track_local_particle(
@@ -16,17 +17,20 @@ void Bend_track_local_particle(
 ) {
 
     track_magnet_particles(
+        /*weight*/                1.0,
         /*part0*/                 part0,
         /*length*/                BendData_get_length(el),
         /*order*/                 BendData_get_order(el),
         /*inv_factorial_order*/   BendData_get_inv_factorial_order(el),
         /*knl*/                   BendData_getp1_knl(el, 0),
         /*ksl*/                   BendData_getp1_ksl(el, 0),
-        /*factor_knl_ksl*/        1.,
         /*num_multipole_kicks*/   BendData_get_num_multipole_kicks(el),
         /*model*/                 BendData_get_model(el),
+        /*default_model*/         BEND_DEFAULT_MODEL,
         /*integrator*/            BendData_get_integrator(el),
+        /*default_integrator*/    BEND_DEFAULT_INTEGRATOR,
         /*radiation_flag*/        BendData_get_radiation_flag(el),
+        /*radiation_flag_parent*/ 0, // not used here
         /*radiation_record*/      NULL,
         /*delta_taper*/           BendData_get_delta_taper(el),
         /*h*/                     BendData_get_h(el),
@@ -41,6 +45,8 @@ void Bend_track_local_particle(
         /*k3s*/                   0.,
         /*ks*/                    0.,
         /*dks_ds*/                0.,
+        /*rbend_model*/           -1, // not rbend
+        /*body_active*/           1,
         /*edge_entry_active*/     BendData_get_edge_entry_active(el),
         /*edge_exit_active*/      BendData_get_edge_exit_active(el),
         /*edge_entry_model*/      BendData_get_edge_entry_model(el),

xtrack-0.86.3/xtrack/beam_elements/elements_src/default_magnet_config.h

@@ -0,0 +1,22 @@
+// copyright ############################### //
+// This file is part of the Xtrack Package.  //
+// Copyright (c) CERN, 2023.                 //
+// ######################################### //
+
+#ifndef XTRACK_DEFAULT_MAGNET_CONFIG_H
+#define XTRACK_DEFAULT_MAGNET_CONFIG_H
+
+#define BEND_DEFAULT_MODEL       (3) // rot-kick-rot
+#define RBEND_DEFAULT_MODEL      (3) // rot-kick-rot
+#define QUADRUPOLE_DEFAULT_MODEL (4) // mat-kick-mat
+#define SEXTUPOLE_DEFAULT_MODEL  (6) // drift-kick-drift-expanded
+#define OCTUPOLE_DEFAULT_MODEL   (6) // drift-kick-drift-expanded
+
+#define BEND_DEFAULT_INTEGRATOR       (2) // Yoshida-4
+#define RBEND_DEFAULT_INTEGRATOR      (2) // Yoshida-4
+#define QUADRUPOLE_DEFAULT_INTEGRATOR (3) // uniform
+#define SEXTUPOLE_DEFAULT_INTEGRATOR  (3) // uniform
+#define OCTUPOLE_DEFAULT_INTEGRATOR   (3) // uniform
+#define SOLENOID_DEFAULT_INTEGRATOR   (3) // uniform
+
+#endif

xtrack-0.86.3/xtrack/beam_elements/elements_src/drift_slice_bend.h

@@ -0,0 +1,37 @@
+// This file is generated by _generate_slice_elements_c_code.py
+// Do not edit it directly.
+
+
+    // copyright ############################### //
+    // This file is part of the Xtrack Package.  //
+    // Copyright (c) CERN, 2023.                 //
+    // ######################################### //
+
+    #ifndef XTRACK_DRIFT_SLICE_BEND_H
+    #define XTRACK_DRIFT_SLICE_BEND_H
+
+    #include <headers/track.h>
+    #include <beam_elements/elements_src/track_drift.h>
+
+
+    GPUFUN
+    void DriftSliceBend_track_local_particle(
+            DriftSliceBendData el,
+            LocalParticle* part0
+    ) {
+
+        double weight = DriftSliceBendData_get_weight(el);
+
+        #ifndef XSUITE_BACKTRACK
+            double const length = weight * DriftSliceBendData_get__parent_length(el); // m
+        #else
+            double const length = -weight * DriftSliceBendData_get__parent_length(el); // m
+        #endif
+
+        START_PER_PARTICLE_BLOCK(part0, part);
+            Drift_single_particle(part, length);
+        END_PER_PARTICLE_BLOCK;
+    }
+
+    #endif
+    

xtrack-0.86.3/xtrack/beam_elements/elements_src/drift_slice_octupole.h

@@ -0,0 +1,37 @@
+// This file is generated by _generate_slice_elements_c_code.py
+// Do not edit it directly.
+
+
+    // copyright ############################### //
+    // This file is part of the Xtrack Package.  //
+    // Copyright (c) CERN, 2023.                 //
+    // ######################################### //
+
+    #ifndef XTRACK_DRIFT_SLICE_OCTUPOLE_H
+    #define XTRACK_DRIFT_SLICE_OCTUPOLE_H
+
+    #include <headers/track.h>
+    #include <beam_elements/elements_src/track_drift.h>
+
+
+    GPUFUN
+    void DriftSliceOctupole_track_local_particle(
+            DriftSliceOctupoleData el,
+            LocalParticle* part0
+    ) {
+
+        double weight = DriftSliceOctupoleData_get_weight(el);
+
+        #ifndef XSUITE_BACKTRACK
+            double const length = weight * DriftSliceOctupoleData_get__parent_length(el); // m
+        #else
+            double const length = -weight * DriftSliceOctupoleData_get__parent_length(el); // m
+        #endif
+
+        START_PER_PARTICLE_BLOCK(part0, part);
+            Drift_single_particle(part, length);
+        END_PER_PARTICLE_BLOCK;
+    }
+
+    #endif
+    

xtrack-0.86.3/xtrack/beam_elements/elements_src/drift_slice_quadrupole.h

@@ -0,0 +1,37 @@
+// This file is generated by _generate_slice_elements_c_code.py
+// Do not edit it directly.
+
+
+    // copyright ############################### //
+    // This file is part of the Xtrack Package.  //
+    // Copyright (c) CERN, 2023.                 //
+    // ######################################### //
+
+    #ifndef XTRACK_DRIFT_SLICE_QUADRUPOLE_H
+    #define XTRACK_DRIFT_SLICE_QUADRUPOLE_H
+
+    #include <headers/track.h>
+    #include <beam_elements/elements_src/track_drift.h>
+
+
+    GPUFUN
+    void DriftSliceQuadrupole_track_local_particle(
+            DriftSliceQuadrupoleData el,
+            LocalParticle* part0
+    ) {
+
+        double weight = DriftSliceQuadrupoleData_get_weight(el);
+
+        #ifndef XSUITE_BACKTRACK
+            double const length = weight * DriftSliceQuadrupoleData_get__parent_length(el); // m
+        #else
+            double const length = -weight * DriftSliceQuadrupoleData_get__parent_length(el); // m
+        #endif
+
+        START_PER_PARTICLE_BLOCK(part0, part);
+            Drift_single_particle(part, length);
+        END_PER_PARTICLE_BLOCK;
+    }
+
+    #endif
+    

xtrack-0.86.3/xtrack/beam_elements/elements_src/drift_slice_rbend.h

@@ -0,0 +1,37 @@
+// This file is generated by _generate_slice_elements_c_code.py
+// Do not edit it directly.
+
+
+    // copyright ############################### //
+    // This file is part of the Xtrack Package.  //
+    // Copyright (c) CERN, 2023.                 //
+    // ######################################### //
+
+    #ifndef XTRACK_DRIFT_SLICE_RBEND_H
+    #define XTRACK_DRIFT_SLICE_RBEND_H
+
+    #include <headers/track.h>
+    #include <beam_elements/elements_src/track_drift.h>
+
+
+    GPUFUN
+    void DriftSliceRBend_track_local_particle(
+            DriftSliceRBendData el,
+            LocalParticle* part0
+    ) {
+
+        double weight = DriftSliceRBendData_get_weight(el);
+
+        #ifndef XSUITE_BACKTRACK
+            double const length = weight * DriftSliceRBendData_get__parent_length(el); // m
+        #else
+            double const length = -weight * DriftSliceRBendData_get__parent_length(el); // m
+        #endif
+
+        START_PER_PARTICLE_BLOCK(part0, part);
+            Drift_single_particle(part, length);
+        END_PER_PARTICLE_BLOCK;
+    }
+
+    #endif
+    

xtrack-0.86.3/xtrack/beam_elements/elements_src/drift_slice_sextupole.h

@@ -0,0 +1,37 @@
+// This file is generated by _generate_slice_elements_c_code.py
+// Do not edit it directly.
+
+
+    // copyright ############################### //
+    // This file is part of the Xtrack Package.  //
+    // Copyright (c) CERN, 2023.                 //
+    // ######################################### //
+
+    #ifndef XTRACK_DRIFT_SLICE_SEXTUPOLE_H
+    #define XTRACK_DRIFT_SLICE_SEXTUPOLE_H
+
+    #include <headers/track.h>
+    #include <beam_elements/elements_src/track_drift.h>
+
+
+    GPUFUN
+    void DriftSliceSextupole_track_local_particle(
+            DriftSliceSextupoleData el,
+            LocalParticle* part0
+    ) {
+
+        double weight = DriftSliceSextupoleData_get_weight(el);
+
+        #ifndef XSUITE_BACKTRACK
+            double const length = weight * DriftSliceSextupoleData_get__parent_length(el); // m
+        #else
+            double const length = -weight * DriftSliceSextupoleData_get__parent_length(el); // m
+        #endif
+
+        START_PER_PARTICLE_BLOCK(part0, part);
+            Drift_single_particle(part, length);
+        END_PER_PARTICLE_BLOCK;
+    }
+
+    #endif
+    

xtrack-0.86.3/xtrack/beam_elements/elements_src/drift_slice_uniform_solenoid.h

@@ -0,0 +1,37 @@
+// This file is generated by _generate_slice_elements_c_code.py
+// Do not edit it directly.
+
+
+    // copyright ############################### //
+    // This file is part of the Xtrack Package.  //
+    // Copyright (c) CERN, 2023.                 //
+    // ######################################### //
+
+    #ifndef XTRACK_DRIFT_SLICE_UNIFORMSOLENOID_H
+    #define XTRACK_DRIFT_SLICE_UNIFORMSOLENOID_H
+
+    #include <headers/track.h>
+    #include <beam_elements/elements_src/track_drift.h>
+
+
+    GPUFUN
+    void DriftSliceUniformSolenoid_track_local_particle(
+            DriftSliceUniformSolenoidData el,
+            LocalParticle* part0
+    ) {
+
+        double weight = DriftSliceUniformSolenoidData_get_weight(el);
+
+        #ifndef XSUITE_BACKTRACK
+            double const length = weight * DriftSliceUniformSolenoidData_get__parent_length(el); // m
+        #else
+            double const length = -weight * DriftSliceUniformSolenoidData_get__parent_length(el); // m
+        #endif
+
+        START_PER_PARTICLE_BLOCK(part0, part);
+            Drift_single_particle(part, length);
+        END_PER_PARTICLE_BLOCK;
+    }
+
+    #endif
+    

xtrack-0.86.3/xtrack/beam_elements/elements_src/magnet.h

@@ -0,0 +1,66 @@
+// copyright ############################### //
+// This file is part of the Xtrack Package.  //
+// Copyright (c) CERN, 2023.                 //
+// ######################################### //
+
+#ifndef XTRACK_MAGNET_H
+#define XTRACK_MAGNET_H
+
+#include <headers/track.h>
+#include <beam_elements/elements_src/track_magnet.h>
+#include <beam_elements/elements_src/default_magnet_config.h>
+
+
+GPUFUN
+void Magnet_track_local_particle(
+    MagnetData el,
+    LocalParticle* part0
+) {
+
+    track_magnet_particles(
+        /*weight*/                1.0,
+        /*part0*/                 part0,
+        /*length*/                MagnetData_get_length(el),
+        /*order*/                 MagnetData_get_order(el),
+        /*inv_factorial_order*/   MagnetData_get_inv_factorial_order(el),
+        /*knl*/                   MagnetData_getp1_knl(el, 0),
+        /*ksl*/                   MagnetData_getp1_ksl(el, 0),
+        /*num_multipole_kicks*/   MagnetData_get_num_multipole_kicks(el),
+        /*model*/                 MagnetData_get_model(el),
+        /*default_model*/         BEND_DEFAULT_MODEL,
+        /*integrator*/            MagnetData_get_integrator(el),
+        /*default_integrator*/    BEND_DEFAULT_INTEGRATOR,
+        /*radiation_flag*/        MagnetData_get_radiation_flag(el),
+        /*radiation_flag_parent*/ 0, // not used here
+        /*radiation_record*/      NULL,
+        /*delta_taper*/           MagnetData_get_delta_taper(el),
+        /*h*/                     MagnetData_get_h(el),
+        /*hxl*/                   0.,
+        /*k0*/                    MagnetData_get_k0(el),
+        /*k1*/                    MagnetData_get_k1(el),
+        /*k2*/                    MagnetData_get_k2(el),
+        /*k3*/                    MagnetData_get_k3(el),
+        /*k0s*/                   MagnetData_get_k0s(el),
+        /*k1s*/                   MagnetData_get_k1s(el),
+        /*k2s*/                   MagnetData_get_k2s(el),
+        /*k3s*/                   MagnetData_get_k3s(el),
+        /*ks*/                    0.,
+        /*dks_ds*/                0.,
+        /*rbend_model*/           -1, // not rbend
+        /*body_active*/           1,
+        /*edge_entry_active*/     MagnetData_get_edge_entry_active(el),
+        /*edge_exit_active*/      MagnetData_get_edge_exit_active(el),
+        /*edge_entry_model*/      MagnetData_get_edge_entry_model(el),
+        /*edge_exit_model*/       MagnetData_get_edge_exit_model(el),
+        /*edge_entry_angle*/      MagnetData_get_edge_entry_angle(el),
+        /*edge_exit_angle*/       MagnetData_get_edge_exit_angle(el),
+        /*edge_entry_angle_fdown*/MagnetData_get_edge_entry_angle_fdown(el),
+        /*edge_exit_angle_fdown*/ MagnetData_get_edge_exit_angle_fdown(el),
+        /*edge_entry_fint*/       MagnetData_get_edge_entry_fint(el),
+        /*edge_exit_fint*/        MagnetData_get_edge_exit_fint(el),
+        /*edge_entry_hgap*/       MagnetData_get_edge_entry_hgap(el),
+        /*edge_exit_hgap*/        MagnetData_get_edge_exit_hgap(el)
+    );
+}
+
+#endif

{xtrack-0.86.1 → xtrack-0.86.3}/xtrack/beam_elements/elements_src/multipole.h

@@ -8,33 +8,33 @@
 
 #include <headers/track.h>
 #include <beam_elements/elements_src/track_magnet.h>
+#include <beam_elements/elements_src/default_magnet_config.h>
 
 
 GPUFUN
 void Multipole_track_local_particle(MultipoleData el, LocalParticle* part0){
 
-    SynchrotronRadiationRecordData record = NULL;
     int64_t radiation_flag = 0;
     #ifndef XTRACK_MULTIPOLE_NO_SYNRAD
         radiation_flag = MultipoleData_get_radiation_flag(el);
-        if (radiation_flag==2){
-            record = (SynchrotronRadiationRecordData) MultipoleData_getp_internal_record(el, part0);
-        }
     #endif
 
     track_magnet_particles(
+        /*weight*/                1.,
         /*part0*/                 part0,
         /*length*/                MultipoleData_get_length(el),
         /*order*/                 MultipoleData_get_order(el),
         /*inv_factorial_order*/   MultipoleData_get_inv_factorial_order(el),
         /*knl*/                   MultipoleData_getp1_knl(el, 0),
         /*ksl*/                   MultipoleData_getp1_ksl(el, 0),
-        /*factor_knl_ksl*/        1.,
         /*num_multipole_kicks*/   1,
         /*model*/                 -1, // kick only
+        /*default_model*/         0, // unused
         /*integrator*/            3, // uniform
+        /*default_integrator*/    3, // unused
         /*radiation_flag*/        radiation_flag,
-        /*radiation_record*/      record,
+        /*radiation_flag_parent*/ 0, // not used here
+        /*radiation_record*/      (SynchrotronRadiationRecordData) MultipoleData_getp_internal_record(el, part0),
         /*delta_taper*/           MultipoleData_get_delta_taper(el),
         /*h*/                     0.,
         /*hxl*/                   MultipoleData_get_hxl(el),
@@ -48,6 +48,8 @@ void Multipole_track_local_particle(MultipoleData el, LocalParticle* part0){
         /*k3s*/                   0.,
         /*ks*/                    0.,
         /*dks_ds*/                0.,
+        /*rbend_model*/           -1, // not rbend
+        /*body_active*/           1,
         /*edge_entry_active*/     0,
         /*edge_exit_active*/      0,
         /*edge_entry_model*/      0,