xtrack 0.86.0__tar.gz → 0.86.2__tar.gz

{xtrack-0.86.0/xtrack.egg-info → xtrack-0.86.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xtrack
-Version: 0.86.0
+Version: 0.86.2
 Summary: Tracking library for particle accelerators
 Home-page: https://xsuite.readthedocs.io/
 Download-URL: https://pypi.python.org/pypi/xtrack
@@ -14,6 +14,7 @@ Requires-Dist: numpy>=1.0
 Requires-Dist: pandas>=2.0
 Requires-Dist: scipy
 Requires-Dist: tqdm
+Requires-Dist: requests
 Requires-Dist: xobjects
 Requires-Dist: xdeps
 Provides-Extra: tests

{xtrack-0.86.0 → xtrack-0.86.2}/setup.py

@@ -44,6 +44,7 @@ setup(
         "pandas>=2.0",
         'scipy',
         'tqdm',
+        'requests',
         'xobjects',
         'xdeps'
     ],

xtrack-0.86.2/xtrack/_version.py

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

{xtrack-0.86.0 → xtrack-0.86.2}/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.0 → xtrack-0.86.2}/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.2/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.2/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.2/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.2/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.2/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.2/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.2/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.2/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.0 → xtrack-0.86.2}/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,

{xtrack-0.86.0 → xtrack-0.86.2}/xtrack/beam_elements/elements_src/octupole.h

@@ -8,38 +8,29 @@
 
 #include <headers/track.h>
 #include <beam_elements/elements_src/track_magnet.h>
+#include <beam_elements/elements_src/default_magnet_config.h>
 
 GPUFUN
 void Octupole_track_local_particle(
         OctupoleData el,
         LocalParticle* part0
 ) {
-    int64_t model = OctupoleData_get_model(el);
-    int64_t integrator = OctupoleData_get_integrator(el);
-    int64_t num_multipole_kicks = OctupoleData_get_num_multipole_kicks(el);
-
-    if (model == 0) {  // adaptive
-        model = 6;  // drift-kick-drift-expanded
-    }
-    if (integrator == 0) {  // adaptive
-        integrator = 3;  // uniform
-    }
-    if (num_multipole_kicks == 0) {
-        num_multipole_kicks = 1;
-    }
 
     track_magnet_particles(
+        /*weight*/                1.,
         /*part0*/                 part0,
         /*length*/                OctupoleData_get_length(el),
         /*order*/                 OctupoleData_get_order(el),
         /*inv_factorial_order*/   OctupoleData_get_inv_factorial_order(el),
         /*knl*/                   OctupoleData_getp1_knl(el, 0),
         /*ksl*/                   OctupoleData_getp1_ksl(el, 0),
-        /*factor_knl_ksl*/        1.,
-        /*num_multipole_kicks*/   num_multipole_kicks,
-        /*model*/                 model,
-        /*integrator*/            integrator,
+        /*num_multipole_kicks*/   OctupoleData_get_num_multipole_kicks(el),
+        /*model*/                 OctupoleData_get_model(el),
+        /*default_model*/         OCTUPOLE_DEFAULT_MODEL,
+        /*integrator*/            OctupoleData_get_integrator(el),
+        /*default_integrator*/    OCTUPOLE_DEFAULT_INTEGRATOR,
         /*radiation_flag*/        OctupoleData_get_radiation_flag(el),
+        /*radiation_flag_parent*/ 0, // not used here
         /*radiation_record*/      NULL,
         /*delta_taper*/           OctupoleData_get_delta_taper(el),
         /*h*/                     0.,
@@ -54,6 +45,8 @@ void Octupole_track_local_particle(
         /*k3s*/                   OctupoleData_get_k3s(el),
         /*ks*/                    0.,
         /*dks_ds*/                0.,
+        /*rbend_model*/           -1, // not rbend
+        /*body_active*/           1,
         /*edge_entry_active*/     OctupoleData_get_edge_entry_active(el),
         /*edge_exit_active*/      OctupoleData_get_edge_exit_active(el),
         /*edge_entry_model*/      1,

{xtrack-0.86.0 → xtrack-0.86.2}/xtrack/beam_elements/elements_src/quadrupole.h

@@ -8,38 +8,29 @@
 
 #include <headers/track.h>
 #include <beam_elements/elements_src/track_magnet.h>
+#include <beam_elements/elements_src/default_magnet_config.h>
 
 GPUFUN
 void Quadrupole_track_local_particle(
         QuadrupoleData el,
         LocalParticle* part0
 ) {
-    int64_t model = QuadrupoleData_get_model(el);
-    int64_t integrator = QuadrupoleData_get_integrator(el);
-    int64_t num_multipole_kicks = QuadrupoleData_get_num_multipole_kicks(el);
-
-    if (model == 0) {  // adaptive
-        model = 4; // mat-kick-mat
-    }
-    if (integrator == 0) {  // adaptive
-        integrator = 3; // uniform
-    }
-    if (num_multipole_kicks == 0) {
-        num_multipole_kicks = 1;
-    }
 
     track_magnet_particles(
+        /*weight*/                1.,
         /*part0*/                 part0,
         /*length*/                QuadrupoleData_get_length(el),
         /*order*/                 QuadrupoleData_get_order(el),
         /*inv_factorial_order*/   QuadrupoleData_get_inv_factorial_order(el),
         /*knl*/                   QuadrupoleData_getp1_knl(el, 0),
         /*ksl*/                   QuadrupoleData_getp1_ksl(el, 0),
-        /*factor_knl_ksl*/        1.,
-        /*num_multipole_kicks*/   num_multipole_kicks,
-        /*model*/                 model,
-        /*integrator*/            integrator,
+        /*num_multipole_kicks*/   QuadrupoleData_get_num_multipole_kicks(el),
+        /*model*/                 QuadrupoleData_get_model(el),
+        /*default_model*/         QUADRUPOLE_DEFAULT_MODEL,
+        /*integrator*/            QuadrupoleData_get_integrator(el),
+        /*default_integrator*/    QUADRUPOLE_DEFAULT_INTEGRATOR,
         /*radiation_flag*/        QuadrupoleData_get_radiation_flag(el),
+        /*radiation_flag_parent*/ 0, // not used here
         /*radiation_record*/      NULL,
         /*delta_taper*/           QuadrupoleData_get_delta_taper(el),
         /*h*/                     0.,
@@ -54,6 +45,8 @@ void Quadrupole_track_local_particle(
         /*k3s*/                   0.,
         /*ks*/                    0.,
         /*dks_ds*/                0.,
+        /*rbend_model*/           -1, // not rbend
+        /*body_active*/           1,
         /*edge_entry_active*/     QuadrupoleData_get_edge_entry_active(el),
         /*edge_exit_active*/      QuadrupoleData_get_edge_exit_active(el),
         /*edge_entry_model*/      1,

{xtrack-0.86.0 → xtrack-0.86.2}/xtrack/beam_elements/elements_src/rbend.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 RBend_track_local_particle(
@@ -15,30 +16,24 @@ void RBend_track_local_particle(
     LocalParticle* part0
 ) {
 
-    double length = RBendData_get_length(el);
-    const double h = RBendData_get_h(el);
-    const double angle = length * h;
-
-    const double edge_entry_angle = RBendData_get_edge_entry_angle(el) + angle / 2;
-    const double edge_entry_angle_fdown = RBendData_get_edge_entry_angle_fdown(el);
-    const double edge_exit_angle = RBendData_get_edge_exit_angle(el) + angle / 2;
-    const double edge_exit_angle_fdown = RBendData_get_edge_exit_angle_fdown(el);
-
     track_magnet_particles(
+        /*weight*/                1.,
         /*part0*/                 part0,
-        /*length*/                length,
+        /*length*/                RBendData_get_length(el),
         /*order*/                 RBendData_get_order(el),
         /*inv_factorial_order*/   RBendData_get_inv_factorial_order(el),
         /*knl*/                   RBendData_getp1_knl(el, 0),
         /*ksl*/                   RBendData_getp1_ksl(el, 0),
-        /*factor_knl_ksl*/        1.,
         /*num_multipole_kicks*/   RBendData_get_num_multipole_kicks(el),
         /*model*/                 RBendData_get_model(el),
+        /*default_model*/         RBEND_DEFAULT_MODEL,
         /*integrator*/            RBendData_get_integrator(el),
+        /*default_integrator*/    RBEND_DEFAULT_INTEGRATOR,
         /*radiation_flag*/        RBendData_get_radiation_flag(el),
+        /*radiation_flag_parent*/ 0, // not used here
         /*radiation_record*/      NULL,
         /*delta_taper*/           RBendData_get_delta_taper(el),
-        /*h*/                     h,
+        /*h*/                     RBendData_get_h(el),
         /*hxl*/                   0.,
         /*k0*/                    RBendData_get_k0(el),
         /*k1*/                    RBendData_get_k1(el),
@@ -50,18 +45,20 @@ void RBend_track_local_particle(
         /*k3s*/                   0.,
         /*ks*/                    0.,
         /*dks_ds*/                0.,
+        /*rbend_model*/           0, // auto mode, curved body
+        /*body_active*/           1,
         /*edge_entry_active*/     RBendData_get_edge_entry_active(el),
         /*edge_exit_active*/      RBendData_get_edge_exit_active(el),
         /*edge_entry_model*/      RBendData_get_edge_entry_model(el),
         /*edge_exit_model*/       RBendData_get_edge_exit_model(el),
-        /*edge_entry_angle*/      edge_entry_angle,
-        /*edge_exit_angle*/       edge_exit_angle,
-        /*edge_entry_angle_fdown*/edge_entry_angle_fdown,
-        /*edge_exit_angle_fdown*/ edge_exit_angle_fdown,
+        /*edge_entry_angle*/      RBendData_get_edge_entry_angle(el),
+        /*edge_exit_angle*/       RBendData_get_edge_exit_angle(el),
+        /*edge_entry_angle_fdown*/RBendData_get_edge_entry_angle_fdown(el),
+        /*edge_exit_angle_fdown*/ RBendData_get_edge_exit_angle_fdown(el),
         /*edge_entry_fint*/       RBendData_get_edge_entry_fint(el),
         /*edge_exit_fint*/        RBendData_get_edge_exit_fint(el),
         /*edge_entry_hgap*/       RBendData_get_edge_entry_hgap(el),
-        /*edge_exit_hga*/         RBendData_get_edge_exit_hgap(el)
+        /*edge_exit_hgap*/        RBendData_get_edge_exit_hgap(el)
     );
 }