xsuite 0.41.0__cp310-cp310-macosx_11_0_arm64.whl → 0.41.1__cp310-cp310-macosx_11_0_arm64.whl

xsuite/lib/non_tracking_kernels.c

@@ -3368,679 +3368,244 @@ void LocalParticle_scale_exact_xp_yp(LocalParticle* part, double value_x, double
                     }
                  
 
-#ifndef XOBJ_TYPEDEF_RandomUniformData
-#define XOBJ_TYPEDEF_RandomUniformData
-typedef   struct RandomUniformData_s * RandomUniformData;
- static inline RandomUniformData RandomUniformData_getp(RandomUniformData restrict  obj){
-  int64_t offset=0;
-  return (RandomUniformData)(( char*) obj+offset);
-}
- static inline uint8_t RandomUniformData_get__dummy(const RandomUniformData restrict  obj){
-  int64_t offset=0;
-  return *(( uint8_t*) obj+offset);
-}
- static inline void RandomUniformData_set__dummy(RandomUniformData restrict  obj, uint8_t value){
-  int64_t offset=0;
-  *(( uint8_t*) obj+offset)=value;
-}
- static inline  uint8_t* RandomUniformData_getp__dummy(RandomUniformData restrict  obj){
+#ifndef XOBJ_TYPEDEF_ParticlesMonitorData
+#define XOBJ_TYPEDEF_ParticlesMonitorData
+typedef   struct ParticlesMonitorData_s * ParticlesMonitorData;
+ static inline ParticlesMonitorData ParticlesMonitorData_getp(ParticlesMonitorData restrict  obj){
   int64_t offset=0;
-  return ( uint8_t*)(( char*) obj+offset);
+  return (ParticlesMonitorData)(( char*) obj+offset);
 }
- static inline double RandomUniformData_get__sin_rot_s(const RandomUniformData restrict  obj){
+ static inline int64_t ParticlesMonitorData_get_start_at_turn(const ParticlesMonitorData restrict  obj){
   int64_t offset=0;
   offset+=8;
-  return *( double*)(( char*) obj+offset);
+  return *( int64_t*)(( char*) obj+offset);
 }
- static inline void RandomUniformData_set__sin_rot_s(RandomUniformData restrict  obj, double value){
+ static inline void ParticlesMonitorData_set_start_at_turn(ParticlesMonitorData restrict  obj, int64_t value){
   int64_t offset=0;
   offset+=8;
-  *( double*)(( char*) obj+offset)=value;
+  *( int64_t*)(( char*) obj+offset)=value;
 }
- static inline  double* RandomUniformData_getp__sin_rot_s(RandomUniformData restrict  obj){
+ static inline  int64_t* ParticlesMonitorData_getp_start_at_turn(ParticlesMonitorData restrict  obj){
   int64_t offset=0;
   offset+=8;
-  return ( double*)(( char*) obj+offset);
+  return ( int64_t*)(( char*) obj+offset);
 }
- static inline double RandomUniformData_get__cos_rot_s(const RandomUniformData restrict  obj){
+ static inline int64_t ParticlesMonitorData_get_stop_at_turn(const ParticlesMonitorData restrict  obj){
   int64_t offset=0;
   offset+=16;
-  return *( double*)(( char*) obj+offset);
+  return *( int64_t*)(( char*) obj+offset);
 }
- static inline void RandomUniformData_set__cos_rot_s(RandomUniformData restrict  obj, double value){
+ static inline void ParticlesMonitorData_set_stop_at_turn(ParticlesMonitorData restrict  obj, int64_t value){
   int64_t offset=0;
   offset+=16;
-  *( double*)(( char*) obj+offset)=value;
+  *( int64_t*)(( char*) obj+offset)=value;
 }
- static inline  double* RandomUniformData_getp__cos_rot_s(RandomUniformData restrict  obj){
+ static inline  int64_t* ParticlesMonitorData_getp_stop_at_turn(ParticlesMonitorData restrict  obj){
   int64_t offset=0;
   offset+=16;
-  return ( double*)(( char*) obj+offset);
+  return ( int64_t*)(( char*) obj+offset);
 }
- static inline double RandomUniformData_get__shift_x(const RandomUniformData restrict  obj){
+ static inline int64_t ParticlesMonitorData_get_part_id_start(const ParticlesMonitorData restrict  obj){
   int64_t offset=0;
   offset+=24;
-  return *( double*)(( char*) obj+offset);
+  return *( int64_t*)(( char*) obj+offset);
 }
- static inline void RandomUniformData_set__shift_x(RandomUniformData restrict  obj, double value){
+ static inline void ParticlesMonitorData_set_part_id_start(ParticlesMonitorData restrict  obj, int64_t value){
   int64_t offset=0;
   offset+=24;
-  *( double*)(( char*) obj+offset)=value;
+  *( int64_t*)(( char*) obj+offset)=value;
 }
- static inline  double* RandomUniformData_getp__shift_x(RandomUniformData restrict  obj){
+ static inline  int64_t* ParticlesMonitorData_getp_part_id_start(ParticlesMonitorData restrict  obj){
   int64_t offset=0;
   offset+=24;
-  return ( double*)(( char*) obj+offset);
+  return ( int64_t*)(( char*) obj+offset);
 }
- static inline double RandomUniformData_get__shift_y(const RandomUniformData restrict  obj){
+ static inline int64_t ParticlesMonitorData_get_part_id_end(const ParticlesMonitorData restrict  obj){
   int64_t offset=0;
   offset+=32;
-  return *( double*)(( char*) obj+offset);
+  return *( int64_t*)(( char*) obj+offset);
 }
- static inline void RandomUniformData_set__shift_y(RandomUniformData restrict  obj, double value){
+ static inline void ParticlesMonitorData_set_part_id_end(ParticlesMonitorData restrict  obj, int64_t value){
   int64_t offset=0;
   offset+=32;
-  *( double*)(( char*) obj+offset)=value;
+  *( int64_t*)(( char*) obj+offset)=value;
 }
- static inline  double* RandomUniformData_getp__shift_y(RandomUniformData restrict  obj){
+ static inline  int64_t* ParticlesMonitorData_getp_part_id_end(ParticlesMonitorData restrict  obj){
   int64_t offset=0;
   offset+=32;
-  return ( double*)(( char*) obj+offset);
+  return ( int64_t*)(( char*) obj+offset);
 }
- static inline double RandomUniformData_get__shift_s(const RandomUniformData restrict  obj){
+ static inline int64_t ParticlesMonitorData_get_ebe_mode(const ParticlesMonitorData restrict  obj){
   int64_t offset=0;
   offset+=40;
-  return *( double*)(( char*) obj+offset);
+  return *( int64_t*)(( char*) obj+offset);
 }
- static inline void RandomUniformData_set__shift_s(RandomUniformData restrict  obj, double value){
+ static inline void ParticlesMonitorData_set_ebe_mode(ParticlesMonitorData restrict  obj, int64_t value){
   int64_t offset=0;
   offset+=40;
-  *( double*)(( char*) obj+offset)=value;
+  *( int64_t*)(( char*) obj+offset)=value;
 }
- static inline  double* RandomUniformData_getp__shift_s(RandomUniformData restrict  obj){
+ static inline  int64_t* ParticlesMonitorData_getp_ebe_mode(ParticlesMonitorData restrict  obj){
   int64_t offset=0;
   offset+=40;
-  return ( double*)(( char*) obj+offset);
+  return ( int64_t*)(( char*) obj+offset);
 }
- static inline double RandomUniformData_get__rot_x_rad(const RandomUniformData restrict  obj){
+ static inline int64_t ParticlesMonitorData_get_n_records(const ParticlesMonitorData restrict  obj){
   int64_t offset=0;
   offset+=48;
-  return *( double*)(( char*) obj+offset);
+  return *( int64_t*)(( char*) obj+offset);
 }
- static inline void RandomUniformData_set__rot_x_rad(RandomUniformData restrict  obj, double value){
+ static inline void ParticlesMonitorData_set_n_records(ParticlesMonitorData restrict  obj, int64_t value){
   int64_t offset=0;
   offset+=48;
-  *( double*)(( char*) obj+offset)=value;
+  *( int64_t*)(( char*) obj+offset)=value;
 }
- static inline  double* RandomUniformData_getp__rot_x_rad(RandomUniformData restrict  obj){
+ static inline  int64_t* ParticlesMonitorData_getp_n_records(ParticlesMonitorData restrict  obj){
   int64_t offset=0;
   offset+=48;
-  return ( double*)(( char*) obj+offset);
+  return ( int64_t*)(( char*) obj+offset);
 }
- static inline double RandomUniformData_get__rot_y_rad(const RandomUniformData restrict  obj){
+ static inline int64_t ParticlesMonitorData_get_n_repetitions(const ParticlesMonitorData restrict  obj){
   int64_t offset=0;
   offset+=56;
-  return *( double*)(( char*) obj+offset);
+  return *( int64_t*)(( char*) obj+offset);
 }
- static inline void RandomUniformData_set__rot_y_rad(RandomUniformData restrict  obj, double value){
+ static inline void ParticlesMonitorData_set_n_repetitions(ParticlesMonitorData restrict  obj, int64_t value){
   int64_t offset=0;
   offset+=56;
-  *( double*)(( char*) obj+offset)=value;
+  *( int64_t*)(( char*) obj+offset)=value;
 }
- static inline  double* RandomUniformData_getp__rot_y_rad(RandomUniformData restrict  obj){
+ static inline  int64_t* ParticlesMonitorData_getp_n_repetitions(ParticlesMonitorData restrict  obj){
   int64_t offset=0;
   offset+=56;
-  return ( double*)(( char*) obj+offset);
+  return ( int64_t*)(( char*) obj+offset);
 }
- static inline double RandomUniformData_get__rot_s_rad_no_frame(const RandomUniformData restrict  obj){
+ static inline int64_t ParticlesMonitorData_get_repetition_period(const ParticlesMonitorData restrict  obj){
   int64_t offset=0;
   offset+=64;
-  return *( double*)(( char*) obj+offset);
+  return *( int64_t*)(( char*) obj+offset);
 }
- static inline void RandomUniformData_set__rot_s_rad_no_frame(RandomUniformData restrict  obj, double value){
+ static inline void ParticlesMonitorData_set_repetition_period(ParticlesMonitorData restrict  obj, int64_t value){
   int64_t offset=0;
   offset+=64;
-  *( double*)(( char*) obj+offset)=value;
+  *( int64_t*)(( char*) obj+offset)=value;
 }
- static inline  double* RandomUniformData_getp__rot_s_rad_no_frame(RandomUniformData restrict  obj){
+ static inline  int64_t* ParticlesMonitorData_getp_repetition_period(ParticlesMonitorData restrict  obj){
   int64_t offset=0;
   offset+=64;
-  return ( double*)(( char*) obj+offset);
+  return ( int64_t*)(( char*) obj+offset);
 }
- static inline double RandomUniformData_get_rot_shift_anchor(const RandomUniformData restrict  obj){
+ static inline int64_t ParticlesMonitorData_get_flag_auto_to_numpy(const ParticlesMonitorData restrict  obj){
   int64_t offset=0;
   offset+=72;
-  return *( double*)(( char*) obj+offset);
+  return *( int64_t*)(( char*) obj+offset);
 }
- static inline void RandomUniformData_set_rot_shift_anchor(RandomUniformData restrict  obj, double value){
+ static inline void ParticlesMonitorData_set_flag_auto_to_numpy(ParticlesMonitorData restrict  obj, int64_t value){
   int64_t offset=0;
   offset+=72;
-  *( double*)(( char*) obj+offset)=value;
+  *( int64_t*)(( char*) obj+offset)=value;
 }
- static inline  double* RandomUniformData_getp_rot_shift_anchor(RandomUniformData restrict  obj){
+ static inline  int64_t* ParticlesMonitorData_getp_flag_auto_to_numpy(ParticlesMonitorData restrict  obj){
   int64_t offset=0;
   offset+=72;
-  return ( double*)(( char*) obj+offset);
+  return ( int64_t*)(( char*) obj+offset);
 }
-#endif
-// copyright ############################### //
-// This file is part of the Xtrack Package.  //
-// Copyright (c) CERN, 2021.                 //
-// ######################################### //
-
-#ifndef XTRACK_CONSTANTS_H
-#define XTRACK_CONSTANTS_H
-
-#if !defined( C_LIGHT )
-    #define   C_LIGHT ( 299792458.0 )
-#endif /* !defined( C_LIGHT ) */
-
-#if !defined( EPSILON_0 )
-    #define   EPSILON_0 (8.854187817620e-12)
-#endif /* !defined( EPSILON_0 ) */
-
-#if !defined( PI )
-    #define PI (3.1415926535897932384626433832795028841971693993751)
-#endif /* !defined( PI ) */
-
-#if !defined( MU_0 )
-    #define MU_0 (PI*4.0e-7)
-#endif /* !defined( MU_0 ) */
-
-#if !defined( DEG2RAD )
-    #define DEG2RAD (0.0174532925199432957692369076848861271344287188854)
-#endif /* !defiend( DEG2RAD ) */
-
-#if !defined( RAD2DEG )
-    #define RAD2DEG (57.29577951308232087679815481410517033240547246656442)
-#endif /* !defiend( RAD2DEG ) */
-
-#if !defined( SQRT_PI )
-    #define SQRT_PI (1.7724538509055160272981674833411451827975494561224)
-#endif /* !defined( SQRT_PI ) */
-
-#if !defined( QELEM )
-    #define QELEM (1.60217662e-19)
-#endif /* !defined( QELEM ) */
-
-#if !defined( DBL_MAX )
-    #define DBL_MAX (1.7976931348623158e+308)
-#endif /* !defined( DBL_MAX ) */
-
-#if !defined( DBL_MIN )
-    #define DBL_MIN (2.2250738585072014e-308)
-#endif /* !defined( DBL_MIN ) */
-
-#if !defined( DBL_EPSILON )
-    #define DBL_EPSILON (2.2204460492503131e-16)
-#endif /* !defined( DBL_EPSILON ) */
-
-#if !defined( RADIUS_ELECTRON )
-    #define RADIUS_ELECTRON (2.8179403262e-15)
-#endif /* !defined( RADIUS_ELECTRON ) */
-
-#if !defined( MASS_ELECTRON )
-    #define MASS_ELECTRON (9.1093837e-31)
-#endif /* !defined( MASS_ELECTRON ) */
-
-#endif /* XTRACK_CONSTANTS_H */
-
-// copyright ############################### //
-// This file is part of the Xtrack Package.  //
-// Copyright (c) CERN, 2023.                 //
-// ######################################### //
-
-#ifndef XTRACK_FUNCTIONS_H
-#define XTRACK_FUNCTIONS_H
-
-#include <headers/track.h>
-
-
-GPUFUN
-void kill_all_particles(LocalParticle* part0, int64_t kill_state) {
-    START_PER_PARTICLE_BLOCK(part0, part);
-        LocalParticle_kill_particle(part, kill_state);
-    END_PER_PARTICLE_BLOCK;
+ static inline ParticlesData ParticlesMonitorData_getp_data(ParticlesMonitorData restrict  obj){
+  int64_t offset=0;
+  offset+=152;
+  return (ParticlesData)(( char*) obj+offset);
 }
-
-
-GPUFUN
-int8_t assert_tracking(LocalParticle* part, int64_t kill_state){
-    // Whenever we are not tracking, e.g. in a twiss, the particle will be at_turn < 0.
-    // We test this to distinguish genuine tracking from twiss.
-    if (LocalParticle_get_at_turn(part) < 0){
-        LocalParticle_kill_particle(part, kill_state);
-        return 0;
-    }
-    return 1;
+ static inline int64_t ParticlesMonitorData_get_data__capacity(const ParticlesMonitorData restrict  obj){
+  int64_t offset=0;
+  offset+=160;
+  return *( int64_t*)(( char*) obj+offset);
 }
-
-#endif /* XTRACK_FUNCTIONS_H */
-
-// copyright ############################### //
-// This file is part of the Xtrack Package.  //
-// Copyright (c) CERN, 2023.                 //
-// ######################################### //
-
-#ifndef XTRACK_PARTICLE_STATES_H
-#define XTRACK_PARTICLE_STATES_H
-
-#define  XT_LOST_ON_APERTURE       0
-#define  XT_LOST_ON_LONG_CUT      -2
-#define  XT_LOST_ALL_E_IN_SYNRAD -10
-#define  RNG_ERR_SEEDS_NOT_SET   -20
-#define  RNG_ERR_INVALID_TRACK   -21
-#define  RNG_ERR_RUTH_NOT_SET    -22
-#define  XT_INVALID_SLICE_TRANSFORM -40
-#define  XT_INVALID_CURVED_SLICE_TRANSFORM -41
-
-#endif /* XTRACK_PARTICLE_STATES_H */
-
-// copyright ############################### //
-// This file is part of the Xtrack Package.  //
-// Copyright (c) CERN, 2025.                 //
-// ######################################### //
-#ifndef XTRACK_TRACK_SROTATION_H
-#define XTRACK_TRACK_SROTATION_H
-
-#include <headers/track.h>
-
-
-GPUFUN
-void SRotation_single_particle(LocalParticle* part, double sin_z, double cos_z)
-{
-    double const x  = LocalParticle_get_x(part);
-    double const y  = LocalParticle_get_y(part);
-    double const px = LocalParticle_get_px(part);
-    double const py = LocalParticle_get_py(part);
-
-    double const x_hat  =  cos_z * x  + sin_z * y;
-    double const y_hat  = -sin_z * x  + cos_z * y;
-    double const px_hat =  cos_z * px + sin_z * py;
-    double const py_hat = -sin_z * px + cos_z * py;
-
-    LocalParticle_set_x(part, x_hat);
-    LocalParticle_set_y(part, y_hat);
-    LocalParticle_set_px(part, px_hat);
-    LocalParticle_set_py(part, py_hat);
-}
-
-#endif
-// copyright ############################### //
-// This file is part of the Xtrack Package.  //
-// Copyright (c) CERN, 2021.                 //
-// ######################################### //
-
-#ifndef XTRACK_TRACK_DRIFT_H
-#define XTRACK_TRACK_DRIFT_H
-
-
-GPUFUN
-void Drift_single_particle_expanded(LocalParticle* part, double length){
-    double const rpp    = LocalParticle_get_rpp(part);
-    double const rv0v    = 1./LocalParticle_get_rvv(part);
-    double const xp     = LocalParticle_get_px(part) * rpp;
-    double const yp     = LocalParticle_get_py(part) * rpp;
-    double const dzeta  = 1 - rv0v * ( 1. + ( xp*xp + yp*yp ) / 2. );
-
-    LocalParticle_add_to_x(part, xp * length );
-    LocalParticle_add_to_y(part, yp * length );
-    LocalParticle_add_to_s(part, length);
-    LocalParticle_add_to_zeta(part, length * dzeta );
-}
-
-
-GPUFUN
-void Drift_single_particle_exact(LocalParticle* part, double length){
-    double const px = LocalParticle_get_px(part);
-    double const py = LocalParticle_get_py(part);
-    double const rv0v    = 1./LocalParticle_get_rvv(part);
-    double const one_plus_delta = 1. + LocalParticle_get_delta(part);
-
-    double const one_over_pz = 1./sqrt(one_plus_delta*one_plus_delta
-                                       - px * px - py * py);
-    double const dzeta = 1 - rv0v * one_plus_delta * one_over_pz;
-
-    LocalParticle_add_to_x(part, px * one_over_pz * length);
-    LocalParticle_add_to_y(part, py * one_over_pz * length);
-    LocalParticle_add_to_zeta(part, dzeta * length);
-    LocalParticle_add_to_s(part, length);
-}
-
-
-GPUFUN
-void Drift_single_particle(LocalParticle* part, double length){
-    #ifndef XTRACK_USE_EXACT_DRIFTS
-        Drift_single_particle_expanded(part, length);
-    #else
-        Drift_single_particle_exact(part, length);
-    #endif
-}
-
-
-#endif /* XTRACK_TRACK_DRIFT_H */
-
-
-#ifndef XSTUITE_TRACK_FLAGS_H
-#define XSTUITE_TRACK_FLAGS_H
-#define XS_FLAG_BACKTRACK (0)
-#define XS_FLAG_KILL_CAVITY_KICK (2)
-#define XS_FLAG_IGNORE_GLOBAL_APERTURE (3)
-#define XS_FLAG_IGNORE_LOCAL_APERTURE (4)
-#define XS_FLAG_SR_TAPER (5)
-#define XS_FLAG_SR_KICK_SAME_AS_FIRST (6)
-
-#endif // XSTUITE_TRACK_FLAGS_H
-
-#include <random/random_src/uniform.h>
-
-             
-            void sample_uniform(
-               RandomUniformData el,
-
-                             ParticlesData particles,
-    double* samples,  int64_t n_samples_per_seed, 
-                             int64_t flag_increment_at_element,
-                  int8_t* io_buffer){
-
-//            #define CONTEXT_OPENMP  //only_for_context cpu_openmp
-            #ifdef CONTEXT_OPENMP
-                const int64_t capacity = ParticlesData_get__capacity(particles);
-                const int num_threads = omp_get_max_threads();
-
-                #ifndef XT_OMP_SKIP_REORGANIZE
-                    const int64_t num_particles_to_track = ParticlesData_get__num_active_particles(particles);
-
-                    {
-                        LocalParticle lpart;
-                        lpart.io_buffer = io_buffer;
-                        Particles_to_LocalParticle(particles, &lpart, 0, capacity);
-                        check_is_active(&lpart);
-                        count_reorganized_particles(&lpart);
-                        LocalParticle_to_Particles(&lpart, particles, 0, capacity);
-                    }
-                #else // When we skip reorganize, we cannot just batch active particles
-                    const int64_t num_particles_to_track = capacity;
-                #endif
-
-                const int64_t chunk_size = (num_particles_to_track + num_threads - 1)/num_threads; // ceil division
-            #endif // CONTEXT_OPENMP
-
-//            #pragma omp parallel for                                                           //only_for_context cpu_openmp
-//            for (int64_t batch_id = 0; batch_id < num_threads; batch_id++) {                   //only_for_context cpu_openmp
-                LocalParticle lpart;
-                lpart.io_buffer = io_buffer;
-                lpart.track_flags = 0;
-//                int64_t part_id = batch_id * chunk_size;                                       //only_for_context cpu_openmp
-//                int64_t end_id = (batch_id + 1) * chunk_size;                                  //only_for_context cpu_openmp
-//                if (end_id > num_particles_to_track) end_id = num_particles_to_track;          //only_for_context cpu_openmp
-
-                int64_t part_id = 0;                    //only_for_context cpu_serial
-//                int64_t part_id = blockDim.x * blockIdx.x + threadIdx.x; //only_for_context cuda
-//                int64_t part_id = get_global_id(0);                    //only_for_context opencl
-                int64_t end_id = 0; // unused outside of openmp  //only_for_context cpu_serial cuda opencl
-
-                int64_t part_capacity = ParticlesData_get__capacity(particles);
-                if (part_id<part_capacity){
-                    Particles_to_LocalParticle(particles, &lpart, part_id, end_id);
-                    if (check_is_active(&lpart)>0){
-              RandomUniform_sample(el, &lpart, samples, n_samples_per_seed);
-
-                    }
-                    if (check_is_active(&lpart)>0 && flag_increment_at_element){
-                            increment_at_element(&lpart, 1);
-                    }
-                }
-//            } //only_for_context cpu_openmp
-
-            // On OpenMP we want to additionally by default reorganize all
-            // the particles.
-//            #ifndef XT_OMP_SKIP_REORGANIZE                             //only_for_context cpu_openmp
-//            LocalParticle lpart;                                       //only_for_context cpu_openmp
-//            lpart.io_buffer = io_buffer;                               //only_for_context cpu_openmp
-//            Particles_to_LocalParticle(particles, &lpart, 0, capacity);//only_for_context cpu_openmp
-//            check_is_active(&lpart);                                   //only_for_context cpu_openmp
-//            #endif                                                     //only_for_context cpu_openmp
-        }
-
-#ifndef XOBJ_TYPEDEF_ParticlesMonitorData
-#define XOBJ_TYPEDEF_ParticlesMonitorData
-typedef   struct ParticlesMonitorData_s * ParticlesMonitorData;
- static inline ParticlesMonitorData ParticlesMonitorData_getp(ParticlesMonitorData restrict  obj){
-  int64_t offset=0;
-  return (ParticlesMonitorData)(( char*) obj+offset);
-}
- static inline int64_t ParticlesMonitorData_get_start_at_turn(const ParticlesMonitorData restrict  obj){
-  int64_t offset=0;
-  offset+=8;
-  return *( int64_t*)(( char*) obj+offset);
-}
- static inline void ParticlesMonitorData_set_start_at_turn(ParticlesMonitorData restrict  obj, int64_t value){
+ static inline void ParticlesMonitorData_set_data__capacity(ParticlesMonitorData restrict  obj, int64_t value){
   int64_t offset=0;
-  offset+=8;
+  offset+=160;
   *( int64_t*)(( char*) obj+offset)=value;
 }
- static inline  int64_t* ParticlesMonitorData_getp_start_at_turn(ParticlesMonitorData restrict  obj){
+ static inline  int64_t* ParticlesMonitorData_getp_data__capacity(ParticlesMonitorData restrict  obj){
   int64_t offset=0;
-  offset+=8;
+  offset+=160;
   return ( int64_t*)(( char*) obj+offset);
 }
- static inline int64_t ParticlesMonitorData_get_stop_at_turn(const ParticlesMonitorData restrict  obj){
+ static inline int64_t ParticlesMonitorData_get_data__num_active_particles(const ParticlesMonitorData restrict  obj){
   int64_t offset=0;
-  offset+=16;
+  offset+=168;
   return *( int64_t*)(( char*) obj+offset);
 }
- static inline void ParticlesMonitorData_set_stop_at_turn(ParticlesMonitorData restrict  obj, int64_t value){
+ static inline void ParticlesMonitorData_set_data__num_active_particles(ParticlesMonitorData restrict  obj, int64_t value){
   int64_t offset=0;
-  offset+=16;
+  offset+=168;
   *( int64_t*)(( char*) obj+offset)=value;
 }
- static inline  int64_t* ParticlesMonitorData_getp_stop_at_turn(ParticlesMonitorData restrict  obj){
+ static inline  int64_t* ParticlesMonitorData_getp_data__num_active_particles(ParticlesMonitorData restrict  obj){
   int64_t offset=0;
-  offset+=16;
+  offset+=168;
   return ( int64_t*)(( char*) obj+offset);
 }
- static inline int64_t ParticlesMonitorData_get_part_id_start(const ParticlesMonitorData restrict  obj){
+ static inline int64_t ParticlesMonitorData_get_data__num_lost_particles(const ParticlesMonitorData restrict  obj){
   int64_t offset=0;
-  offset+=24;
+  offset+=176;
   return *( int64_t*)(( char*) obj+offset);
 }
- static inline void ParticlesMonitorData_set_part_id_start(ParticlesMonitorData restrict  obj, int64_t value){
+ static inline void ParticlesMonitorData_set_data__num_lost_particles(ParticlesMonitorData restrict  obj, int64_t value){
   int64_t offset=0;
-  offset+=24;
+  offset+=176;
   *( int64_t*)(( char*) obj+offset)=value;
 }
- static inline  int64_t* ParticlesMonitorData_getp_part_id_start(ParticlesMonitorData restrict  obj){
+ static inline  int64_t* ParticlesMonitorData_getp_data__num_lost_particles(ParticlesMonitorData restrict  obj){
   int64_t offset=0;
-  offset+=24;
+  offset+=176;
   return ( int64_t*)(( char*) obj+offset);
 }
- static inline int64_t ParticlesMonitorData_get_part_id_end(const ParticlesMonitorData restrict  obj){
+ static inline int64_t ParticlesMonitorData_get_data_start_tracking_at_element(const ParticlesMonitorData restrict  obj){
   int64_t offset=0;
-  offset+=32;
+  offset+=184;
   return *( int64_t*)(( char*) obj+offset);
 }
- static inline void ParticlesMonitorData_set_part_id_end(ParticlesMonitorData restrict  obj, int64_t value){
+ static inline void ParticlesMonitorData_set_data_start_tracking_at_element(ParticlesMonitorData restrict  obj, int64_t value){
   int64_t offset=0;
-  offset+=32;
+  offset+=184;
   *( int64_t*)(( char*) obj+offset)=value;
 }
- static inline  int64_t* ParticlesMonitorData_getp_part_id_end(ParticlesMonitorData restrict  obj){
+ static inline  int64_t* ParticlesMonitorData_getp_data_start_tracking_at_element(ParticlesMonitorData restrict  obj){
   int64_t offset=0;
-  offset+=32;
+  offset+=184;
   return ( int64_t*)(( char*) obj+offset);
 }
- static inline int64_t ParticlesMonitorData_get_ebe_mode(const ParticlesMonitorData restrict  obj){
+ static inline double ParticlesMonitorData_get_data_q0(const ParticlesMonitorData restrict  obj){
   int64_t offset=0;
-  offset+=40;
-  return *( int64_t*)(( char*) obj+offset);
+  offset+=192;
+  return *( double*)(( char*) obj+offset);
 }
- static inline void ParticlesMonitorData_set_ebe_mode(ParticlesMonitorData restrict  obj, int64_t value){
+ static inline void ParticlesMonitorData_set_data_q0(ParticlesMonitorData restrict  obj, double value){
   int64_t offset=0;
-  offset+=40;
-  *( int64_t*)(( char*) obj+offset)=value;
+  offset+=192;
+  *( double*)(( char*) obj+offset)=value;
 }
- static inline  int64_t* ParticlesMonitorData_getp_ebe_mode(ParticlesMonitorData restrict  obj){
+ static inline  double* ParticlesMonitorData_getp_data_q0(ParticlesMonitorData restrict  obj){
   int64_t offset=0;
-  offset+=40;
-  return ( int64_t*)(( char*) obj+offset);
+  offset+=192;
+  return ( double*)(( char*) obj+offset);
 }
- static inline int64_t ParticlesMonitorData_get_n_records(const ParticlesMonitorData restrict  obj){
+ static inline double ParticlesMonitorData_get_data_mass0(const ParticlesMonitorData restrict  obj){
   int64_t offset=0;
-  offset+=48;
-  return *( int64_t*)(( char*) obj+offset);
+  offset+=200;
+  return *( double*)(( char*) obj+offset);
 }
- static inline void ParticlesMonitorData_set_n_records(ParticlesMonitorData restrict  obj, int64_t value){
+ static inline void ParticlesMonitorData_set_data_mass0(ParticlesMonitorData restrict  obj, double value){
   int64_t offset=0;
-  offset+=48;
-  *( int64_t*)(( char*) obj+offset)=value;
+  offset+=200;
+  *( double*)(( char*) obj+offset)=value;
 }
- static inline  int64_t* ParticlesMonitorData_getp_n_records(ParticlesMonitorData restrict  obj){
+ static inline  double* ParticlesMonitorData_getp_data_mass0(ParticlesMonitorData restrict  obj){
   int64_t offset=0;
-  offset+=48;
-  return ( int64_t*)(( char*) obj+offset);
+  offset+=200;
+  return ( double*)(( char*) obj+offset);
 }
- static inline int64_t ParticlesMonitorData_get_n_repetitions(const ParticlesMonitorData restrict  obj){
-  int64_t offset=0;
-  offset+=56;
-  return *( int64_t*)(( char*) obj+offset);
-}
- static inline void ParticlesMonitorData_set_n_repetitions(ParticlesMonitorData restrict  obj, int64_t value){
-  int64_t offset=0;
-  offset+=56;
-  *( int64_t*)(( char*) obj+offset)=value;
-}
- static inline  int64_t* ParticlesMonitorData_getp_n_repetitions(ParticlesMonitorData restrict  obj){
-  int64_t offset=0;
-  offset+=56;
-  return ( int64_t*)(( char*) obj+offset);
-}
- static inline int64_t ParticlesMonitorData_get_repetition_period(const ParticlesMonitorData restrict  obj){
-  int64_t offset=0;
-  offset+=64;
-  return *( int64_t*)(( char*) obj+offset);
-}
- static inline void ParticlesMonitorData_set_repetition_period(ParticlesMonitorData restrict  obj, int64_t value){
-  int64_t offset=0;
-  offset+=64;
-  *( int64_t*)(( char*) obj+offset)=value;
-}
- static inline  int64_t* ParticlesMonitorData_getp_repetition_period(ParticlesMonitorData restrict  obj){
-  int64_t offset=0;
-  offset+=64;
-  return ( int64_t*)(( char*) obj+offset);
-}
- static inline int64_t ParticlesMonitorData_get_flag_auto_to_numpy(const ParticlesMonitorData restrict  obj){
-  int64_t offset=0;
-  offset+=72;
-  return *( int64_t*)(( char*) obj+offset);
-}
- static inline void ParticlesMonitorData_set_flag_auto_to_numpy(ParticlesMonitorData restrict  obj, int64_t value){
-  int64_t offset=0;
-  offset+=72;
-  *( int64_t*)(( char*) obj+offset)=value;
-}
- static inline  int64_t* ParticlesMonitorData_getp_flag_auto_to_numpy(ParticlesMonitorData restrict  obj){
-  int64_t offset=0;
-  offset+=72;
-  return ( int64_t*)(( char*) obj+offset);
-}
- static inline ParticlesData ParticlesMonitorData_getp_data(ParticlesMonitorData restrict  obj){
-  int64_t offset=0;
-  offset+=152;
-  return (ParticlesData)(( char*) obj+offset);
-}
- static inline int64_t ParticlesMonitorData_get_data__capacity(const ParticlesMonitorData restrict  obj){
-  int64_t offset=0;
-  offset+=160;
-  return *( int64_t*)(( char*) obj+offset);
-}
- static inline void ParticlesMonitorData_set_data__capacity(ParticlesMonitorData restrict  obj, int64_t value){
-  int64_t offset=0;
-  offset+=160;
-  *( int64_t*)(( char*) obj+offset)=value;
-}
- static inline  int64_t* ParticlesMonitorData_getp_data__capacity(ParticlesMonitorData restrict  obj){
-  int64_t offset=0;
-  offset+=160;
-  return ( int64_t*)(( char*) obj+offset);
-}
- static inline int64_t ParticlesMonitorData_get_data__num_active_particles(const ParticlesMonitorData restrict  obj){
-  int64_t offset=0;
-  offset+=168;
-  return *( int64_t*)(( char*) obj+offset);
-}
- static inline void ParticlesMonitorData_set_data__num_active_particles(ParticlesMonitorData restrict  obj, int64_t value){
-  int64_t offset=0;
-  offset+=168;
-  *( int64_t*)(( char*) obj+offset)=value;
-}
- static inline  int64_t* ParticlesMonitorData_getp_data__num_active_particles(ParticlesMonitorData restrict  obj){
-  int64_t offset=0;
-  offset+=168;
-  return ( int64_t*)(( char*) obj+offset);
-}
- static inline int64_t ParticlesMonitorData_get_data__num_lost_particles(const ParticlesMonitorData restrict  obj){
-  int64_t offset=0;
-  offset+=176;
-  return *( int64_t*)(( char*) obj+offset);
-}
- static inline void ParticlesMonitorData_set_data__num_lost_particles(ParticlesMonitorData restrict  obj, int64_t value){
-  int64_t offset=0;
-  offset+=176;
-  *( int64_t*)(( char*) obj+offset)=value;
-}
- static inline  int64_t* ParticlesMonitorData_getp_data__num_lost_particles(ParticlesMonitorData restrict  obj){
-  int64_t offset=0;
-  offset+=176;
-  return ( int64_t*)(( char*) obj+offset);
-}
- static inline int64_t ParticlesMonitorData_get_data_start_tracking_at_element(const ParticlesMonitorData restrict  obj){
-  int64_t offset=0;
-  offset+=184;
-  return *( int64_t*)(( char*) obj+offset);
-}
- static inline void ParticlesMonitorData_set_data_start_tracking_at_element(ParticlesMonitorData restrict  obj, int64_t value){
-  int64_t offset=0;
-  offset+=184;
-  *( int64_t*)(( char*) obj+offset)=value;
-}
- static inline  int64_t* ParticlesMonitorData_getp_data_start_tracking_at_element(ParticlesMonitorData restrict  obj){
-  int64_t offset=0;
-  offset+=184;
-  return ( int64_t*)(( char*) obj+offset);
-}
- static inline double ParticlesMonitorData_get_data_q0(const ParticlesMonitorData restrict  obj){
-  int64_t offset=0;
-  offset+=192;
-  return *( double*)(( char*) obj+offset);
-}
- static inline void ParticlesMonitorData_set_data_q0(ParticlesMonitorData restrict  obj, double value){
-  int64_t offset=0;
-  offset+=192;
-  *( double*)(( char*) obj+offset)=value;
-}
- static inline  double* ParticlesMonitorData_getp_data_q0(ParticlesMonitorData restrict  obj){
-  int64_t offset=0;
-  offset+=192;
-  return ( double*)(( char*) obj+offset);
-}
- static inline double ParticlesMonitorData_get_data_mass0(const ParticlesMonitorData restrict  obj){
-  int64_t offset=0;
-  offset+=200;
-  return *( double*)(( char*) obj+offset);
-}
- static inline void ParticlesMonitorData_set_data_mass0(ParticlesMonitorData restrict  obj, double value){
-  int64_t offset=0;
-  offset+=200;
-  *( double*)(( char*) obj+offset)=value;
-}
- static inline  double* ParticlesMonitorData_getp_data_mass0(ParticlesMonitorData restrict  obj){
-  int64_t offset=0;
-  offset+=200;
-  return ( double*)(( char*) obj+offset);
-}
- static inline double ParticlesMonitorData_get_data_t_sim(const ParticlesMonitorData restrict  obj){
+ static inline double ParticlesMonitorData_get_data_t_sim(const ParticlesMonitorData restrict  obj){
   int64_t offset=0;
   offset+=208;
   return *( double*)(( char*) obj+offset);
@@ -5193,84 +4758,720 @@ typedef   struct ParticlesMonitorData_s * ParticlesMonitorData;
   offset+=104;
   *( double*)(( char*) obj+offset)=value;
 }
- static inline  double* ParticlesMonitorData_getp__shift_y(ParticlesMonitorData restrict  obj){
+ static inline  double* ParticlesMonitorData_getp__shift_y(ParticlesMonitorData restrict  obj){
+  int64_t offset=0;
+  offset+=104;
+  return ( double*)(( char*) obj+offset);
+}
+ static inline double ParticlesMonitorData_get__shift_s(const ParticlesMonitorData restrict  obj){
+  int64_t offset=0;
+  offset+=112;
+  return *( double*)(( char*) obj+offset);
+}
+ static inline void ParticlesMonitorData_set__shift_s(ParticlesMonitorData restrict  obj, double value){
+  int64_t offset=0;
+  offset+=112;
+  *( double*)(( char*) obj+offset)=value;
+}
+ static inline  double* ParticlesMonitorData_getp__shift_s(ParticlesMonitorData restrict  obj){
+  int64_t offset=0;
+  offset+=112;
+  return ( double*)(( char*) obj+offset);
+}
+ static inline double ParticlesMonitorData_get__rot_x_rad(const ParticlesMonitorData restrict  obj){
+  int64_t offset=0;
+  offset+=120;
+  return *( double*)(( char*) obj+offset);
+}
+ static inline void ParticlesMonitorData_set__rot_x_rad(ParticlesMonitorData restrict  obj, double value){
+  int64_t offset=0;
+  offset+=120;
+  *( double*)(( char*) obj+offset)=value;
+}
+ static inline  double* ParticlesMonitorData_getp__rot_x_rad(ParticlesMonitorData restrict  obj){
+  int64_t offset=0;
+  offset+=120;
+  return ( double*)(( char*) obj+offset);
+}
+ static inline double ParticlesMonitorData_get__rot_y_rad(const ParticlesMonitorData restrict  obj){
+  int64_t offset=0;
+  offset+=128;
+  return *( double*)(( char*) obj+offset);
+}
+ static inline void ParticlesMonitorData_set__rot_y_rad(ParticlesMonitorData restrict  obj, double value){
+  int64_t offset=0;
+  offset+=128;
+  *( double*)(( char*) obj+offset)=value;
+}
+ static inline  double* ParticlesMonitorData_getp__rot_y_rad(ParticlesMonitorData restrict  obj){
+  int64_t offset=0;
+  offset+=128;
+  return ( double*)(( char*) obj+offset);
+}
+ static inline double ParticlesMonitorData_get__rot_s_rad_no_frame(const ParticlesMonitorData restrict  obj){
+  int64_t offset=0;
+  offset+=136;
+  return *( double*)(( char*) obj+offset);
+}
+ static inline void ParticlesMonitorData_set__rot_s_rad_no_frame(ParticlesMonitorData restrict  obj, double value){
+  int64_t offset=0;
+  offset+=136;
+  *( double*)(( char*) obj+offset)=value;
+}
+ static inline  double* ParticlesMonitorData_getp__rot_s_rad_no_frame(ParticlesMonitorData restrict  obj){
+  int64_t offset=0;
+  offset+=136;
+  return ( double*)(( char*) obj+offset);
+}
+ static inline double ParticlesMonitorData_get_rot_shift_anchor(const ParticlesMonitorData restrict  obj){
+  int64_t offset=0;
+  offset+=144;
+  return *( double*)(( char*) obj+offset);
+}
+ static inline void ParticlesMonitorData_set_rot_shift_anchor(ParticlesMonitorData restrict  obj, double value){
+  int64_t offset=0;
+  offset+=144;
+  *( double*)(( char*) obj+offset)=value;
+}
+ static inline  double* ParticlesMonitorData_getp_rot_shift_anchor(ParticlesMonitorData restrict  obj){
+  int64_t offset=0;
+  offset+=144;
+  return ( double*)(( char*) obj+offset);
+}
+#endif
+// copyright ############################### //
+// This file is part of the Xtrack Package.  //
+// Copyright (c) CERN, 2021.                 //
+// ######################################### //
+
+#ifndef XTRACK_CONSTANTS_H
+#define XTRACK_CONSTANTS_H
+
+#if !defined( C_LIGHT )
+    #define   C_LIGHT ( 299792458.0 )
+#endif /* !defined( C_LIGHT ) */
+
+#if !defined( EPSILON_0 )
+    #define   EPSILON_0 (8.854187817620e-12)
+#endif /* !defined( EPSILON_0 ) */
+
+#if !defined( PI )
+    #define PI (3.1415926535897932384626433832795028841971693993751)
+#endif /* !defined( PI ) */
+
+#if !defined( MU_0 )
+    #define MU_0 (PI*4.0e-7)
+#endif /* !defined( MU_0 ) */
+
+#if !defined( DEG2RAD )
+    #define DEG2RAD (0.0174532925199432957692369076848861271344287188854)
+#endif /* !defiend( DEG2RAD ) */
+
+#if !defined( RAD2DEG )
+    #define RAD2DEG (57.29577951308232087679815481410517033240547246656442)
+#endif /* !defiend( RAD2DEG ) */
+
+#if !defined( SQRT_PI )
+    #define SQRT_PI (1.7724538509055160272981674833411451827975494561224)
+#endif /* !defined( SQRT_PI ) */
+
+#if !defined( QELEM )
+    #define QELEM (1.60217662e-19)
+#endif /* !defined( QELEM ) */
+
+#if !defined( DBL_MAX )
+    #define DBL_MAX (1.7976931348623158e+308)
+#endif /* !defined( DBL_MAX ) */
+
+#if !defined( DBL_MIN )
+    #define DBL_MIN (2.2250738585072014e-308)
+#endif /* !defined( DBL_MIN ) */
+
+#if !defined( DBL_EPSILON )
+    #define DBL_EPSILON (2.2204460492503131e-16)
+#endif /* !defined( DBL_EPSILON ) */
+
+#if !defined( RADIUS_ELECTRON )
+    #define RADIUS_ELECTRON (2.8179403262e-15)
+#endif /* !defined( RADIUS_ELECTRON ) */
+
+#if !defined( MASS_ELECTRON )
+    #define MASS_ELECTRON (9.1093837e-31)
+#endif /* !defined( MASS_ELECTRON ) */
+
+#endif /* XTRACK_CONSTANTS_H */
+
+// copyright ############################### //
+// This file is part of the Xtrack Package.  //
+// Copyright (c) CERN, 2023.                 //
+// ######################################### //
+
+#ifndef XTRACK_FUNCTIONS_H
+#define XTRACK_FUNCTIONS_H
+
+#include <headers/track.h>
+
+
+GPUFUN
+void kill_all_particles(LocalParticle* part0, int64_t kill_state) {
+    START_PER_PARTICLE_BLOCK(part0, part);
+        LocalParticle_kill_particle(part, kill_state);
+    END_PER_PARTICLE_BLOCK;
+}
+
+
+GPUFUN
+int8_t assert_tracking(LocalParticle* part, int64_t kill_state){
+    // Whenever we are not tracking, e.g. in a twiss, the particle will be at_turn < 0.
+    // We test this to distinguish genuine tracking from twiss.
+    if (LocalParticle_get_at_turn(part) < 0){
+        LocalParticle_kill_particle(part, kill_state);
+        return 0;
+    }
+    return 1;
+}
+
+#endif /* XTRACK_FUNCTIONS_H */
+
+// copyright ############################### //
+// This file is part of the Xtrack Package.  //
+// Copyright (c) CERN, 2023.                 //
+// ######################################### //
+
+#ifndef XTRACK_PARTICLE_STATES_H
+#define XTRACK_PARTICLE_STATES_H
+
+#define  XT_LOST_ON_APERTURE       0
+#define  XT_LOST_ON_LONG_CUT      -2
+#define  XT_LOST_ALL_E_IN_SYNRAD -10
+#define  RNG_ERR_SEEDS_NOT_SET   -20
+#define  RNG_ERR_INVALID_TRACK   -21
+#define  RNG_ERR_RUTH_NOT_SET    -22
+#define  XT_INVALID_SLICE_TRANSFORM -40
+#define  XT_INVALID_CURVED_SLICE_TRANSFORM -41
+
+#endif /* XTRACK_PARTICLE_STATES_H */
+
+// copyright ############################### //
+// This file is part of the Xtrack Package.  //
+// Copyright (c) CERN, 2025.                 //
+// ######################################### //
+#ifndef XTRACK_TRACK_SROTATION_H
+#define XTRACK_TRACK_SROTATION_H
+
+#include <headers/track.h>
+
+
+GPUFUN
+void SRotation_single_particle(LocalParticle* part, double sin_z, double cos_z)
+{
+    double const x  = LocalParticle_get_x(part);
+    double const y  = LocalParticle_get_y(part);
+    double const px = LocalParticle_get_px(part);
+    double const py = LocalParticle_get_py(part);
+
+    double const x_hat  =  cos_z * x  + sin_z * y;
+    double const y_hat  = -sin_z * x  + cos_z * y;
+    double const px_hat =  cos_z * px + sin_z * py;
+    double const py_hat = -sin_z * px + cos_z * py;
+
+    LocalParticle_set_x(part, x_hat);
+    LocalParticle_set_y(part, y_hat);
+    LocalParticle_set_px(part, px_hat);
+    LocalParticle_set_py(part, py_hat);
+}
+
+#endif
+// copyright ############################### //
+// This file is part of the Xtrack Package.  //
+// Copyright (c) CERN, 2021.                 //
+// ######################################### //
+
+#ifndef XTRACK_TRACK_DRIFT_H
+#define XTRACK_TRACK_DRIFT_H
+
+
+GPUFUN
+void Drift_single_particle_expanded(LocalParticle* part, double length){
+    double const rpp    = LocalParticle_get_rpp(part);
+    double const rv0v    = 1./LocalParticle_get_rvv(part);
+    double const xp     = LocalParticle_get_px(part) * rpp;
+    double const yp     = LocalParticle_get_py(part) * rpp;
+    double const dzeta  = 1 - rv0v * ( 1. + ( xp*xp + yp*yp ) / 2. );
+
+    LocalParticle_add_to_x(part, xp * length );
+    LocalParticle_add_to_y(part, yp * length );
+    LocalParticle_add_to_s(part, length);
+    LocalParticle_add_to_zeta(part, length * dzeta );
+}
+
+
+GPUFUN
+void Drift_single_particle_exact(LocalParticle* part, double length){
+    double const px = LocalParticle_get_px(part);
+    double const py = LocalParticle_get_py(part);
+    double const rv0v    = 1./LocalParticle_get_rvv(part);
+    double const one_plus_delta = 1. + LocalParticle_get_delta(part);
+
+    double const one_over_pz = 1./sqrt(one_plus_delta*one_plus_delta
+                                       - px * px - py * py);
+    double const dzeta = 1 - rv0v * one_plus_delta * one_over_pz;
+
+    LocalParticle_add_to_x(part, px * one_over_pz * length);
+    LocalParticle_add_to_y(part, py * one_over_pz * length);
+    LocalParticle_add_to_zeta(part, dzeta * length);
+    LocalParticle_add_to_s(part, length);
+}
+
+
+GPUFUN
+void Drift_single_particle(LocalParticle* part, double length){
+    #ifndef XTRACK_USE_EXACT_DRIFTS
+        Drift_single_particle_expanded(part, length);
+    #else
+        Drift_single_particle_exact(part, length);
+    #endif
+}
+
+
+#endif /* XTRACK_TRACK_DRIFT_H */
+
+
+#ifndef XSTUITE_TRACK_FLAGS_H
+#define XSTUITE_TRACK_FLAGS_H
+#define XS_FLAG_BACKTRACK (0)
+#define XS_FLAG_KILL_CAVITY_KICK (2)
+#define XS_FLAG_IGNORE_GLOBAL_APERTURE (3)
+#define XS_FLAG_IGNORE_LOCAL_APERTURE (4)
+#define XS_FLAG_SR_TAPER (5)
+#define XS_FLAG_SR_KICK_SAME_AS_FIRST (6)
+
+#endif // XSTUITE_TRACK_FLAGS_H
+
+// copyright ############################### //
+// This file is part of the Xtrack Package.  //
+// Copyright (c) CERN, 2021.                 //
+// ######################################### //
+
+#ifndef XTRACK_MONITORS_H
+#define XTRACK_MONITORS_H
+
+#include <headers/track.h>
+
+
+GPUFUN
+void ParticlesMonitor_track_local_particle(ParticlesMonitorData el,
+                       LocalParticle* part0){
+
+    int64_t const start_at_turn = ParticlesMonitorData_get_start_at_turn(el);
+    int64_t const stop_at_turn = ParticlesMonitorData_get_stop_at_turn(el);
+    int64_t const part_id_start = ParticlesMonitorData_get_part_id_start(el);
+    int64_t const part_id_end= ParticlesMonitorData_get_part_id_end(el);
+    int64_t const ebe_mode = ParticlesMonitorData_get_ebe_mode(el);
+    int64_t const n_repetitions = ParticlesMonitorData_get_n_repetitions(el);
+    int64_t const repetition_period = ParticlesMonitorData_get_repetition_period(el);
+    ParticlesData data = ParticlesMonitorData_getp_data(el);
+
+    int64_t n_turns_record = stop_at_turn - start_at_turn;
+
+    START_PER_PARTICLE_BLOCK(part0, part);
+        int64_t at_turn;
+        if (ebe_mode){
+            at_turn = LocalParticle_get_at_element(part);
+        }
+        else{
+            if (LocalParticle_check_track_flag(part, XS_FLAG_BACKTRACK)) {
+                return; // do not log (only ebe monitor supported for now in backtrack)
+            }
+            at_turn = LocalParticle_get_at_turn(part);
+        }
+        if (n_repetitions == 1){
+            if (at_turn>=start_at_turn && at_turn<stop_at_turn){
+                int64_t const particle_id = LocalParticle_get_particle_id(part);
+                if (particle_id<part_id_end && particle_id>=part_id_start){
+                    int64_t const store_at =
+                        n_turns_record * (particle_id - part_id_start)
+                        + at_turn - start_at_turn;
+                    LocalParticle_to_Particles(part, data, store_at, 0);
+                }
+            }
+        }
+        else if (n_repetitions > 1){
+            if (at_turn < start_at_turn){
+//                return; //only_for_context cuda opencl
+                break; //only_for_context cpu_serial cpu_openmp
+            }
+            int64_t const i_frame = (at_turn - start_at_turn) / repetition_period;
+            if (i_frame < n_repetitions
+                     && at_turn >= start_at_turn + i_frame*repetition_period
+                     && at_turn < stop_at_turn + i_frame*repetition_period
+                 ){
+                int64_t const particle_id = LocalParticle_get_particle_id(part);
+                if (particle_id<part_id_end && particle_id>=part_id_start){
+                    int64_t const store_at =
+                        n_turns_record * (part_id_end  - part_id_start) * i_frame
+                        + n_turns_record * (particle_id - part_id_start)
+                        + (at_turn - i_frame * repetition_period) - start_at_turn;
+                    LocalParticle_to_Particles(part, data, store_at, 0);
+                }
+            }
+        }
+
+        #ifdef XSUITE_RESTORE_LOSS
+        LocalParticle_set_state(part, 1);
+        #endif
+    END_PER_PARTICLE_BLOCK;
+}
+
+#endif
+
+
+
+#include <headers/track.h>
+#include <headers/particle_states.h>
+#include <beam_elements/elements_src/track_misalignments.h>
+GPUFUN void ParticlesMonitor_track_local_particle_with_transformations(ParticlesMonitorData el, LocalParticle* part0){
+    // Transform to local frame
+double const _sin_rot_s = ParticlesMonitorData_get__sin_rot_s(el);
+if (_sin_rot_s > -2.) {
+    double const _cos_rot_s = ParticlesMonitorData_get__cos_rot_s(el);
+    double const rot_s_rad = atan2(_sin_rot_s, _cos_rot_s);
+    double const shift_x = ParticlesMonitorData_get__shift_x(el);
+    double const shift_y = ParticlesMonitorData_get__shift_y(el);
+    double const shift_s = ParticlesMonitorData_get__shift_s(el);
+    double const rot_x_rad = ParticlesMonitorData_get__rot_x_rad(el);
+    double const rot_y_rad = ParticlesMonitorData_get__rot_y_rad(el);
+    double const rot_s_rad_no_frame = ParticlesMonitorData_get__rot_s_rad_no_frame(el);
+    double const length = 0.;
+    ;
+    double const anchor = ParticlesMonitorData_get_rot_shift_anchor(el);
+    int8_t const backtrack = LocalParticle_check_track_flag(part0, XS_FLAG_BACKTRACK);
+
+     if (!backtrack) {
+      track_misalignment_entry_straight(part0, shift_x, shift_y, shift_s, rot_y_rad, rot_x_rad, rot_s_rad_no_frame, anchor, length, rot_s_rad, backtrack);     } else {
+      track_misalignment_exit_straight(part0, shift_x, shift_y, shift_s, rot_y_rad, rot_x_rad, rot_s_rad_no_frame, anchor, length, rot_s_rad, backtrack);
+     }
+
+    /* Spin tracking is disabled by the synrad compile flag */
+    #ifndef XTRACK_MULTIPOLE_NO_SYNRAD
+       // Rotate spin
+
+    {
+//    const int64_t XT_part_block_start_idx = part0->ipart; //only_for_context cpu_openmp
+//    const int64_t XT_part_block_end_idx = part0->endpart; //only_for_context cpu_openmp
+
+    const int64_t XT_part_block_start_idx = 0;                                            //only_for_context cpu_serial
+    const int64_t XT_part_block_end_idx = LocalParticle_get__num_active_particles(part0); //only_for_context cpu_serial
+
+    //#pragma omp simd // TODO: currently does not work, needs investigating
+    for (int64_t XT_part_block_ii = XT_part_block_start_idx; XT_part_block_ii<XT_part_block_end_idx; XT_part_block_ii++) { //only_for_context cpu_openmp cpu_serial
+
+        LocalParticle lpart = *part0;    //only_for_context cpu_serial cpu_openmp
+        LocalParticle* part = &lpart;    //only_for_context cpu_serial cpu_openmp
+        part->ipart = XT_part_block_ii;  //only_for_context cpu_serial cpu_openmp
+
+//        LocalParticle* part = part0;     //only_for_context opencl cuda
+
+//        if (LocalParticle_get_state(part) > 0) {  //only_for_context cpu_openmp
+
+           double const spin_x_0 = LocalParticle_get_spin_x(part);
+           double const spin_y_0 = LocalParticle_get_spin_y(part);
+           if ((spin_x_0 != 0) || (spin_y_0 != 0)){
+               double const spin_x_1 = _cos_rot_s*spin_x_0 + _sin_rot_s*spin_y_0;
+               double const spin_y_1 = -_sin_rot_s*spin_x_0 + _cos_rot_s*spin_y_0;
+               LocalParticle_set_spin_x(part, spin_x_1);
+               LocalParticle_set_spin_y(part, spin_y_1);
+          }
+
+//        }  //only_for_context cpu_openmp
+    }  //only_for_context cpu_serial cpu_openmp
+    }
+
+    #endif
+
+}
+    ParticlesMonitor_track_local_particle(el, part0);
+    // Transform back to global frame
+if (_sin_rot_s > -2.) {
+    double const _cos_rot_s = ParticlesMonitorData_get__cos_rot_s(el);
+    double const rot_s_rad = atan2(_sin_rot_s, _cos_rot_s);
+    double const shift_x = ParticlesMonitorData_get__shift_x(el);
+    double const shift_y = ParticlesMonitorData_get__shift_y(el);
+    double const shift_s = ParticlesMonitorData_get__shift_s(el);
+    double const rot_x_rad = ParticlesMonitorData_get__rot_x_rad(el);
+    double const rot_y_rad = ParticlesMonitorData_get__rot_y_rad(el);
+    double const rot_s_rad_no_frame = ParticlesMonitorData_get__rot_s_rad_no_frame(el);
+    double const length = 0.;
+    ;
+    double const anchor = ParticlesMonitorData_get_rot_shift_anchor(el);
+    int8_t const backtrack = LocalParticle_check_track_flag(part0, XS_FLAG_BACKTRACK);
+
+    /* Spin tracking is disabled by the synrad compile flag */
+    #ifndef XTRACK_MULTIPOLE_NO_SYNRAD
+       // Rotate spin
+
+    {
+//    const int64_t XT_part_block_start_idx = part0->ipart; //only_for_context cpu_openmp
+//    const int64_t XT_part_block_end_idx = part0->endpart; //only_for_context cpu_openmp
+
+    const int64_t XT_part_block_start_idx = 0;                                            //only_for_context cpu_serial
+    const int64_t XT_part_block_end_idx = LocalParticle_get__num_active_particles(part0); //only_for_context cpu_serial
+
+    //#pragma omp simd // TODO: currently does not work, needs investigating
+    for (int64_t XT_part_block_ii = XT_part_block_start_idx; XT_part_block_ii<XT_part_block_end_idx; XT_part_block_ii++) { //only_for_context cpu_openmp cpu_serial
+
+        LocalParticle lpart = *part0;    //only_for_context cpu_serial cpu_openmp
+        LocalParticle* part = &lpart;    //only_for_context cpu_serial cpu_openmp
+        part->ipart = XT_part_block_ii;  //only_for_context cpu_serial cpu_openmp
+
+//        LocalParticle* part = part0;     //only_for_context opencl cuda
+
+//        if (LocalParticle_get_state(part) > 0) {  //only_for_context cpu_openmp
+
+           double const spin_x_0 = LocalParticle_get_spin_x(part);
+           double const spin_y_0 = LocalParticle_get_spin_y(part);
+           if ((spin_x_0 != 0) || (spin_y_0 != 0)){
+               double const spin_x_1 = _cos_rot_s*spin_x_0 - _sin_rot_s*spin_y_0;
+               double const spin_y_1 = _sin_rot_s*spin_x_0 + _cos_rot_s*spin_y_0;
+               LocalParticle_set_spin_x(part, spin_x_1);
+               LocalParticle_set_spin_y(part, spin_y_1);
+          }
+
+//        }  //only_for_context cpu_openmp
+    }  //only_for_context cpu_serial cpu_openmp
+    }
+
+    #endif
+
+     if (!backtrack) {
+       track_misalignment_exit_straight(part0, shift_x, shift_y, shift_s, rot_y_rad, rot_x_rad, rot_s_rad_no_frame, anchor, length, rot_s_rad, backtrack);     } else {
+       track_misalignment_entry_straight(part0, shift_x, shift_y, shift_s, rot_y_rad, rot_x_rad, rot_s_rad_no_frame, anchor, length, rot_s_rad, backtrack);
+     }
+}
+}
+
+
+             
+            void ParticlesMonitor_track_particles(
+               ParticlesMonitorData el,
+
+                             ParticlesData particles,
+
+                             int64_t flag_increment_at_element,
+                  int8_t* io_buffer){
+
+//            #define CONTEXT_OPENMP  //only_for_context cpu_openmp
+            #ifdef CONTEXT_OPENMP
+                const int64_t capacity = ParticlesData_get__capacity(particles);
+                const int num_threads = omp_get_max_threads();
+
+                #ifndef XT_OMP_SKIP_REORGANIZE
+                    const int64_t num_particles_to_track = ParticlesData_get__num_active_particles(particles);
+
+                    {
+                        LocalParticle lpart;
+                        lpart.io_buffer = io_buffer;
+                        Particles_to_LocalParticle(particles, &lpart, 0, capacity);
+                        check_is_active(&lpart);
+                        count_reorganized_particles(&lpart);
+                        LocalParticle_to_Particles(&lpart, particles, 0, capacity);
+                    }
+                #else // When we skip reorganize, we cannot just batch active particles
+                    const int64_t num_particles_to_track = capacity;
+                #endif
+
+                const int64_t chunk_size = (num_particles_to_track + num_threads - 1)/num_threads; // ceil division
+            #endif // CONTEXT_OPENMP
+
+//            #pragma omp parallel for                                                           //only_for_context cpu_openmp
+//            for (int64_t batch_id = 0; batch_id < num_threads; batch_id++) {                   //only_for_context cpu_openmp
+                LocalParticle lpart;
+                lpart.io_buffer = io_buffer;
+                lpart.track_flags = 0;
+//                int64_t part_id = batch_id * chunk_size;                                       //only_for_context cpu_openmp
+//                int64_t end_id = (batch_id + 1) * chunk_size;                                  //only_for_context cpu_openmp
+//                if (end_id > num_particles_to_track) end_id = num_particles_to_track;          //only_for_context cpu_openmp
+
+                int64_t part_id = 0;                    //only_for_context cpu_serial
+//                int64_t part_id = blockDim.x * blockIdx.x + threadIdx.x; //only_for_context cuda
+//                int64_t part_id = get_global_id(0);                    //only_for_context opencl
+                int64_t end_id = 0; // unused outside of openmp  //only_for_context cpu_serial cuda opencl
+
+                int64_t part_capacity = ParticlesData_get__capacity(particles);
+                if (part_id<part_capacity){
+                    Particles_to_LocalParticle(particles, &lpart, part_id, end_id);
+                    if (check_is_active(&lpart)>0){
+              ParticlesMonitor_track_local_particle_with_transformations(el, &lpart);
+
+                    }
+                    if (check_is_active(&lpart)>0 && flag_increment_at_element){
+                            increment_at_element(&lpart, 1);
+                    }
+                }
+//            } //only_for_context cpu_openmp
+
+            // On OpenMP we want to additionally by default reorganize all
+            // the particles.
+//            #ifndef XT_OMP_SKIP_REORGANIZE                             //only_for_context cpu_openmp
+//            LocalParticle lpart;                                       //only_for_context cpu_openmp
+//            lpart.io_buffer = io_buffer;                               //only_for_context cpu_openmp
+//            Particles_to_LocalParticle(particles, &lpart, 0, capacity);//only_for_context cpu_openmp
+//            check_is_active(&lpart);                                   //only_for_context cpu_openmp
+//            #endif                                                     //only_for_context cpu_openmp
+        }
+
+#ifndef XOBJ_TYPEDEF_RandomUniformData
+#define XOBJ_TYPEDEF_RandomUniformData
+typedef   struct RandomUniformData_s * RandomUniformData;
+ static inline RandomUniformData RandomUniformData_getp(RandomUniformData restrict  obj){
+  int64_t offset=0;
+  return (RandomUniformData)(( char*) obj+offset);
+}
+ static inline uint8_t RandomUniformData_get__dummy(const RandomUniformData restrict  obj){
+  int64_t offset=0;
+  return *(( uint8_t*) obj+offset);
+}
+ static inline void RandomUniformData_set__dummy(RandomUniformData restrict  obj, uint8_t value){
+  int64_t offset=0;
+  *(( uint8_t*) obj+offset)=value;
+}
+ static inline  uint8_t* RandomUniformData_getp__dummy(RandomUniformData restrict  obj){
+  int64_t offset=0;
+  return ( uint8_t*)(( char*) obj+offset);
+}
+ static inline double RandomUniformData_get__sin_rot_s(const RandomUniformData restrict  obj){
+  int64_t offset=0;
+  offset+=8;
+  return *( double*)(( char*) obj+offset);
+}
+ static inline void RandomUniformData_set__sin_rot_s(RandomUniformData restrict  obj, double value){
+  int64_t offset=0;
+  offset+=8;
+  *( double*)(( char*) obj+offset)=value;
+}
+ static inline  double* RandomUniformData_getp__sin_rot_s(RandomUniformData restrict  obj){
+  int64_t offset=0;
+  offset+=8;
+  return ( double*)(( char*) obj+offset);
+}
+ static inline double RandomUniformData_get__cos_rot_s(const RandomUniformData restrict  obj){
+  int64_t offset=0;
+  offset+=16;
+  return *( double*)(( char*) obj+offset);
+}
+ static inline void RandomUniformData_set__cos_rot_s(RandomUniformData restrict  obj, double value){
+  int64_t offset=0;
+  offset+=16;
+  *( double*)(( char*) obj+offset)=value;
+}
+ static inline  double* RandomUniformData_getp__cos_rot_s(RandomUniformData restrict  obj){
+  int64_t offset=0;
+  offset+=16;
+  return ( double*)(( char*) obj+offset);
+}
+ static inline double RandomUniformData_get__shift_x(const RandomUniformData restrict  obj){
+  int64_t offset=0;
+  offset+=24;
+  return *( double*)(( char*) obj+offset);
+}
+ static inline void RandomUniformData_set__shift_x(RandomUniformData restrict  obj, double value){
+  int64_t offset=0;
+  offset+=24;
+  *( double*)(( char*) obj+offset)=value;
+}
+ static inline  double* RandomUniformData_getp__shift_x(RandomUniformData restrict  obj){
+  int64_t offset=0;
+  offset+=24;
+  return ( double*)(( char*) obj+offset);
+}
+ static inline double RandomUniformData_get__shift_y(const RandomUniformData restrict  obj){
+  int64_t offset=0;
+  offset+=32;
+  return *( double*)(( char*) obj+offset);
+}
+ static inline void RandomUniformData_set__shift_y(RandomUniformData restrict  obj, double value){
+  int64_t offset=0;
+  offset+=32;
+  *( double*)(( char*) obj+offset)=value;
+}
+ static inline  double* RandomUniformData_getp__shift_y(RandomUniformData restrict  obj){
   int64_t offset=0;
-  offset+=104;
+  offset+=32;
   return ( double*)(( char*) obj+offset);
 }
- static inline double ParticlesMonitorData_get__shift_s(const ParticlesMonitorData restrict  obj){
+ static inline double RandomUniformData_get__shift_s(const RandomUniformData restrict  obj){
   int64_t offset=0;
-  offset+=112;
+  offset+=40;
   return *( double*)(( char*) obj+offset);
 }
- static inline void ParticlesMonitorData_set__shift_s(ParticlesMonitorData restrict  obj, double value){
+ static inline void RandomUniformData_set__shift_s(RandomUniformData restrict  obj, double value){
   int64_t offset=0;
-  offset+=112;
+  offset+=40;
   *( double*)(( char*) obj+offset)=value;
 }
- static inline  double* ParticlesMonitorData_getp__shift_s(ParticlesMonitorData restrict  obj){
+ static inline  double* RandomUniformData_getp__shift_s(RandomUniformData restrict  obj){
   int64_t offset=0;
-  offset+=112;
+  offset+=40;
   return ( double*)(( char*) obj+offset);
 }
- static inline double ParticlesMonitorData_get__rot_x_rad(const ParticlesMonitorData restrict  obj){
+ static inline double RandomUniformData_get__rot_x_rad(const RandomUniformData restrict  obj){
   int64_t offset=0;
-  offset+=120;
+  offset+=48;
   return *( double*)(( char*) obj+offset);
 }
- static inline void ParticlesMonitorData_set__rot_x_rad(ParticlesMonitorData restrict  obj, double value){
+ static inline void RandomUniformData_set__rot_x_rad(RandomUniformData restrict  obj, double value){
   int64_t offset=0;
-  offset+=120;
+  offset+=48;
   *( double*)(( char*) obj+offset)=value;
 }
- static inline  double* ParticlesMonitorData_getp__rot_x_rad(ParticlesMonitorData restrict  obj){
+ static inline  double* RandomUniformData_getp__rot_x_rad(RandomUniformData restrict  obj){
   int64_t offset=0;
-  offset+=120;
+  offset+=48;
   return ( double*)(( char*) obj+offset);
 }
- static inline double ParticlesMonitorData_get__rot_y_rad(const ParticlesMonitorData restrict  obj){
+ static inline double RandomUniformData_get__rot_y_rad(const RandomUniformData restrict  obj){
   int64_t offset=0;
-  offset+=128;
+  offset+=56;
   return *( double*)(( char*) obj+offset);
 }
- static inline void ParticlesMonitorData_set__rot_y_rad(ParticlesMonitorData restrict  obj, double value){
+ static inline void RandomUniformData_set__rot_y_rad(RandomUniformData restrict  obj, double value){
   int64_t offset=0;
-  offset+=128;
+  offset+=56;
   *( double*)(( char*) obj+offset)=value;
 }
- static inline  double* ParticlesMonitorData_getp__rot_y_rad(ParticlesMonitorData restrict  obj){
+ static inline  double* RandomUniformData_getp__rot_y_rad(RandomUniformData restrict  obj){
   int64_t offset=0;
-  offset+=128;
+  offset+=56;
   return ( double*)(( char*) obj+offset);
 }
- static inline double ParticlesMonitorData_get__rot_s_rad_no_frame(const ParticlesMonitorData restrict  obj){
+ static inline double RandomUniformData_get__rot_s_rad_no_frame(const RandomUniformData restrict  obj){
   int64_t offset=0;
-  offset+=136;
+  offset+=64;
   return *( double*)(( char*) obj+offset);
 }
- static inline void ParticlesMonitorData_set__rot_s_rad_no_frame(ParticlesMonitorData restrict  obj, double value){
+ static inline void RandomUniformData_set__rot_s_rad_no_frame(RandomUniformData restrict  obj, double value){
   int64_t offset=0;
-  offset+=136;
+  offset+=64;
   *( double*)(( char*) obj+offset)=value;
 }
- static inline  double* ParticlesMonitorData_getp__rot_s_rad_no_frame(ParticlesMonitorData restrict  obj){
+ static inline  double* RandomUniformData_getp__rot_s_rad_no_frame(RandomUniformData restrict  obj){
   int64_t offset=0;
-  offset+=136;
+  offset+=64;
   return ( double*)(( char*) obj+offset);
 }
- static inline double ParticlesMonitorData_get_rot_shift_anchor(const ParticlesMonitorData restrict  obj){
+ static inline double RandomUniformData_get_rot_shift_anchor(const RandomUniformData restrict  obj){
   int64_t offset=0;
-  offset+=144;
+  offset+=72;
   return *( double*)(( char*) obj+offset);
 }
- static inline void ParticlesMonitorData_set_rot_shift_anchor(ParticlesMonitorData restrict  obj, double value){
+ static inline void RandomUniformData_set_rot_shift_anchor(RandomUniformData restrict  obj, double value){
   int64_t offset=0;
-  offset+=144;
+  offset+=72;
   *( double*)(( char*) obj+offset)=value;
 }
- static inline  double* ParticlesMonitorData_getp_rot_shift_anchor(ParticlesMonitorData restrict  obj){
+ static inline  double* RandomUniformData_getp_rot_shift_anchor(RandomUniformData restrict  obj){
   int64_t offset=0;
-  offset+=144;
+  offset+=72;
   return ( double*)(( char*) obj+offset);
 }
 #endif
@@ -5432,266 +5633,65 @@ void Drift_single_particle_expanded(LocalParticle* part, double length){
     double const rv0v    = 1./LocalParticle_get_rvv(part);
     double const xp     = LocalParticle_get_px(part) * rpp;
     double const yp     = LocalParticle_get_py(part) * rpp;
-    double const dzeta  = 1 - rv0v * ( 1. + ( xp*xp + yp*yp ) / 2. );
-
-    LocalParticle_add_to_x(part, xp * length );
-    LocalParticle_add_to_y(part, yp * length );
-    LocalParticle_add_to_s(part, length);
-    LocalParticle_add_to_zeta(part, length * dzeta );
-}
-
-
-GPUFUN
-void Drift_single_particle_exact(LocalParticle* part, double length){
-    double const px = LocalParticle_get_px(part);
-    double const py = LocalParticle_get_py(part);
-    double const rv0v    = 1./LocalParticle_get_rvv(part);
-    double const one_plus_delta = 1. + LocalParticle_get_delta(part);
-
-    double const one_over_pz = 1./sqrt(one_plus_delta*one_plus_delta
-                                       - px * px - py * py);
-    double const dzeta = 1 - rv0v * one_plus_delta * one_over_pz;
-
-    LocalParticle_add_to_x(part, px * one_over_pz * length);
-    LocalParticle_add_to_y(part, py * one_over_pz * length);
-    LocalParticle_add_to_zeta(part, dzeta * length);
-    LocalParticle_add_to_s(part, length);
-}
-
-
-GPUFUN
-void Drift_single_particle(LocalParticle* part, double length){
-    #ifndef XTRACK_USE_EXACT_DRIFTS
-        Drift_single_particle_expanded(part, length);
-    #else
-        Drift_single_particle_exact(part, length);
-    #endif
-}
-
-
-#endif /* XTRACK_TRACK_DRIFT_H */
-
-
-#ifndef XSTUITE_TRACK_FLAGS_H
-#define XSTUITE_TRACK_FLAGS_H
-#define XS_FLAG_BACKTRACK (0)
-#define XS_FLAG_KILL_CAVITY_KICK (2)
-#define XS_FLAG_IGNORE_GLOBAL_APERTURE (3)
-#define XS_FLAG_IGNORE_LOCAL_APERTURE (4)
-#define XS_FLAG_SR_TAPER (5)
-#define XS_FLAG_SR_KICK_SAME_AS_FIRST (6)
-
-#endif // XSTUITE_TRACK_FLAGS_H
-
-// copyright ############################### //
-// This file is part of the Xtrack Package.  //
-// Copyright (c) CERN, 2021.                 //
-// ######################################### //
-
-#ifndef XTRACK_MONITORS_H
-#define XTRACK_MONITORS_H
-
-#include <headers/track.h>
-
-
-GPUFUN
-void ParticlesMonitor_track_local_particle(ParticlesMonitorData el,
-                       LocalParticle* part0){
-
-    int64_t const start_at_turn = ParticlesMonitorData_get_start_at_turn(el);
-    int64_t const stop_at_turn = ParticlesMonitorData_get_stop_at_turn(el);
-    int64_t const part_id_start = ParticlesMonitorData_get_part_id_start(el);
-    int64_t const part_id_end= ParticlesMonitorData_get_part_id_end(el);
-    int64_t const ebe_mode = ParticlesMonitorData_get_ebe_mode(el);
-    int64_t const n_repetitions = ParticlesMonitorData_get_n_repetitions(el);
-    int64_t const repetition_period = ParticlesMonitorData_get_repetition_period(el);
-    ParticlesData data = ParticlesMonitorData_getp_data(el);
-
-    int64_t n_turns_record = stop_at_turn - start_at_turn;
-
-    START_PER_PARTICLE_BLOCK(part0, part);
-        int64_t at_turn;
-        if (ebe_mode){
-            at_turn = LocalParticle_get_at_element(part);
-        }
-        else{
-            if (LocalParticle_check_track_flag(part, XS_FLAG_BACKTRACK)) {
-                return; // do not log (only ebe monitor supported for now in backtrack)
-            }
-            at_turn = LocalParticle_get_at_turn(part);
-        }
-        if (n_repetitions == 1){
-            if (at_turn>=start_at_turn && at_turn<stop_at_turn){
-                int64_t const particle_id = LocalParticle_get_particle_id(part);
-                if (particle_id<part_id_end && particle_id>=part_id_start){
-                    int64_t const store_at =
-                        n_turns_record * (particle_id - part_id_start)
-                        + at_turn - start_at_turn;
-                    LocalParticle_to_Particles(part, data, store_at, 0);
-                }
-            }
-        }
-        else if (n_repetitions > 1){
-            if (at_turn < start_at_turn){
-//                return; //only_for_context cuda opencl
-                break; //only_for_context cpu_serial cpu_openmp
-            }
-            int64_t const i_frame = (at_turn - start_at_turn) / repetition_period;
-            if (i_frame < n_repetitions
-                     && at_turn >= start_at_turn + i_frame*repetition_period
-                     && at_turn < stop_at_turn + i_frame*repetition_period
-                 ){
-                int64_t const particle_id = LocalParticle_get_particle_id(part);
-                if (particle_id<part_id_end && particle_id>=part_id_start){
-                    int64_t const store_at =
-                        n_turns_record * (part_id_end  - part_id_start) * i_frame
-                        + n_turns_record * (particle_id - part_id_start)
-                        + (at_turn - i_frame * repetition_period) - start_at_turn;
-                    LocalParticle_to_Particles(part, data, store_at, 0);
-                }
-            }
-        }
-
-        #ifdef XSUITE_RESTORE_LOSS
-        LocalParticle_set_state(part, 1);
-        #endif
-    END_PER_PARTICLE_BLOCK;
-}
-
-#endif
-
-
-
-#include <headers/track.h>
-#include <headers/particle_states.h>
-#include <beam_elements/elements_src/track_misalignments.h>
-GPUFUN void ParticlesMonitor_track_local_particle_with_transformations(ParticlesMonitorData el, LocalParticle* part0){
-    // Transform to local frame
-double const _sin_rot_s = ParticlesMonitorData_get__sin_rot_s(el);
-if (_sin_rot_s > -2.) {
-    double const _cos_rot_s = ParticlesMonitorData_get__cos_rot_s(el);
-    double const rot_s_rad = atan2(_sin_rot_s, _cos_rot_s);
-    double const shift_x = ParticlesMonitorData_get__shift_x(el);
-    double const shift_y = ParticlesMonitorData_get__shift_y(el);
-    double const shift_s = ParticlesMonitorData_get__shift_s(el);
-    double const rot_x_rad = ParticlesMonitorData_get__rot_x_rad(el);
-    double const rot_y_rad = ParticlesMonitorData_get__rot_y_rad(el);
-    double const rot_s_rad_no_frame = ParticlesMonitorData_get__rot_s_rad_no_frame(el);
-    double const length = 0.;
-    ;
-    double const anchor = ParticlesMonitorData_get_rot_shift_anchor(el);
-    int8_t const backtrack = LocalParticle_check_track_flag(part0, XS_FLAG_BACKTRACK);
-
-     if (!backtrack) {
-      track_misalignment_entry_straight(part0, shift_x, shift_y, shift_s, rot_y_rad, rot_x_rad, rot_s_rad_no_frame, anchor, length, rot_s_rad, backtrack);     } else {
-      track_misalignment_exit_straight(part0, shift_x, shift_y, shift_s, rot_y_rad, rot_x_rad, rot_s_rad_no_frame, anchor, length, rot_s_rad, backtrack);
-     }
-
-    /* Spin tracking is disabled by the synrad compile flag */
-    #ifndef XTRACK_MULTIPOLE_NO_SYNRAD
-       // Rotate spin
-
-    {
-//    const int64_t XT_part_block_start_idx = part0->ipart; //only_for_context cpu_openmp
-//    const int64_t XT_part_block_end_idx = part0->endpart; //only_for_context cpu_openmp
-
-    const int64_t XT_part_block_start_idx = 0;                                            //only_for_context cpu_serial
-    const int64_t XT_part_block_end_idx = LocalParticle_get__num_active_particles(part0); //only_for_context cpu_serial
-
-    //#pragma omp simd // TODO: currently does not work, needs investigating
-    for (int64_t XT_part_block_ii = XT_part_block_start_idx; XT_part_block_ii<XT_part_block_end_idx; XT_part_block_ii++) { //only_for_context cpu_openmp cpu_serial
-
-        LocalParticle lpart = *part0;    //only_for_context cpu_serial cpu_openmp
-        LocalParticle* part = &lpart;    //only_for_context cpu_serial cpu_openmp
-        part->ipart = XT_part_block_ii;  //only_for_context cpu_serial cpu_openmp
-
-//        LocalParticle* part = part0;     //only_for_context opencl cuda
-
-//        if (LocalParticle_get_state(part) > 0) {  //only_for_context cpu_openmp
-
-           double const spin_x_0 = LocalParticle_get_spin_x(part);
-           double const spin_y_0 = LocalParticle_get_spin_y(part);
-           if ((spin_x_0 != 0) || (spin_y_0 != 0)){
-               double const spin_x_1 = _cos_rot_s*spin_x_0 + _sin_rot_s*spin_y_0;
-               double const spin_y_1 = -_sin_rot_s*spin_x_0 + _cos_rot_s*spin_y_0;
-               LocalParticle_set_spin_x(part, spin_x_1);
-               LocalParticle_set_spin_y(part, spin_y_1);
-          }
-
-//        }  //only_for_context cpu_openmp
-    }  //only_for_context cpu_serial cpu_openmp
-    }
-
-    #endif
+    double const dzeta  = 1 - rv0v * ( 1. + ( xp*xp + yp*yp ) / 2. );
 
+    LocalParticle_add_to_x(part, xp * length );
+    LocalParticle_add_to_y(part, yp * length );
+    LocalParticle_add_to_s(part, length);
+    LocalParticle_add_to_zeta(part, length * dzeta );
 }
-    ParticlesMonitor_track_local_particle(el, part0);
-    // Transform back to global frame
-if (_sin_rot_s > -2.) {
-    double const _cos_rot_s = ParticlesMonitorData_get__cos_rot_s(el);
-    double const rot_s_rad = atan2(_sin_rot_s, _cos_rot_s);
-    double const shift_x = ParticlesMonitorData_get__shift_x(el);
-    double const shift_y = ParticlesMonitorData_get__shift_y(el);
-    double const shift_s = ParticlesMonitorData_get__shift_s(el);
-    double const rot_x_rad = ParticlesMonitorData_get__rot_x_rad(el);
-    double const rot_y_rad = ParticlesMonitorData_get__rot_y_rad(el);
-    double const rot_s_rad_no_frame = ParticlesMonitorData_get__rot_s_rad_no_frame(el);
-    double const length = 0.;
-    ;
-    double const anchor = ParticlesMonitorData_get_rot_shift_anchor(el);
-    int8_t const backtrack = LocalParticle_check_track_flag(part0, XS_FLAG_BACKTRACK);
 
-    /* Spin tracking is disabled by the synrad compile flag */
-    #ifndef XTRACK_MULTIPOLE_NO_SYNRAD
-       // Rotate spin
 
-    {
-//    const int64_t XT_part_block_start_idx = part0->ipart; //only_for_context cpu_openmp
-//    const int64_t XT_part_block_end_idx = part0->endpart; //only_for_context cpu_openmp
+GPUFUN
+void Drift_single_particle_exact(LocalParticle* part, double length){
+    double const px = LocalParticle_get_px(part);
+    double const py = LocalParticle_get_py(part);
+    double const rv0v    = 1./LocalParticle_get_rvv(part);
+    double const one_plus_delta = 1. + LocalParticle_get_delta(part);
 
-    const int64_t XT_part_block_start_idx = 0;                                            //only_for_context cpu_serial
-    const int64_t XT_part_block_end_idx = LocalParticle_get__num_active_particles(part0); //only_for_context cpu_serial
+    double const one_over_pz = 1./sqrt(one_plus_delta*one_plus_delta
+                                       - px * px - py * py);
+    double const dzeta = 1 - rv0v * one_plus_delta * one_over_pz;
 
-    //#pragma omp simd // TODO: currently does not work, needs investigating
-    for (int64_t XT_part_block_ii = XT_part_block_start_idx; XT_part_block_ii<XT_part_block_end_idx; XT_part_block_ii++) { //only_for_context cpu_openmp cpu_serial
+    LocalParticle_add_to_x(part, px * one_over_pz * length);
+    LocalParticle_add_to_y(part, py * one_over_pz * length);
+    LocalParticle_add_to_zeta(part, dzeta * length);
+    LocalParticle_add_to_s(part, length);
+}
 
-        LocalParticle lpart = *part0;    //only_for_context cpu_serial cpu_openmp
-        LocalParticle* part = &lpart;    //only_for_context cpu_serial cpu_openmp
-        part->ipart = XT_part_block_ii;  //only_for_context cpu_serial cpu_openmp
 
-//        LocalParticle* part = part0;     //only_for_context opencl cuda
+GPUFUN
+void Drift_single_particle(LocalParticle* part, double length){
+    #ifndef XTRACK_USE_EXACT_DRIFTS
+        Drift_single_particle_expanded(part, length);
+    #else
+        Drift_single_particle_exact(part, length);
+    #endif
+}
 
-//        if (LocalParticle_get_state(part) > 0) {  //only_for_context cpu_openmp
 
-           double const spin_x_0 = LocalParticle_get_spin_x(part);
-           double const spin_y_0 = LocalParticle_get_spin_y(part);
-           if ((spin_x_0 != 0) || (spin_y_0 != 0)){
-               double const spin_x_1 = _cos_rot_s*spin_x_0 - _sin_rot_s*spin_y_0;
-               double const spin_y_1 = _sin_rot_s*spin_x_0 + _cos_rot_s*spin_y_0;
-               LocalParticle_set_spin_x(part, spin_x_1);
-               LocalParticle_set_spin_y(part, spin_y_1);
-          }
+#endif /* XTRACK_TRACK_DRIFT_H */
 
-//        }  //only_for_context cpu_openmp
-    }  //only_for_context cpu_serial cpu_openmp
-    }
 
-    #endif
+#ifndef XSTUITE_TRACK_FLAGS_H
+#define XSTUITE_TRACK_FLAGS_H
+#define XS_FLAG_BACKTRACK (0)
+#define XS_FLAG_KILL_CAVITY_KICK (2)
+#define XS_FLAG_IGNORE_GLOBAL_APERTURE (3)
+#define XS_FLAG_IGNORE_LOCAL_APERTURE (4)
+#define XS_FLAG_SR_TAPER (5)
+#define XS_FLAG_SR_KICK_SAME_AS_FIRST (6)
 
-     if (!backtrack) {
-       track_misalignment_exit_straight(part0, shift_x, shift_y, shift_s, rot_y_rad, rot_x_rad, rot_s_rad_no_frame, anchor, length, rot_s_rad, backtrack);     } else {
-       track_misalignment_entry_straight(part0, shift_x, shift_y, shift_s, rot_y_rad, rot_x_rad, rot_s_rad_no_frame, anchor, length, rot_s_rad, backtrack);
-     }
-}
-}
+#endif // XSTUITE_TRACK_FLAGS_H
 
+#include <random/random_src/uniform.h>
 
              
-            void ParticlesMonitor_track_particles(
-               ParticlesMonitorData el,
+            void sample_uniform(
+               RandomUniformData el,
 
                              ParticlesData particles,
-
+    double* samples,  int64_t n_samples_per_seed, 
                              int64_t flag_increment_at_element,
                   int8_t* io_buffer){
 
@@ -5736,7 +5736,7 @@ if (_sin_rot_s > -2.) {
                 if (part_id<part_capacity){
                     Particles_to_LocalParticle(particles, &lpart, part_id, end_id);
                     if (check_is_active(&lpart)>0){
-              ParticlesMonitor_track_local_particle_with_transformations(el, &lpart);
+              RandomUniform_sample(el, &lpart, samples, n_samples_per_seed);
 
                     }
                     if (check_is_active(&lpart)>0 && flag_increment_at_element){
@@ -5755,218 +5755,177 @@ if (_sin_rot_s > -2.) {
 //            #endif                                                     //only_for_context cpu_openmp
         }
 
-#ifndef XOBJ_TYPEDEF_RandomRutherfordData
-#define XOBJ_TYPEDEF_RandomRutherfordData
-typedef   struct RandomRutherfordData_s * RandomRutherfordData;
- static inline RandomRutherfordData RandomRutherfordData_getp(RandomRutherfordData restrict  obj){
+#ifndef XOBJ_TYPEDEF_ElementRefClass
+#define XOBJ_TYPEDEF_ElementRefClass
+typedef   struct ElementRefClass_s * ElementRefClass;
+enum ElementRefClass_e{ElementRefClass_ParticlesMonitorData_t};
+ static inline ElementRefClass ElementRefClass_getp(ElementRefClass restrict  obj){
   int64_t offset=0;
-  return (RandomRutherfordData)(( char*) obj+offset);
+  return (ElementRefClass)(( char*) obj+offset);
 }
- static inline double RandomRutherfordData_get_lower_val(const RandomRutherfordData restrict  obj){
+ static inline int64_t ElementRefClass_typeid(const ElementRefClass restrict  obj){
   int64_t offset=0;
-  return *( double*)(( char*) obj+offset);
+  offset+=8;
+  return *( int64_t*)(( char*) obj+offset);
 }
- static inline void RandomRutherfordData_set_lower_val(RandomRutherfordData restrict  obj, double value){
+ static inline  void* ElementRefClass_member(const ElementRefClass restrict  obj){
   int64_t offset=0;
-  *( double*)(( char*) obj+offset)=value;
+  offset+=*( int64_t*)(( char*) obj+offset);
+ return ( void*)(( char*) obj+offset);
 }
- static inline  double* RandomRutherfordData_getp_lower_val(RandomRutherfordData restrict  obj){
+#endif
+#ifndef XOBJ_TYPEDEF_RandomNormalData
+#define XOBJ_TYPEDEF_RandomNormalData
+typedef   struct RandomNormalData_s * RandomNormalData;
+ static inline RandomNormalData RandomNormalData_getp(RandomNormalData restrict  obj){
   int64_t offset=0;
-  return ( double*)(( char*) obj+offset);
+  return (RandomNormalData)(( char*) obj+offset);
 }
- static inline double RandomRutherfordData_get_upper_val(const RandomRutherfordData restrict  obj){
+ static inline uint8_t RandomNormalData_get__dummy(const RandomNormalData restrict  obj){
+  int64_t offset=0;
+  return *(( uint8_t*) obj+offset);
+}
+ static inline void RandomNormalData_set__dummy(RandomNormalData restrict  obj, uint8_t value){
+  int64_t offset=0;
+  *(( uint8_t*) obj+offset)=value;
+}
+ static inline  uint8_t* RandomNormalData_getp__dummy(RandomNormalData restrict  obj){
+  int64_t offset=0;
+  return ( uint8_t*)(( char*) obj+offset);
+}
+ static inline double RandomNormalData_get__sin_rot_s(const RandomNormalData restrict  obj){
   int64_t offset=0;
   offset+=8;
   return *( double*)(( char*) obj+offset);
 }
- static inline void RandomRutherfordData_set_upper_val(RandomRutherfordData restrict  obj, double value){
+ static inline void RandomNormalData_set__sin_rot_s(RandomNormalData restrict  obj, double value){
   int64_t offset=0;
   offset+=8;
   *( double*)(( char*) obj+offset)=value;
 }
- static inline  double* RandomRutherfordData_getp_upper_val(RandomRutherfordData restrict  obj){
+ static inline  double* RandomNormalData_getp__sin_rot_s(RandomNormalData restrict  obj){
   int64_t offset=0;
   offset+=8;
   return ( double*)(( char*) obj+offset);
 }
- static inline double RandomRutherfordData_get_A(const RandomRutherfordData restrict  obj){
+ static inline double RandomNormalData_get__cos_rot_s(const RandomNormalData restrict  obj){
   int64_t offset=0;
   offset+=16;
   return *( double*)(( char*) obj+offset);
 }
- static inline void RandomRutherfordData_set_A(RandomRutherfordData restrict  obj, double value){
+ static inline void RandomNormalData_set__cos_rot_s(RandomNormalData restrict  obj, double value){
   int64_t offset=0;
   offset+=16;
   *( double*)(( char*) obj+offset)=value;
 }
- static inline  double* RandomRutherfordData_getp_A(RandomRutherfordData restrict  obj){
+ static inline  double* RandomNormalData_getp__cos_rot_s(RandomNormalData restrict  obj){
   int64_t offset=0;
   offset+=16;
   return ( double*)(( char*) obj+offset);
 }
- static inline double RandomRutherfordData_get_B(const RandomRutherfordData restrict  obj){
+ static inline double RandomNormalData_get__shift_x(const RandomNormalData restrict  obj){
   int64_t offset=0;
   offset+=24;
   return *( double*)(( char*) obj+offset);
 }
- static inline void RandomRutherfordData_set_B(RandomRutherfordData restrict  obj, double value){
+ static inline void RandomNormalData_set__shift_x(RandomNormalData restrict  obj, double value){
   int64_t offset=0;
   offset+=24;
   *( double*)(( char*) obj+offset)=value;
 }
- static inline  double* RandomRutherfordData_getp_B(RandomRutherfordData restrict  obj){
+ static inline  double* RandomNormalData_getp__shift_x(RandomNormalData restrict  obj){
   int64_t offset=0;
   offset+=24;
   return ( double*)(( char*) obj+offset);
 }
- static inline int8_t RandomRutherfordData_get_Newton_iterations(const RandomRutherfordData restrict  obj){
+ static inline double RandomNormalData_get__shift_y(const RandomNormalData restrict  obj){
   int64_t offset=0;
   offset+=32;
-  return *(( int8_t*) obj+offset);
+  return *( double*)(( char*) obj+offset);
 }
- static inline void RandomRutherfordData_set_Newton_iterations(RandomRutherfordData restrict  obj, int8_t value){
+ static inline void RandomNormalData_set__shift_y(RandomNormalData restrict  obj, double value){
   int64_t offset=0;
   offset+=32;
-  *(( int8_t*) obj+offset)=value;
+  *( double*)(( char*) obj+offset)=value;
 }
- static inline  int8_t* RandomRutherfordData_getp_Newton_iterations(RandomRutherfordData restrict  obj){
+ static inline  double* RandomNormalData_getp__shift_y(RandomNormalData restrict  obj){
   int64_t offset=0;
   offset+=32;
-  return ( int8_t*)(( char*) obj+offset);
+  return ( double*)(( char*) obj+offset);
 }
- static inline double RandomRutherfordData_get__sin_rot_s(const RandomRutherfordData restrict  obj){
+ static inline double RandomNormalData_get__shift_s(const RandomNormalData restrict  obj){
   int64_t offset=0;
   offset+=40;
   return *( double*)(( char*) obj+offset);
 }
- static inline void RandomRutherfordData_set__sin_rot_s(RandomRutherfordData restrict  obj, double value){
+ static inline void RandomNormalData_set__shift_s(RandomNormalData restrict  obj, double value){
   int64_t offset=0;
   offset+=40;
   *( double*)(( char*) obj+offset)=value;
 }
- static inline  double* RandomRutherfordData_getp__sin_rot_s(RandomRutherfordData restrict  obj){
+ static inline  double* RandomNormalData_getp__shift_s(RandomNormalData restrict  obj){
   int64_t offset=0;
   offset+=40;
   return ( double*)(( char*) obj+offset);
 }
- static inline double RandomRutherfordData_get__cos_rot_s(const RandomRutherfordData restrict  obj){
+ static inline double RandomNormalData_get__rot_x_rad(const RandomNormalData restrict  obj){
   int64_t offset=0;
   offset+=48;
   return *( double*)(( char*) obj+offset);
 }
- static inline void RandomRutherfordData_set__cos_rot_s(RandomRutherfordData restrict  obj, double value){
+ static inline void RandomNormalData_set__rot_x_rad(RandomNormalData restrict  obj, double value){
   int64_t offset=0;
   offset+=48;
   *( double*)(( char*) obj+offset)=value;
 }
- static inline  double* RandomRutherfordData_getp__cos_rot_s(RandomRutherfordData restrict  obj){
+ static inline  double* RandomNormalData_getp__rot_x_rad(RandomNormalData restrict  obj){
   int64_t offset=0;
   offset+=48;
   return ( double*)(( char*) obj+offset);
 }
- static inline double RandomRutherfordData_get__shift_x(const RandomRutherfordData restrict  obj){
+ static inline double RandomNormalData_get__rot_y_rad(const RandomNormalData restrict  obj){
   int64_t offset=0;
   offset+=56;
   return *( double*)(( char*) obj+offset);
 }
- static inline void RandomRutherfordData_set__shift_x(RandomRutherfordData restrict  obj, double value){
+ static inline void RandomNormalData_set__rot_y_rad(RandomNormalData restrict  obj, double value){
   int64_t offset=0;
   offset+=56;
   *( double*)(( char*) obj+offset)=value;
 }
- static inline  double* RandomRutherfordData_getp__shift_x(RandomRutherfordData restrict  obj){
+ static inline  double* RandomNormalData_getp__rot_y_rad(RandomNormalData restrict  obj){
   int64_t offset=0;
   offset+=56;
   return ( double*)(( char*) obj+offset);
 }
- static inline double RandomRutherfordData_get__shift_y(const RandomRutherfordData restrict  obj){
+ static inline double RandomNormalData_get__rot_s_rad_no_frame(const RandomNormalData restrict  obj){
   int64_t offset=0;
   offset+=64;
   return *( double*)(( char*) obj+offset);
 }
- static inline void RandomRutherfordData_set__shift_y(RandomRutherfordData restrict  obj, double value){
+ static inline void RandomNormalData_set__rot_s_rad_no_frame(RandomNormalData restrict  obj, double value){
   int64_t offset=0;
   offset+=64;
   *( double*)(( char*) obj+offset)=value;
 }
- static inline  double* RandomRutherfordData_getp__shift_y(RandomRutherfordData restrict  obj){
+ static inline  double* RandomNormalData_getp__rot_s_rad_no_frame(RandomNormalData restrict  obj){
   int64_t offset=0;
   offset+=64;
   return ( double*)(( char*) obj+offset);
 }
- static inline double RandomRutherfordData_get__shift_s(const RandomRutherfordData restrict  obj){
+ static inline double RandomNormalData_get_rot_shift_anchor(const RandomNormalData restrict  obj){
   int64_t offset=0;
   offset+=72;
   return *( double*)(( char*) obj+offset);
 }
- static inline void RandomRutherfordData_set__shift_s(RandomRutherfordData restrict  obj, double value){
-  int64_t offset=0;
-  offset+=72;
-  *( double*)(( char*) obj+offset)=value;
-}
- static inline  double* RandomRutherfordData_getp__shift_s(RandomRutherfordData restrict  obj){
+ static inline void RandomNormalData_set_rot_shift_anchor(RandomNormalData restrict  obj, double value){
   int64_t offset=0;
   offset+=72;
-  return ( double*)(( char*) obj+offset);
-}
- static inline double RandomRutherfordData_get__rot_x_rad(const RandomRutherfordData restrict  obj){
-  int64_t offset=0;
-  offset+=80;
-  return *( double*)(( char*) obj+offset);
-}
- static inline void RandomRutherfordData_set__rot_x_rad(RandomRutherfordData restrict  obj, double value){
-  int64_t offset=0;
-  offset+=80;
-  *( double*)(( char*) obj+offset)=value;
-}
- static inline  double* RandomRutherfordData_getp__rot_x_rad(RandomRutherfordData restrict  obj){
-  int64_t offset=0;
-  offset+=80;
-  return ( double*)(( char*) obj+offset);
-}
- static inline double RandomRutherfordData_get__rot_y_rad(const RandomRutherfordData restrict  obj){
-  int64_t offset=0;
-  offset+=88;
-  return *( double*)(( char*) obj+offset);
-}
- static inline void RandomRutherfordData_set__rot_y_rad(RandomRutherfordData restrict  obj, double value){
-  int64_t offset=0;
-  offset+=88;
-  *( double*)(( char*) obj+offset)=value;
-}
- static inline  double* RandomRutherfordData_getp__rot_y_rad(RandomRutherfordData restrict  obj){
-  int64_t offset=0;
-  offset+=88;
-  return ( double*)(( char*) obj+offset);
-}
- static inline double RandomRutherfordData_get__rot_s_rad_no_frame(const RandomRutherfordData restrict  obj){
-  int64_t offset=0;
-  offset+=96;
-  return *( double*)(( char*) obj+offset);
-}
- static inline void RandomRutherfordData_set__rot_s_rad_no_frame(RandomRutherfordData restrict  obj, double value){
-  int64_t offset=0;
-  offset+=96;
-  *( double*)(( char*) obj+offset)=value;
-}
- static inline  double* RandomRutherfordData_getp__rot_s_rad_no_frame(RandomRutherfordData restrict  obj){
-  int64_t offset=0;
-  offset+=96;
-  return ( double*)(( char*) obj+offset);
-}
- static inline double RandomRutherfordData_get_rot_shift_anchor(const RandomRutherfordData restrict  obj){
-  int64_t offset=0;
-  offset+=104;
-  return *( double*)(( char*) obj+offset);
-}
- static inline void RandomRutherfordData_set_rot_shift_anchor(RandomRutherfordData restrict  obj, double value){
-  int64_t offset=0;
-  offset+=104;
   *( double*)(( char*) obj+offset)=value;
 }
- static inline  double* RandomRutherfordData_getp_rot_shift_anchor(RandomRutherfordData restrict  obj){
+ static inline  double* RandomNormalData_getp_rot_shift_anchor(RandomNormalData restrict  obj){
   int64_t offset=0;
-  offset+=104;
+  offset+=72;
   return ( double*)(( char*) obj+offset);
 }
 #endif
@@ -6179,11 +6138,11 @@ void Drift_single_particle(LocalParticle* part, double length){
 
 #endif // XSTUITE_TRACK_FLAGS_H
 
-#include <random/random_src/rutherford.h>
+#include <random/random_src/normal.h>
 
              
-            void sample_ruth(
-               RandomRutherfordData el,
+            void sample_gauss(
+               RandomNormalData el,
 
                              ParticlesData particles,
     double* samples,  int64_t n_samples_per_seed, 
@@ -6231,7 +6190,7 @@ void Drift_single_particle(LocalParticle* part, double length){
                 if (part_id<part_capacity){
                     Particles_to_LocalParticle(particles, &lpart, part_id, end_id);
                     if (check_is_active(&lpart)>0){
-              RandomRutherford_sample(el, &lpart, samples, n_samples_per_seed);
+              RandomNormal_sample(el, &lpart, samples, n_samples_per_seed);
 
                     }
                     if (check_is_active(&lpart)>0 && flag_increment_at_element){
@@ -6250,156 +6209,156 @@ void Drift_single_particle(LocalParticle* part, double length){
 //            #endif                                                     //only_for_context cpu_openmp
         }
 
-#ifndef XOBJ_TYPEDEF_RandomNormalData
-#define XOBJ_TYPEDEF_RandomNormalData
-typedef   struct RandomNormalData_s * RandomNormalData;
- static inline RandomNormalData RandomNormalData_getp(RandomNormalData restrict  obj){
+#ifndef XOBJ_TYPEDEF_RandomExponentialData
+#define XOBJ_TYPEDEF_RandomExponentialData
+typedef   struct RandomExponentialData_s * RandomExponentialData;
+ static inline RandomExponentialData RandomExponentialData_getp(RandomExponentialData restrict  obj){
   int64_t offset=0;
-  return (RandomNormalData)(( char*) obj+offset);
+  return (RandomExponentialData)(( char*) obj+offset);
 }
- static inline uint8_t RandomNormalData_get__dummy(const RandomNormalData restrict  obj){
+ static inline uint8_t RandomExponentialData_get__dummy(const RandomExponentialData restrict  obj){
   int64_t offset=0;
   return *(( uint8_t*) obj+offset);
 }
- static inline void RandomNormalData_set__dummy(RandomNormalData restrict  obj, uint8_t value){
+ static inline void RandomExponentialData_set__dummy(RandomExponentialData restrict  obj, uint8_t value){
   int64_t offset=0;
   *(( uint8_t*) obj+offset)=value;
 }
- static inline  uint8_t* RandomNormalData_getp__dummy(RandomNormalData restrict  obj){
+ static inline  uint8_t* RandomExponentialData_getp__dummy(RandomExponentialData restrict  obj){
   int64_t offset=0;
   return ( uint8_t*)(( char*) obj+offset);
 }
- static inline double RandomNormalData_get__sin_rot_s(const RandomNormalData restrict  obj){
+ static inline double RandomExponentialData_get__sin_rot_s(const RandomExponentialData restrict  obj){
   int64_t offset=0;
   offset+=8;
   return *( double*)(( char*) obj+offset);
 }
- static inline void RandomNormalData_set__sin_rot_s(RandomNormalData restrict  obj, double value){
+ static inline void RandomExponentialData_set__sin_rot_s(RandomExponentialData restrict  obj, double value){
   int64_t offset=0;
   offset+=8;
   *( double*)(( char*) obj+offset)=value;
 }
- static inline  double* RandomNormalData_getp__sin_rot_s(RandomNormalData restrict  obj){
+ static inline  double* RandomExponentialData_getp__sin_rot_s(RandomExponentialData restrict  obj){
   int64_t offset=0;
   offset+=8;
   return ( double*)(( char*) obj+offset);
 }
- static inline double RandomNormalData_get__cos_rot_s(const RandomNormalData restrict  obj){
+ static inline double RandomExponentialData_get__cos_rot_s(const RandomExponentialData restrict  obj){
   int64_t offset=0;
   offset+=16;
   return *( double*)(( char*) obj+offset);
 }
- static inline void RandomNormalData_set__cos_rot_s(RandomNormalData restrict  obj, double value){
+ static inline void RandomExponentialData_set__cos_rot_s(RandomExponentialData restrict  obj, double value){
   int64_t offset=0;
   offset+=16;
   *( double*)(( char*) obj+offset)=value;
 }
- static inline  double* RandomNormalData_getp__cos_rot_s(RandomNormalData restrict  obj){
+ static inline  double* RandomExponentialData_getp__cos_rot_s(RandomExponentialData restrict  obj){
   int64_t offset=0;
   offset+=16;
   return ( double*)(( char*) obj+offset);
 }
- static inline double RandomNormalData_get__shift_x(const RandomNormalData restrict  obj){
+ static inline double RandomExponentialData_get__shift_x(const RandomExponentialData restrict  obj){
   int64_t offset=0;
   offset+=24;
   return *( double*)(( char*) obj+offset);
 }
- static inline void RandomNormalData_set__shift_x(RandomNormalData restrict  obj, double value){
+ static inline void RandomExponentialData_set__shift_x(RandomExponentialData restrict  obj, double value){
   int64_t offset=0;
   offset+=24;
   *( double*)(( char*) obj+offset)=value;
 }
- static inline  double* RandomNormalData_getp__shift_x(RandomNormalData restrict  obj){
+ static inline  double* RandomExponentialData_getp__shift_x(RandomExponentialData restrict  obj){
   int64_t offset=0;
   offset+=24;
   return ( double*)(( char*) obj+offset);
 }
- static inline double RandomNormalData_get__shift_y(const RandomNormalData restrict  obj){
+ static inline double RandomExponentialData_get__shift_y(const RandomExponentialData restrict  obj){
   int64_t offset=0;
   offset+=32;
   return *( double*)(( char*) obj+offset);
 }
- static inline void RandomNormalData_set__shift_y(RandomNormalData restrict  obj, double value){
+ static inline void RandomExponentialData_set__shift_y(RandomExponentialData restrict  obj, double value){
   int64_t offset=0;
   offset+=32;
   *( double*)(( char*) obj+offset)=value;
 }
- static inline  double* RandomNormalData_getp__shift_y(RandomNormalData restrict  obj){
+ static inline  double* RandomExponentialData_getp__shift_y(RandomExponentialData restrict  obj){
   int64_t offset=0;
   offset+=32;
   return ( double*)(( char*) obj+offset);
 }
- static inline double RandomNormalData_get__shift_s(const RandomNormalData restrict  obj){
+ static inline double RandomExponentialData_get__shift_s(const RandomExponentialData restrict  obj){
   int64_t offset=0;
   offset+=40;
   return *( double*)(( char*) obj+offset);
 }
- static inline void RandomNormalData_set__shift_s(RandomNormalData restrict  obj, double value){
+ static inline void RandomExponentialData_set__shift_s(RandomExponentialData restrict  obj, double value){
   int64_t offset=0;
   offset+=40;
   *( double*)(( char*) obj+offset)=value;
 }
- static inline  double* RandomNormalData_getp__shift_s(RandomNormalData restrict  obj){
+ static inline  double* RandomExponentialData_getp__shift_s(RandomExponentialData restrict  obj){
   int64_t offset=0;
   offset+=40;
   return ( double*)(( char*) obj+offset);
 }
- static inline double RandomNormalData_get__rot_x_rad(const RandomNormalData restrict  obj){
+ static inline double RandomExponentialData_get__rot_x_rad(const RandomExponentialData restrict  obj){
   int64_t offset=0;
   offset+=48;
   return *( double*)(( char*) obj+offset);
 }
- static inline void RandomNormalData_set__rot_x_rad(RandomNormalData restrict  obj, double value){
+ static inline void RandomExponentialData_set__rot_x_rad(RandomExponentialData restrict  obj, double value){
   int64_t offset=0;
   offset+=48;
   *( double*)(( char*) obj+offset)=value;
 }
- static inline  double* RandomNormalData_getp__rot_x_rad(RandomNormalData restrict  obj){
+ static inline  double* RandomExponentialData_getp__rot_x_rad(RandomExponentialData restrict  obj){
   int64_t offset=0;
   offset+=48;
   return ( double*)(( char*) obj+offset);
 }
- static inline double RandomNormalData_get__rot_y_rad(const RandomNormalData restrict  obj){
+ static inline double RandomExponentialData_get__rot_y_rad(const RandomExponentialData restrict  obj){
   int64_t offset=0;
   offset+=56;
   return *( double*)(( char*) obj+offset);
 }
- static inline void RandomNormalData_set__rot_y_rad(RandomNormalData restrict  obj, double value){
+ static inline void RandomExponentialData_set__rot_y_rad(RandomExponentialData restrict  obj, double value){
   int64_t offset=0;
   offset+=56;
   *( double*)(( char*) obj+offset)=value;
 }
- static inline  double* RandomNormalData_getp__rot_y_rad(RandomNormalData restrict  obj){
+ static inline  double* RandomExponentialData_getp__rot_y_rad(RandomExponentialData restrict  obj){
   int64_t offset=0;
   offset+=56;
   return ( double*)(( char*) obj+offset);
 }
- static inline double RandomNormalData_get__rot_s_rad_no_frame(const RandomNormalData restrict  obj){
+ static inline double RandomExponentialData_get__rot_s_rad_no_frame(const RandomExponentialData restrict  obj){
   int64_t offset=0;
   offset+=64;
   return *( double*)(( char*) obj+offset);
 }
- static inline void RandomNormalData_set__rot_s_rad_no_frame(RandomNormalData restrict  obj, double value){
+ static inline void RandomExponentialData_set__rot_s_rad_no_frame(RandomExponentialData restrict  obj, double value){
   int64_t offset=0;
   offset+=64;
   *( double*)(( char*) obj+offset)=value;
 }
- static inline  double* RandomNormalData_getp__rot_s_rad_no_frame(RandomNormalData restrict  obj){
+ static inline  double* RandomExponentialData_getp__rot_s_rad_no_frame(RandomExponentialData restrict  obj){
   int64_t offset=0;
   offset+=64;
   return ( double*)(( char*) obj+offset);
 }
- static inline double RandomNormalData_get_rot_shift_anchor(const RandomNormalData restrict  obj){
+ static inline double RandomExponentialData_get_rot_shift_anchor(const RandomExponentialData restrict  obj){
   int64_t offset=0;
   offset+=72;
   return *( double*)(( char*) obj+offset);
 }
- static inline void RandomNormalData_set_rot_shift_anchor(RandomNormalData restrict  obj, double value){
+ static inline void RandomExponentialData_set_rot_shift_anchor(RandomExponentialData restrict  obj, double value){
   int64_t offset=0;
   offset+=72;
   *( double*)(( char*) obj+offset)=value;
 }
- static inline  double* RandomNormalData_getp_rot_shift_anchor(RandomNormalData restrict  obj){
+ static inline  double* RandomExponentialData_getp_rot_shift_anchor(RandomExponentialData restrict  obj){
   int64_t offset=0;
   offset+=72;
   return ( double*)(( char*) obj+offset);
@@ -6614,11 +6573,11 @@ void Drift_single_particle(LocalParticle* part, double length){
 
 #endif // XSTUITE_TRACK_FLAGS_H
 
-#include <random/random_src/normal.h>
+#include <random/random_src/exponential.h>
 
              
-            void sample_gauss(
-               RandomNormalData el,
+            void sample_exp(
+               RandomExponentialData el,
 
                              ParticlesData particles,
     double* samples,  int64_t n_samples_per_seed, 
@@ -6666,7 +6625,7 @@ void Drift_single_particle(LocalParticle* part, double length){
                 if (part_id<part_capacity){
                     Particles_to_LocalParticle(particles, &lpart, part_id, end_id);
                     if (check_is_active(&lpart)>0){
-              RandomNormal_sample(el, &lpart, samples, n_samples_per_seed);
+              RandomExponential_sample(el, &lpart, samples, n_samples_per_seed);
 
                     }
                     if (check_is_active(&lpart)>0 && flag_increment_at_element){
@@ -6685,159 +6644,219 @@ void Drift_single_particle(LocalParticle* part, double length){
 //            #endif                                                     //only_for_context cpu_openmp
         }
 
-#ifndef XOBJ_TYPEDEF_RandomExponentialData
-#define XOBJ_TYPEDEF_RandomExponentialData
-typedef   struct RandomExponentialData_s * RandomExponentialData;
- static inline RandomExponentialData RandomExponentialData_getp(RandomExponentialData restrict  obj){
+#ifndef XOBJ_TYPEDEF_RandomRutherfordData
+#define XOBJ_TYPEDEF_RandomRutherfordData
+typedef   struct RandomRutherfordData_s * RandomRutherfordData;
+ static inline RandomRutherfordData RandomRutherfordData_getp(RandomRutherfordData restrict  obj){
   int64_t offset=0;
-  return (RandomExponentialData)(( char*) obj+offset);
+  return (RandomRutherfordData)(( char*) obj+offset);
 }
- static inline uint8_t RandomExponentialData_get__dummy(const RandomExponentialData restrict  obj){
+ static inline double RandomRutherfordData_get_lower_val(const RandomRutherfordData restrict  obj){
   int64_t offset=0;
-  return *(( uint8_t*) obj+offset);
+  return *( double*)(( char*) obj+offset);
 }
- static inline void RandomExponentialData_set__dummy(RandomExponentialData restrict  obj, uint8_t value){
+ static inline void RandomRutherfordData_set_lower_val(RandomRutherfordData restrict  obj, double value){
   int64_t offset=0;
-  *(( uint8_t*) obj+offset)=value;
+  *( double*)(( char*) obj+offset)=value;
 }
- static inline  uint8_t* RandomExponentialData_getp__dummy(RandomExponentialData restrict  obj){
+ static inline  double* RandomRutherfordData_getp_lower_val(RandomRutherfordData restrict  obj){
   int64_t offset=0;
-  return ( uint8_t*)(( char*) obj+offset);
+  return ( double*)(( char*) obj+offset);
 }
- static inline double RandomExponentialData_get__sin_rot_s(const RandomExponentialData restrict  obj){
+ static inline double RandomRutherfordData_get_upper_val(const RandomRutherfordData restrict  obj){
   int64_t offset=0;
   offset+=8;
   return *( double*)(( char*) obj+offset);
 }
- static inline void RandomExponentialData_set__sin_rot_s(RandomExponentialData restrict  obj, double value){
+ static inline void RandomRutherfordData_set_upper_val(RandomRutherfordData restrict  obj, double value){
   int64_t offset=0;
   offset+=8;
   *( double*)(( char*) obj+offset)=value;
 }
- static inline  double* RandomExponentialData_getp__sin_rot_s(RandomExponentialData restrict  obj){
+ static inline  double* RandomRutherfordData_getp_upper_val(RandomRutherfordData restrict  obj){
   int64_t offset=0;
   offset+=8;
   return ( double*)(( char*) obj+offset);
 }
- static inline double RandomExponentialData_get__cos_rot_s(const RandomExponentialData restrict  obj){
+ static inline double RandomRutherfordData_get_A(const RandomRutherfordData restrict  obj){
   int64_t offset=0;
   offset+=16;
   return *( double*)(( char*) obj+offset);
 }
- static inline void RandomExponentialData_set__cos_rot_s(RandomExponentialData restrict  obj, double value){
+ static inline void RandomRutherfordData_set_A(RandomRutherfordData restrict  obj, double value){
   int64_t offset=0;
   offset+=16;
   *( double*)(( char*) obj+offset)=value;
 }
- static inline  double* RandomExponentialData_getp__cos_rot_s(RandomExponentialData restrict  obj){
+ static inline  double* RandomRutherfordData_getp_A(RandomRutherfordData restrict  obj){
   int64_t offset=0;
   offset+=16;
   return ( double*)(( char*) obj+offset);
 }
- static inline double RandomExponentialData_get__shift_x(const RandomExponentialData restrict  obj){
+ static inline double RandomRutherfordData_get_B(const RandomRutherfordData restrict  obj){
   int64_t offset=0;
   offset+=24;
   return *( double*)(( char*) obj+offset);
 }
- static inline void RandomExponentialData_set__shift_x(RandomExponentialData restrict  obj, double value){
+ static inline void RandomRutherfordData_set_B(RandomRutherfordData restrict  obj, double value){
   int64_t offset=0;
   offset+=24;
   *( double*)(( char*) obj+offset)=value;
 }
- static inline  double* RandomExponentialData_getp__shift_x(RandomExponentialData restrict  obj){
+ static inline  double* RandomRutherfordData_getp_B(RandomRutherfordData restrict  obj){
   int64_t offset=0;
   offset+=24;
   return ( double*)(( char*) obj+offset);
 }
- static inline double RandomExponentialData_get__shift_y(const RandomExponentialData restrict  obj){
+ static inline int8_t RandomRutherfordData_get_Newton_iterations(const RandomRutherfordData restrict  obj){
   int64_t offset=0;
   offset+=32;
-  return *( double*)(( char*) obj+offset);
+  return *(( int8_t*) obj+offset);
 }
- static inline void RandomExponentialData_set__shift_y(RandomExponentialData restrict  obj, double value){
+ static inline void RandomRutherfordData_set_Newton_iterations(RandomRutherfordData restrict  obj, int8_t value){
   int64_t offset=0;
   offset+=32;
-  *( double*)(( char*) obj+offset)=value;
+  *(( int8_t*) obj+offset)=value;
 }
- static inline  double* RandomExponentialData_getp__shift_y(RandomExponentialData restrict  obj){
+ static inline  int8_t* RandomRutherfordData_getp_Newton_iterations(RandomRutherfordData restrict  obj){
   int64_t offset=0;
   offset+=32;
-  return ( double*)(( char*) obj+offset);
+  return ( int8_t*)(( char*) obj+offset);
 }
- static inline double RandomExponentialData_get__shift_s(const RandomExponentialData restrict  obj){
+ static inline double RandomRutherfordData_get__sin_rot_s(const RandomRutherfordData restrict  obj){
   int64_t offset=0;
   offset+=40;
   return *( double*)(( char*) obj+offset);
 }
- static inline void RandomExponentialData_set__shift_s(RandomExponentialData restrict  obj, double value){
+ static inline void RandomRutherfordData_set__sin_rot_s(RandomRutherfordData restrict  obj, double value){
   int64_t offset=0;
   offset+=40;
   *( double*)(( char*) obj+offset)=value;
 }
- static inline  double* RandomExponentialData_getp__shift_s(RandomExponentialData restrict  obj){
+ static inline  double* RandomRutherfordData_getp__sin_rot_s(RandomRutherfordData restrict  obj){
   int64_t offset=0;
   offset+=40;
   return ( double*)(( char*) obj+offset);
 }
- static inline double RandomExponentialData_get__rot_x_rad(const RandomExponentialData restrict  obj){
+ static inline double RandomRutherfordData_get__cos_rot_s(const RandomRutherfordData restrict  obj){
   int64_t offset=0;
   offset+=48;
   return *( double*)(( char*) obj+offset);
 }
- static inline void RandomExponentialData_set__rot_x_rad(RandomExponentialData restrict  obj, double value){
+ static inline void RandomRutherfordData_set__cos_rot_s(RandomRutherfordData restrict  obj, double value){
   int64_t offset=0;
   offset+=48;
   *( double*)(( char*) obj+offset)=value;
 }
- static inline  double* RandomExponentialData_getp__rot_x_rad(RandomExponentialData restrict  obj){
+ static inline  double* RandomRutherfordData_getp__cos_rot_s(RandomRutherfordData restrict  obj){
   int64_t offset=0;
   offset+=48;
   return ( double*)(( char*) obj+offset);
 }
- static inline double RandomExponentialData_get__rot_y_rad(const RandomExponentialData restrict  obj){
+ static inline double RandomRutherfordData_get__shift_x(const RandomRutherfordData restrict  obj){
   int64_t offset=0;
   offset+=56;
   return *( double*)(( char*) obj+offset);
 }
- static inline void RandomExponentialData_set__rot_y_rad(RandomExponentialData restrict  obj, double value){
+ static inline void RandomRutherfordData_set__shift_x(RandomRutherfordData restrict  obj, double value){
   int64_t offset=0;
   offset+=56;
   *( double*)(( char*) obj+offset)=value;
 }
- static inline  double* RandomExponentialData_getp__rot_y_rad(RandomExponentialData restrict  obj){
+ static inline  double* RandomRutherfordData_getp__shift_x(RandomRutherfordData restrict  obj){
   int64_t offset=0;
   offset+=56;
   return ( double*)(( char*) obj+offset);
 }
- static inline double RandomExponentialData_get__rot_s_rad_no_frame(const RandomExponentialData restrict  obj){
+ static inline double RandomRutherfordData_get__shift_y(const RandomRutherfordData restrict  obj){
   int64_t offset=0;
   offset+=64;
   return *( double*)(( char*) obj+offset);
 }
- static inline void RandomExponentialData_set__rot_s_rad_no_frame(RandomExponentialData restrict  obj, double value){
+ static inline void RandomRutherfordData_set__shift_y(RandomRutherfordData restrict  obj, double value){
   int64_t offset=0;
   offset+=64;
   *( double*)(( char*) obj+offset)=value;
 }
- static inline  double* RandomExponentialData_getp__rot_s_rad_no_frame(RandomExponentialData restrict  obj){
+ static inline  double* RandomRutherfordData_getp__shift_y(RandomRutherfordData restrict  obj){
   int64_t offset=0;
   offset+=64;
   return ( double*)(( char*) obj+offset);
 }
- static inline double RandomExponentialData_get_rot_shift_anchor(const RandomExponentialData restrict  obj){
+ static inline double RandomRutherfordData_get__shift_s(const RandomRutherfordData restrict  obj){
   int64_t offset=0;
   offset+=72;
   return *( double*)(( char*) obj+offset);
 }
- static inline void RandomExponentialData_set_rot_shift_anchor(RandomExponentialData restrict  obj, double value){
+ static inline void RandomRutherfordData_set__shift_s(RandomRutherfordData restrict  obj, double value){
   int64_t offset=0;
   offset+=72;
   *( double*)(( char*) obj+offset)=value;
 }
- static inline  double* RandomExponentialData_getp_rot_shift_anchor(RandomExponentialData restrict  obj){
+ static inline  double* RandomRutherfordData_getp__shift_s(RandomRutherfordData restrict  obj){
   int64_t offset=0;
   offset+=72;
   return ( double*)(( char*) obj+offset);
+}
+ static inline double RandomRutherfordData_get__rot_x_rad(const RandomRutherfordData restrict  obj){
+  int64_t offset=0;
+  offset+=80;
+  return *( double*)(( char*) obj+offset);
+}
+ static inline void RandomRutherfordData_set__rot_x_rad(RandomRutherfordData restrict  obj, double value){
+  int64_t offset=0;
+  offset+=80;
+  *( double*)(( char*) obj+offset)=value;
+}
+ static inline  double* RandomRutherfordData_getp__rot_x_rad(RandomRutherfordData restrict  obj){
+  int64_t offset=0;
+  offset+=80;
+  return ( double*)(( char*) obj+offset);
+}
+ static inline double RandomRutherfordData_get__rot_y_rad(const RandomRutherfordData restrict  obj){
+  int64_t offset=0;
+  offset+=88;
+  return *( double*)(( char*) obj+offset);
+}
+ static inline void RandomRutherfordData_set__rot_y_rad(RandomRutherfordData restrict  obj, double value){
+  int64_t offset=0;
+  offset+=88;
+  *( double*)(( char*) obj+offset)=value;
+}
+ static inline  double* RandomRutherfordData_getp__rot_y_rad(RandomRutherfordData restrict  obj){
+  int64_t offset=0;
+  offset+=88;
+  return ( double*)(( char*) obj+offset);
+}
+ static inline double RandomRutherfordData_get__rot_s_rad_no_frame(const RandomRutherfordData restrict  obj){
+  int64_t offset=0;
+  offset+=96;
+  return *( double*)(( char*) obj+offset);
+}
+ static inline void RandomRutherfordData_set__rot_s_rad_no_frame(RandomRutherfordData restrict  obj, double value){
+  int64_t offset=0;
+  offset+=96;
+  *( double*)(( char*) obj+offset)=value;
+}
+ static inline  double* RandomRutherfordData_getp__rot_s_rad_no_frame(RandomRutherfordData restrict  obj){
+  int64_t offset=0;
+  offset+=96;
+  return ( double*)(( char*) obj+offset);
+}
+ static inline double RandomRutherfordData_get_rot_shift_anchor(const RandomRutherfordData restrict  obj){
+  int64_t offset=0;
+  offset+=104;
+  return *( double*)(( char*) obj+offset);
+}
+ static inline void RandomRutherfordData_set_rot_shift_anchor(RandomRutherfordData restrict  obj, double value){
+  int64_t offset=0;
+  offset+=104;
+  *( double*)(( char*) obj+offset)=value;
+}
+ static inline  double* RandomRutherfordData_getp_rot_shift_anchor(RandomRutherfordData restrict  obj){
+  int64_t offset=0;
+  offset+=104;
+  return ( double*)(( char*) obj+offset);
 }
 #endif
 // copyright ############################### //
@@ -7049,11 +7068,11 @@ void Drift_single_particle(LocalParticle* part, double length){
 
 #endif // XSTUITE_TRACK_FLAGS_H
 
-#include <random/random_src/exponential.h>
+#include <random/random_src/rutherford.h>
 
              
-            void sample_exp(
-               RandomExponentialData el,
+            void sample_ruth(
+               RandomRutherfordData el,
 
                              ParticlesData particles,
     double* samples,  int64_t n_samples_per_seed, 
@@ -7101,7 +7120,7 @@ void Drift_single_particle(LocalParticle* part, double length){
                 if (part_id<part_capacity){
                     Particles_to_LocalParticle(particles, &lpart, part_id, end_id);
                     if (check_is_active(&lpart)>0){
-              RandomExponential_sample(el, &lpart, samples, n_samples_per_seed);
+              RandomRutherford_sample(el, &lpart, samples, n_samples_per_seed);
 
                     }
                     if (check_is_active(&lpart)>0 && flag_increment_at_element){
@@ -7120,25 +7139,6 @@ void Drift_single_particle(LocalParticle* part, double length){
 //            #endif                                                     //only_for_context cpu_openmp
         }
 
-#ifndef XOBJ_TYPEDEF_ElementRefClass
-#define XOBJ_TYPEDEF_ElementRefClass
-typedef   struct ElementRefClass_s * ElementRefClass;
-enum ElementRefClass_e{ElementRefClass_ParticlesMonitorData_t};
- static inline ElementRefClass ElementRefClass_getp(ElementRefClass restrict  obj){
-  int64_t offset=0;
-  return (ElementRefClass)(( char*) obj+offset);
-}
- static inline int64_t ElementRefClass_typeid(const ElementRefClass restrict  obj){
-  int64_t offset=0;
-  offset+=8;
-  return *( int64_t*)(( char*) obj+offset);
-}
- static inline  void* ElementRefClass_member(const ElementRefClass restrict  obj){
-  int64_t offset=0;
-  offset+=*( int64_t*)(( char*) obj+offset);
- return ( void*)(( char*) obj+offset);
-}
-#endif
 #ifndef XOBJ_TYPEDEF_ArrNElementRefClass
 #define XOBJ_TYPEDEF_ArrNElementRefClass
 typedef   struct ArrNElementRefClass_s * ArrNElementRefClass;