xtrack 0.89.2__tar.gz → 0.89.3__tar.gz

{xtrack-0.89.2/xtrack.egg-info → xtrack-0.89.3}/PKG-INFO

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

{xtrack-0.89.2 → xtrack-0.89.3}/tests/test_load.py

@@ -6,6 +6,7 @@ import pytest
 import xtrack as xt
 import json
 import textwrap
+import gzip
 
 
 @pytest.fixture
@@ -125,6 +126,28 @@ def test_load_http(input_fixture, format, suffix, with_format, tmpdir, request,
     quad = loaded_entity['quad']
     assert quad.length == 1.0 and quad.k1 == 0.5
 
+@pytest.mark.parametrize(
+    'input_fixture,format,suffix', [
+        ('json_line', 'json', 'json'),
+        ('json_environment', 'json', 'json'),
+    ]
+)
+@pytest.mark.parametrize('with_format', [True, False])
+def test_load_http_gz(input_fixture, format, suffix, with_format, tmpdir, request, requests_mock):
+    input_data = request.getfixturevalue(input_fixture)
+    compressed_data=gzip.compress(input_data.encode("utf-8"))
+
+    url = f'http://example.com/test_input.{suffix}.gz'
+    requests_mock.get(url, content=compressed_data)
+
+    kwargs = {'file': url}
+    if with_format:
+        kwargs['format'] = format
+    loaded_entity = xt.load(**kwargs)
+
+    quad = loaded_entity['quad']
+    assert quad.length == 1.0 and quad.k1 == 0.5
+
 
 def test_load_single_element():
     string = json.dumps({

xtrack-0.89.3/xtrack/_version.py

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

{xtrack-0.89.2 → xtrack-0.89.3}/xtrack/beam_elements/elements.py

@@ -140,13 +140,13 @@ class _HasModelRF:
     """
 
     @property
-    def rf_model(self):
-        return _INDEX_TO_MODEL_RF[self._rf_model]
+    def model(self):
+        return _INDEX_TO_MODEL_RF[self._model]
 
-    @rf_model.setter
-    def rf_model(self, value):
+    @model.setter
+    def model(self, value):
         try:
-            self._rf_model = _MODEL_TO_INDEX_RF[value]
+            self._model = _MODEL_TO_INDEX_RF[value]
         except KeyError:
             raise ValueError(f'Invalid RF model: {value}')
 

{xtrack-0.89.2 → xtrack-0.89.3}/xtrack/beam_elements/elements_src/dipoleedge.h

@@ -34,10 +34,10 @@ void DipoleEdge_track_local_particle(DipoleEdgeData el, LocalParticle* part0){
             r43 = r43 * (1 + delta_taper);
         }
 
-        #ifdef XSUITE_BACKTRACK
+        if (LocalParticle_check_track_flag(part0, XS_FLAG_BACKTRACK)){
             r21 = -r21;
             r43 = -r43;
-        #endif
+        }
 
         START_PER_PARTICLE_BLOCK(part0, part);
             if (LocalParticle_check_track_flag(part0, XS_FLAG_SR_TAPER)){
@@ -52,12 +52,12 @@ void DipoleEdge_track_local_particle(DipoleEdgeData el, LocalParticle* part0){
     }
     else if (model == 1){
 
-        #ifdef XSUITE_BACKTRACK
+        if (LocalParticle_check_track_flag(part0, XS_FLAG_BACKTRACK)){
             START_PER_PARTICLE_BLOCK(part0, part);
                 LocalParticle_kill_particle(part, -32);
             END_PER_PARTICLE_BLOCK;
             return;
-        #else
+        }
 
         double const e1 = DipoleEdgeData_get_e1(el);
         double const fint = DipoleEdgeData_get_fint(el);
@@ -69,7 +69,6 @@ void DipoleEdge_track_local_particle(DipoleEdgeData el, LocalParticle* part0){
             DipoleEdgeNonLinear_single_particle(part, k, e1, fint, hgap, side);
         END_PER_PARTICLE_BLOCK;
 
-        #endif
     }
 
 }

{xtrack-0.89.2 → xtrack-0.89.3}/xtrack/beam_elements/elements_src/drift.h

@@ -14,9 +14,9 @@ GPUFUN
 void Drift_track_local_particle(DriftData el, LocalParticle* part0){
 
     double length = DriftData_get_length(el);
-    #ifdef XSUITE_BACKTRACK
+    if (LocalParticle_check_track_flag(part0, XS_FLAG_BACKTRACK)) {
         length = -length;
-    #endif
+    }
 
     START_PER_PARTICLE_BLOCK(part0, part);
         Drift_single_particle(part, length);

{xtrack-0.89.2 → xtrack-0.89.3}/xtrack/beam_elements/elements_src/drift_exact.h

@@ -14,9 +14,9 @@ GPUFUN
 void DriftExact_track_local_particle(DriftExactData el, LocalParticle* part0){
 
     double length = DriftExactData_get_length(el);
-    #ifdef XSUITE_BACKTRACK
+    if (LocalParticle_check_track_flag(part0, XS_FLAG_BACKTRACK)) {
         length = -length;
-    #endif
+    }
 
     START_PER_PARTICLE_BLOCK(part0, part);
         Drift_single_particle_exact(part, length);

{xtrack-0.89.2 → xtrack-0.89.3}/xtrack/beam_elements/elements_src/drift_exact_slice.h

@@ -18,11 +18,12 @@ void DriftExactSlice_track_local_particle(
 
     double weight = DriftExactSliceData_get_weight(el);
 
-    #ifndef XSUITE_BACKTRACK
-        double const length = weight * DriftExactSliceData_get__parent_length(el); // m
-    #else
-        double const length = -weight * DriftExactSliceData_get__parent_length(el); // m
-    #endif
+    double length;
+    if (LocalParticle_check_track_flag(part0, XS_FLAG_BACKTRACK)) {
+        length = -weight * DriftExactSliceData_get__parent_length(el); // m
+    } else {
+        length = weight * DriftExactSliceData_get__parent_length(el); // m
+    }
 
     START_PER_PARTICLE_BLOCK(part0, part);
         Drift_single_particle_exact(part, length);

{xtrack-0.89.2 → xtrack-0.89.3}/xtrack/beam_elements/elements_src/drift_slice.h

@@ -17,12 +17,12 @@ void DriftSlice_track_local_particle(
 ) {
 
     double weight = DriftSliceData_get_weight(el);
-
-    #ifndef XSUITE_BACKTRACK
-        double const length = weight * DriftSliceData_get__parent_length(el); // m
-    #else
-        double const length = -weight * DriftSliceData_get__parent_length(el); // m
-    #endif
+    double length;
+    if (LocalParticle_check_track_flag(part0, XS_FLAG_BACKTRACK)) {
+        length = -weight * DriftSliceData_get__parent_length(el); // m
+    } else {
+        length = weight * DriftSliceData_get__parent_length(el); // m
+    }
 
     START_PER_PARTICLE_BLOCK(part0, part);
         Drift_single_particle(part, length);

{xtrack-0.89.2 → xtrack-0.89.3}/xtrack/beam_elements/elements_src/drift_slice_bend.h

@@ -21,12 +21,13 @@
     ) {
 
         double weight = DriftSliceBendData_get_weight(el);
-
-        #ifndef XSUITE_BACKTRACK
-            double const length = weight * DriftSliceBendData_get__parent_length(el); // m
-        #else
-            double const length = -weight * DriftSliceBendData_get__parent_length(el); // m
-        #endif
+        double length;
+        if (LocalParticle_check_track_flag(part0, XS_FLAG_BACKTRACK)) {
+            length = -weight * DriftSliceBendData_get__parent_length(el); // m
+        }
+        else {
+            length = weight * DriftSliceBendData_get__parent_length(el); // m
+        }
 
         START_PER_PARTICLE_BLOCK(part0, part);
             Drift_single_particle(part, length);

{xtrack-0.89.2 → xtrack-0.89.3}/xtrack/beam_elements/elements_src/drift_slice_cavity.h

@@ -21,12 +21,13 @@
     ) {
 
         double weight = DriftSliceCavityData_get_weight(el);
-
-        #ifndef XSUITE_BACKTRACK
-            double const length = weight * DriftSliceCavityData_get__parent_length(el); // m
-        #else
-            double const length = -weight * DriftSliceCavityData_get__parent_length(el); // m
-        #endif
+        double length;
+        if (LocalParticle_check_track_flag(part0, XS_FLAG_BACKTRACK)) {
+            length = -weight * DriftSliceCavityData_get__parent_length(el); // m
+        }
+        else {
+            length = weight * DriftSliceCavityData_get__parent_length(el); // m
+        }
 
         START_PER_PARTICLE_BLOCK(part0, part);
             Drift_single_particle(part, length);

{xtrack-0.89.2 → xtrack-0.89.3}/xtrack/beam_elements/elements_src/drift_slice_crab_cavity.h

@@ -21,12 +21,13 @@
     ) {
 
         double weight = DriftSliceCrabCavityData_get_weight(el);
-
-        #ifndef XSUITE_BACKTRACK
-            double const length = weight * DriftSliceCrabCavityData_get__parent_length(el); // m
-        #else
-            double const length = -weight * DriftSliceCrabCavityData_get__parent_length(el); // m
-        #endif
+        double length;
+        if (LocalParticle_check_track_flag(part0, XS_FLAG_BACKTRACK)) {
+            length = -weight * DriftSliceCrabCavityData_get__parent_length(el); // m
+        }
+        else {
+            length = weight * DriftSliceCrabCavityData_get__parent_length(el); // m
+        }
 
         START_PER_PARTICLE_BLOCK(part0, part);
             Drift_single_particle(part, length);

{xtrack-0.89.2 → xtrack-0.89.3}/xtrack/beam_elements/elements_src/drift_slice_multipole.h

@@ -21,12 +21,13 @@
     ) {
 
         double weight = DriftSliceMultipoleData_get_weight(el);
-
-        #ifndef XSUITE_BACKTRACK
-            double const length = weight * DriftSliceMultipoleData_get__parent_length(el); // m
-        #else
-            double const length = -weight * DriftSliceMultipoleData_get__parent_length(el); // m
-        #endif
+        double length;
+        if (LocalParticle_check_track_flag(part0, XS_FLAG_BACKTRACK)) {
+            length = -weight * DriftSliceMultipoleData_get__parent_length(el); // m
+        }
+        else {
+            length = weight * DriftSliceMultipoleData_get__parent_length(el); // m
+        }
 
         START_PER_PARTICLE_BLOCK(part0, part);
             Drift_single_particle(part, length);

{xtrack-0.89.2 → xtrack-0.89.3}/xtrack/beam_elements/elements_src/drift_slice_octupole.h

@@ -21,12 +21,13 @@
     ) {
 
         double weight = DriftSliceOctupoleData_get_weight(el);
-
-        #ifndef XSUITE_BACKTRACK
-            double const length = weight * DriftSliceOctupoleData_get__parent_length(el); // m
-        #else
-            double const length = -weight * DriftSliceOctupoleData_get__parent_length(el); // m
-        #endif
+        double length;
+        if (LocalParticle_check_track_flag(part0, XS_FLAG_BACKTRACK)) {
+            length = -weight * DriftSliceOctupoleData_get__parent_length(el); // m
+        }
+        else {
+            length = weight * DriftSliceOctupoleData_get__parent_length(el); // m
+        }
 
         START_PER_PARTICLE_BLOCK(part0, part);
             Drift_single_particle(part, length);

{xtrack-0.89.2 → xtrack-0.89.3}/xtrack/beam_elements/elements_src/drift_slice_quadrupole.h

@@ -21,12 +21,13 @@
     ) {
 
         double weight = DriftSliceQuadrupoleData_get_weight(el);
-
-        #ifndef XSUITE_BACKTRACK
-            double const length = weight * DriftSliceQuadrupoleData_get__parent_length(el); // m
-        #else
-            double const length = -weight * DriftSliceQuadrupoleData_get__parent_length(el); // m
-        #endif
+        double length;
+        if (LocalParticle_check_track_flag(part0, XS_FLAG_BACKTRACK)) {
+            length = -weight * DriftSliceQuadrupoleData_get__parent_length(el); // m
+        }
+        else {
+            length = weight * DriftSliceQuadrupoleData_get__parent_length(el); // m
+        }
 
         START_PER_PARTICLE_BLOCK(part0, part);
             Drift_single_particle(part, length);

{xtrack-0.89.2 → xtrack-0.89.3}/xtrack/beam_elements/elements_src/drift_slice_rbend.h

@@ -21,12 +21,13 @@
     ) {
 
         double weight = DriftSliceRBendData_get_weight(el);
-
-        #ifndef XSUITE_BACKTRACK
-            double const length = weight * DriftSliceRBendData_get__parent_length(el); // m
-        #else
-            double const length = -weight * DriftSliceRBendData_get__parent_length(el); // m
-        #endif
+        double length;
+        if (LocalParticle_check_track_flag(part0, XS_FLAG_BACKTRACK)) {
+            length = -weight * DriftSliceRBendData_get__parent_length(el); // m
+        }
+        else {
+            length = weight * DriftSliceRBendData_get__parent_length(el); // m
+        }
 
         START_PER_PARTICLE_BLOCK(part0, part);
             Drift_single_particle(part, length);

{xtrack-0.89.2 → xtrack-0.89.3}/xtrack/beam_elements/elements_src/drift_slice_sextupole.h

@@ -21,12 +21,13 @@
     ) {
 
         double weight = DriftSliceSextupoleData_get_weight(el);
-
-        #ifndef XSUITE_BACKTRACK
-            double const length = weight * DriftSliceSextupoleData_get__parent_length(el); // m
-        #else
-            double const length = -weight * DriftSliceSextupoleData_get__parent_length(el); // m
-        #endif
+        double length;
+        if (LocalParticle_check_track_flag(part0, XS_FLAG_BACKTRACK)) {
+            length = -weight * DriftSliceSextupoleData_get__parent_length(el); // m
+        }
+        else {
+            length = weight * DriftSliceSextupoleData_get__parent_length(el); // m
+        }
 
         START_PER_PARTICLE_BLOCK(part0, part);
             Drift_single_particle(part, length);

{xtrack-0.89.2 → xtrack-0.89.3}/xtrack/beam_elements/elements_src/drift_slice_uniform_solenoid.h

@@ -21,12 +21,13 @@
     ) {
 
         double weight = DriftSliceUniformSolenoidData_get_weight(el);
-
-        #ifndef XSUITE_BACKTRACK
-            double const length = weight * DriftSliceUniformSolenoidData_get__parent_length(el); // m
-        #else
-            double const length = -weight * DriftSliceUniformSolenoidData_get__parent_length(el); // m
-        #endif
+        double length;
+        if (LocalParticle_check_track_flag(part0, XS_FLAG_BACKTRACK)) {
+            length = -weight * DriftSliceUniformSolenoidData_get__parent_length(el); // m
+        }
+        else {
+            length = weight * DriftSliceUniformSolenoidData_get__parent_length(el); // m
+        }
 
         START_PER_PARTICLE_BLOCK(part0, part);
             Drift_single_particle(part, length);

{xtrack-0.89.2 → xtrack-0.89.3}/xtrack/beam_elements/elements_src/elens.h

@@ -13,9 +13,9 @@ void Elens_track_local_particle(ElensData el, LocalParticle* part0){
 
     double elens_length = ElensData_get_elens_length(el);
 
-    #ifdef XSUITE_BACKTRACK
+    if (LocalParticle_check_track_flag(part0, XS_FLAG_BACKTRACK)) {
         elens_length = -elens_length;
-    #endif
+    }
 
     double const inner_radius = ElensData_get_inner_radius(el);
     double const outer_radius = ElensData_get_outer_radius(el);

{xtrack-0.89.2 → xtrack-0.89.3}/xtrack/beam_elements/elements_src/exciter.h

@@ -25,11 +25,12 @@ void Exciter_track_local_particle(ExciterData el, LocalParticle* part0){
     double const frev = ExciterData_get_frev(el);
     int64_t const start_turn = ExciterData_get_start_turn(el);
 
-    #ifdef XSUITE_BACKTRACK
-        #define XTRACK_EXCITER_SIGN (-1)
-    #else
-        #define XTRACK_EXCITER_SIGN (+1)
-    #endif
+    double excit_sign;
+    if (LocalParticle_check_track_flag(part0, XS_FLAG_BACKTRACK)) {
+        excit_sign = -1;
+    } else {
+        excit_sign = 1;
+    }
 
     START_PER_PARTICLE_BLOCK(part0, part);
         // zeta is the absolute path length deviation from the reference particle: zeta = (s - beta0*c*t)
@@ -60,8 +61,8 @@ void Exciter_track_local_particle(ExciterData el, LocalParticle* part0){
                     factorial *= kk;
                 }
 
-                dpx += XTRACK_EXCITER_SIGN * (knl[kk] * zre - ksl[kk] * zim) / factorial;
-                dpy += XTRACK_EXCITER_SIGN * (knl[kk] * zim + ksl[kk] * zre) / factorial;
+                dpx += excit_sign * (knl[kk] * zre - ksl[kk] * zim) / factorial;
+                dpy += excit_sign * (knl[kk] * zim + ksl[kk] * zre) / factorial;
 
                 double const zret = zre * x - zim * y;
                 zim = zim * x + zre * y;

{xtrack-0.89.2 → xtrack-0.89.3}/xtrack/beam_elements/elements_src/legacy_solenoid.h

@@ -24,10 +24,10 @@ void Solenoid_track_local_particle(SolenoidData el, LocalParticle* part0) {
     int64_t radiation_flag = SolenoidData_get_radiation_flag(el);
     double factor_knl_ksl = 1;
 
-    #ifdef XSUITE_BACKTRACK
+    if (LocalParticle_check_track_flag(part0, XS_FLAG_BACKTRACK)) {
         length = -length;
         factor_knl_ksl = -1;
-    #endif
+    }
 
     #ifndef XTRACK_SOLENOID_NO_SYNRAD
         double dp_record_entry = 0.;

{xtrack-0.89.2 → xtrack-0.89.3}/xtrack/beam_elements/elements_src/magnet_edge.h

@@ -27,11 +27,12 @@ void MagnetEdge_track_local_particle(MagnetEdgeData el, LocalParticle* part0)
     const double face_angle_feed_down = MagnetEdgeData_get_face_angle_feed_down(el);
     const double fringe_integral = MagnetEdgeData_get_fringe_integral(el);
 
-    #ifdef XSUITE_BACKTRACK
-    const double factor_for_backtrack = -1;
-    #else
-    const double factor_for_backtrack = 1;
-    #endif
+    double factor_for_backtrack;
+    if (LocalParticle_check_track_flag(part0, XS_FLAG_BACKTRACK)) {
+        factor_for_backtrack = -1;
+    } else {
+        factor_for_backtrack = 1;
+    }
 
     track_magnet_edge_particles(
         part0,

{xtrack-0.89.2 → xtrack-0.89.3}/xtrack/beam_elements/elements_src/misalignment.h

@@ -24,10 +24,6 @@ void Misalignment_track_local_particle(MisalignmentData el, LocalParticle* part0
     const double tilt = MisalignmentData_get_tilt(el);
     const double is_exit = MisalignmentData_get_is_exit(el);
 
-    #ifdef XSUITE_BACKTRACK
-        voltage = -voltage;
-    #endif
-
     if (!is_exit) {
         if (NONZERO(angle)) {
             track_misalignment_entry_curved(part0, dx, dy, ds, theta, phi, psi, anchor, length, angle, tilt);

{xtrack-0.89.2 → xtrack-0.89.3}/xtrack/beam_elements/elements_src/referenceenergyincrease.h

@@ -15,9 +15,9 @@ void ReferenceEnergyIncrease_track_local_particle(ReferenceEnergyIncreaseData el
 
     double Delta_p0c = ReferenceEnergyIncreaseData_get_Delta_p0c(el);
 
-    #ifdef XSUITE_BACKTRACK
+    if (LocalParticle_check_track_flag(part0, XS_FLAG_BACKTRACK)) {
         Delta_p0c = -Delta_p0c;
-    #endif
+    }
 
     START_PER_PARTICLE_BLOCK(part0, part);
         LocalParticle_update_p0c(part, LocalParticle_get_p0c(part) + Delta_p0c);

{xtrack-0.89.2 → xtrack-0.89.3}/xtrack/beam_elements/elements_src/simplethinbend.h

@@ -17,11 +17,11 @@ void SimpleThinBend_track_local_particle(SimpleThinBendData el, LocalParticle* p
         double hxl = SimpleThinBendData_get_hxl(el);
         double length = SimpleThinBendData_get_length(el); // m
 
-        #ifdef XSUITE_BACKTRACK
+        if (LocalParticle_check_track_flag(part0, XS_FLAG_BACKTRACK)) {
             knl0 = -knl0;
             hxl = -hxl;
             length = -length;
-        #endif
+        }
 
         START_PER_PARTICLE_BLOCK(part0, part);
             double const chi = LocalParticle_get_chi(part);

{xtrack-0.89.2 → xtrack-0.89.3}/xtrack/beam_elements/elements_src/simplethinquadrupole.h

@@ -14,9 +14,9 @@ void SimpleThinQuadrupole_track_local_particle(SimpleThinQuadrupoleData el, Loca
 
     double knl1 = SimpleThinQuadrupoleData_get_knl(el, 1);
 
-    #ifdef XSUITE_BACKTRACK
+    if (LocalParticle_check_track_flag(part0, XS_FLAG_BACKTRACK)) {
         knl1 = -knl1;
-    #endif
+    }
 
     START_PER_PARTICLE_BLOCK(part0, part);
         double const x = LocalParticle_get_x(part);

{xtrack-0.89.2 → xtrack-0.89.3}/xtrack/beam_elements/elements_src/srotation.h

@@ -16,9 +16,9 @@ void SRotation_track_local_particle(SRotationData el, LocalParticle* part0){
     double sin_z = SRotationData_get_sin_z(el);
     double cos_z = SRotationData_get_cos_z(el);
 
-    #ifdef XSUITE_BACKTRACK
+    if (LocalParticle_check_track_flag(part0, XS_FLAG_BACKTRACK)) {
         sin_z = -sin_z;
-    #endif
+    }
 
     START_PER_PARTICLE_BLOCK(part0, part);
         SRotation_single_particle(part, sin_z, cos_z);

{xtrack-0.89.2 → xtrack-0.89.3}/xtrack/beam_elements/elements_src/track_legacy_solenoid_radiation.h

@@ -115,9 +115,9 @@ void legacy_solenoid_apply_radiation_single_particle(
 
     if ((spin_flag != 0) && (spin_x_0 != 0. || spin_y_0 != 0. || spin_z_0 != 0.)){
 
-        #ifdef XSUITE_BACKTRACK
+        if (LocalParticle_check_track_flag(part, XS_FLAG_BACKTRACK)) {
             LocalParticle_set_state(part, -33);
-        #else
+        } else {
             double const Bz_T = ks * brho0;
 
             double const kin_px_mean = (old_px + new_ax);
@@ -209,7 +209,7 @@ void legacy_solenoid_apply_radiation_single_particle(
                 LocalParticle_set_spin_y(part, spin_y_3);
                 LocalParticle_set_spin_z(part, spin_z_3);
             }
-        #endif
+        }
     }
 
     // Synchrotron radiation

{xtrack-0.89.2 → xtrack-0.89.3}/xtrack/beam_elements/elements_src/track_magnet.h

@@ -368,13 +368,15 @@ void track_magnet_particles(
         edge_exit_angle_fdown += rbend_half_angle;
     }
 
+    double core_length, core_length_curved,factor_knl_ksl_body,
+           factor_knl_ksl_edge,factor_backtrack_edge;
     // Backtracking
-    #ifdef XSUITE_BACKTRACK
-        const double core_length = -length * weight;
-        const double core_length_curved = -length_curved * weight;
-        double factor_knl_ksl_body = -factor_knl_ksl * weight;
-        double factor_knl_ksl_edge = factor_knl_ksl; // Edge has a specific factor for backtracking
-        const double factor_backtrack_edge = -1.;
+    if (LocalParticle_check_track_flag(part0, XS_FLAG_BACKTRACK)) {
+        core_length = -length * weight;
+        core_length_curved = -length_curved * weight;
+        factor_knl_ksl_body = -factor_knl_ksl * weight;
+        factor_knl_ksl_edge = factor_knl_ksl; // Edge has a specific factor for backtracking
+        factor_backtrack_edge = -1.;
         hxl = -hxl;
         VSWAP(edge_entry_active, edge_exit_active);
         VSWAP(edge_entry_model, edge_exit_model);
@@ -384,14 +386,14 @@ void track_magnet_particles(
         VSWAP(edge_entry_hgap, edge_exit_hgap);
         rbend_half_angle = -rbend_half_angle;
         sin_rbha = -sin_rbha;
-
-    #else
-        const double core_length = length * weight;
-        const double core_length_curved = length_curved * weight;
-        double factor_knl_ksl_body = factor_knl_ksl * weight;
-        double factor_knl_ksl_edge = factor_knl_ksl;
-        const double factor_backtrack_edge = 1.;
-    #endif
+    }
+    else {
+        core_length = length * weight;
+        core_length_curved = length_curved * weight;
+        factor_knl_ksl_body = factor_knl_ksl * weight;
+        factor_knl_ksl_edge = factor_knl_ksl;
+        factor_backtrack_edge = 1.;
+    }
 
     #ifndef XTRACK_MULTIPOLE_NO_SYNRAD
         if (radiation_flag == 10){ // from parent

{xtrack-0.89.2 → xtrack-0.89.3}/xtrack/beam_elements/elements_src/track_magnet.template.h

@@ -287,13 +287,15 @@ void track_magnet_particles(
         edge_exit_angle_fdown += rbend_half_angle;
     }
 
+    double core_length, core_length_curved,factor_knl_ksl_body,
+           factor_knl_ksl_edge,factor_backtrack_edge;
     // Backtracking
-    #ifdef XSUITE_BACKTRACK
-        const double core_length = -length * weight;
-        const double core_length_curved = -length_curved * weight;
-        double factor_knl_ksl_body = -factor_knl_ksl * weight;
-        double factor_knl_ksl_edge = factor_knl_ksl; // Edge has a specific factor for backtracking
-        const double factor_backtrack_edge = -1.;
+    if (LocalParticle_check_track_flag(part0, XS_FLAG_BACKTRACK)) {
+        core_length = -length * weight;
+        core_length_curved = -length_curved * weight;
+        factor_knl_ksl_body = -factor_knl_ksl * weight;
+        factor_knl_ksl_edge = factor_knl_ksl; // Edge has a specific factor for backtracking
+        factor_backtrack_edge = -1.;
         hxl = -hxl;
         VSWAP(edge_entry_active, edge_exit_active);
         VSWAP(edge_entry_model, edge_exit_model);
@@ -303,14 +305,14 @@ void track_magnet_particles(
         VSWAP(edge_entry_hgap, edge_exit_hgap);
         rbend_half_angle = -rbend_half_angle;
         sin_rbha = -sin_rbha;
-
-    #else
-        const double core_length = length * weight;
-        const double core_length_curved = length_curved * weight;
-        double factor_knl_ksl_body = factor_knl_ksl * weight;
-        double factor_knl_ksl_edge = factor_knl_ksl;
-        const double factor_backtrack_edge = 1.;
-    #endif
+    }
+    else {
+        core_length = length * weight;
+        core_length_curved = length_curved * weight;
+        factor_knl_ksl_body = factor_knl_ksl * weight;
+        factor_knl_ksl_edge = factor_knl_ksl;
+        factor_backtrack_edge = 1.;
+    }
 
     #ifndef XTRACK_MULTIPOLE_NO_SYNRAD
         if (radiation_flag == 10){ // from parent

{xtrack-0.89.2 → xtrack-0.89.3}/xtrack/beam_elements/elements_src/track_magnet_radiation.h

@@ -110,9 +110,9 @@ void magnet_spin(
 
     if (spin_x_0 != 0. || spin_y_0 != 0. || spin_z_0 != 0.){
 
-        #ifdef XSUITE_BACKTRACK
+        if (LocalParticle_check_track_flag(part, XS_FLAG_BACKTRACK)) {
             LocalParticle_set_state(part, -33);
-        #else
+        } else {
 
             double const ptau = LocalParticle_get_ptau(part);
             double const delta = LocalParticle_get_delta(part);
@@ -220,7 +220,7 @@ void magnet_spin(
                 LocalParticle_set_spin_y(part, spin_y_3);
                 LocalParticle_set_spin_z(part, spin_z_3);
             }
-        #endif
+        }
     }
 }