xtrack 0.83.2__tar.gz → 0.83.4__tar.gz

{xtrack-0.83.2/xtrack.egg-info → xtrack-0.83.4}/PKG-INFO

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

{xtrack-0.83.2 → xtrack-0.83.4}/tests/test_environment.py

@@ -618,6 +618,7 @@ def test_assemble_ring():
     cell3_select = ring2.select(start='start.cell.3.arc.2', end='end.cell.3.arc.2',
                                 name='cell3_copy')
     assert 'cell3_copy' in env.lines
+    assert cell3_select.particle_ref is not None
     assert env.lines['cell3_copy'] is cell3_select
     assert cell3_select._element_dict is env.element_dict
     assert cell3_select.element_names[0] == 'start.cell.3.arc.2'

{xtrack-0.83.2 → xtrack-0.83.4}/tests/test_match_orbit_bump.py

@@ -643,9 +643,11 @@ def test_match_bump_sets_init_middle(test_context):
                              'hllhc15_thick/lhc_thick_with_knobs.json')
     line.build_tracker(test_context)
 
+    line.insert('mymarker', xt.Marker(), at='mb.c28l8.b1@start')
+
     opt = line.match(
         start='mq.30l8.b1', end='mq.23l8.b1',
-        init_at='mb.b28l8.b1', betx=1, bety=1, y=3e-3, py=0, # <-- conditions at point inside the range
+        init_at='mymarker', betx=1, bety=1, y=3e-3, py=0, # <-- conditions at point inside the range
         vary=xt.VaryList(['acbv30.l8b1', 'acbv28.l8b1', 'acbv26.l8b1', 'acbv24.l8b1'],
                         step=1e-10, limits=[-1e-3, 1e-3]),
         targets = [

xtrack-0.83.4/xtrack/_version.py

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

{xtrack-0.83.2 → xtrack-0.83.4}/xtrack/beam_elements/elements_src/track_magnet_radiation.h

@@ -116,95 +116,99 @@ void magnet_apply_radiation_single_particle(
 
     if ((spin_flag != 0) && (spin_x_0 != 0. || spin_y_0 != 0. || spin_z_0 != 0.)){
 
-        double const kin_px_mean = (old_px + new_ax);
-        double const kin_py_mean = (old_py + new_ay);
-
-        double const kin_pz_mean = sqrt((1 + delta)*(1 + delta) - kin_px_mean * kin_px_mean - kin_py_mean * kin_py_mean);
-
-        double const beta_x = beta * (kin_px_mean / kin_pz_mean);
-        double const beta_y = beta * (kin_py_mean / kin_pz_mean);
-        double const beta_z = sqrt(beta*beta - beta_x * beta_x - beta_y * beta_y);
-
-        double const iv_x = beta_x / beta;
-        double const iv_y = beta_y / beta;
-        double const iv_z = beta_z / beta;
-
-        double B_par_spin = Bx_T * iv_x + By_T * iv_y + Bz_T * iv_z;
-        double const B_par_spin_x = B_par_spin * iv_x;
-        double const B_par_spin_y = B_par_spin * iv_y;
-        double const B_par_spin_z = B_par_spin * iv_z;
-
-        double const B_perp_spin_x = Bx_T - B_par_spin_x;
-        double const B_perp_spin_y = By_T - B_par_spin_y;
-        double const B_perp_spin_z = Bz_T - B_par_spin_z;
-
-        double const brho_part = P_J / (q0 * QELEM);
-
-        double const G_spin = LocalParticle_get_anomalous_magnetic_moment(part);
-
-        double const Omega_BMT_x = -1/brho_part * (
-            (1 + G_spin*gamma) * B_perp_spin_x + (1 + G_spin) * B_par_spin_x);
-        double const Omega_BMT_y = -1/brho_part * (
-            (1 + G_spin*gamma) * B_perp_spin_y + (1 + G_spin) * B_par_spin_y);
-        double const Omega_BMT_z = -1/brho_part * (
-            (1 + G_spin*gamma) * B_perp_spin_z + (1 + G_spin) * B_par_spin_z);
-
-        double Omega_BMT_mod = sqrt(Omega_BMT_x * Omega_BMT_x +
-            Omega_BMT_y * Omega_BMT_y + Omega_BMT_z * Omega_BMT_z);
-
-        if (Omega_BMT_mod > 1e-10){
-
-            double const omega_x = Omega_BMT_x / Omega_BMT_mod;
-            double const omega_y = Omega_BMT_y / Omega_BMT_mod;
-            double const omega_z = Omega_BMT_z / Omega_BMT_mod;
-
-            double const phi = Omega_BMT_mod * l_path;
-
-            double const sin_phi_2 = sin(phi/2);
-            double const cos_phi_2 = cos(phi/2);
-
-            // Quaternion rotation
-            double const t0 = cos_phi_2;
-            double const tx = omega_x * sin_phi_2;
-            double const ty = omega_y * sin_phi_2;
-            double const tz = omega_z * sin_phi_2;
-
-            // Rotation matrix
-            double const M11 = t0 * t0 + tx * tx - ty * ty - tz * tz;
-            double const M12 = 2 * (tx * ty - t0 * tz);
-            double const M13 = 2 * (tx * tz + t0 * ty);
-            double const M21 = 2 * (tx * ty + t0 * tz);
-            double const M22 = t0 * t0 - tx * tx + ty * ty - tz * tz;
-            double const M23 = 2 * (ty * tz - t0 * tx);
-            double const M31 = 2 * (tx * tz - t0 * ty);
-            double const M32 = 2 * (ty * tz + t0 * tx);
-            double const M33 = t0 * t0 - tx * tx - ty * ty + tz * tz;
-
-            double sin_hxl2 = 0.;
-            double cos_hxl2 = 1.;
-            if (hx != 0.){
-                sin_hxl2 = sin(hx * length / 2);
-                cos_hxl2 = cos(hx * length / 2);
+        #ifdef XSUITE_BACKTRACK
+            LocalParticle_set_state(part, -33);
+        #else
+            double const kin_px_mean = (old_px + new_ax);
+            double const kin_py_mean = (old_py + new_ay);
+
+            double const kin_pz_mean = sqrt((1 + delta)*(1 + delta) - kin_px_mean * kin_px_mean - kin_py_mean * kin_py_mean);
+
+            double const beta_x = beta * (kin_px_mean / kin_pz_mean);
+            double const beta_y = beta * (kin_py_mean / kin_pz_mean);
+            double const beta_z = sqrt(beta*beta - beta_x * beta_x - beta_y * beta_y);
+
+            double const iv_x = beta_x / beta;
+            double const iv_y = beta_y / beta;
+            double const iv_z = beta_z / beta;
+
+            double B_par_spin = Bx_T * iv_x + By_T * iv_y + Bz_T * iv_z;
+            double const B_par_spin_x = B_par_spin * iv_x;
+            double const B_par_spin_y = B_par_spin * iv_y;
+            double const B_par_spin_z = B_par_spin * iv_z;
+
+            double const B_perp_spin_x = Bx_T - B_par_spin_x;
+            double const B_perp_spin_y = By_T - B_par_spin_y;
+            double const B_perp_spin_z = Bz_T - B_par_spin_z;
+
+            double const brho_part = P_J / (q0 * QELEM);
+
+            double const G_spin = LocalParticle_get_anomalous_magnetic_moment(part);
+
+            double const Omega_BMT_x = -1/brho_part * (
+                (1 + G_spin*gamma) * B_perp_spin_x + (1 + G_spin) * B_par_spin_x);
+            double const Omega_BMT_y = -1/brho_part * (
+                (1 + G_spin*gamma) * B_perp_spin_y + (1 + G_spin) * B_par_spin_y);
+            double const Omega_BMT_z = -1/brho_part * (
+                (1 + G_spin*gamma) * B_perp_spin_z + (1 + G_spin) * B_par_spin_z);
+
+            double Omega_BMT_mod = sqrt(Omega_BMT_x * Omega_BMT_x +
+                Omega_BMT_y * Omega_BMT_y + Omega_BMT_z * Omega_BMT_z);
+
+            if (Omega_BMT_mod > 1e-10){
+
+                double const omega_x = Omega_BMT_x / Omega_BMT_mod;
+                double const omega_y = Omega_BMT_y / Omega_BMT_mod;
+                double const omega_z = Omega_BMT_z / Omega_BMT_mod;
+
+                double const phi = Omega_BMT_mod * l_path;
+
+                double const sin_phi_2 = sin(phi/2);
+                double const cos_phi_2 = cos(phi/2);
+
+                // Quaternion rotation
+                double const t0 = cos_phi_2;
+                double const tx = omega_x * sin_phi_2;
+                double const ty = omega_y * sin_phi_2;
+                double const tz = omega_z * sin_phi_2;
+
+                // Rotation matrix
+                double const M11 = t0 * t0 + tx * tx - ty * ty - tz * tz;
+                double const M12 = 2 * (tx * ty - t0 * tz);
+                double const M13 = 2 * (tx * tz + t0 * ty);
+                double const M21 = 2 * (tx * ty + t0 * tz);
+                double const M22 = t0 * t0 - tx * tx + ty * ty - tz * tz;
+                double const M23 = 2 * (ty * tz - t0 * tx);
+                double const M31 = 2 * (tx * tz - t0 * ty);
+                double const M32 = 2 * (ty * tz + t0 * tx);
+                double const M33 = t0 * t0 - tx * tx - ty * ty + tz * tz;
+
+                double sin_hxl2 = 0.;
+                double cos_hxl2 = 1.;
+                if (hx != 0.){
+                    sin_hxl2 = sin(hx * length / 2);
+                    cos_hxl2 = cos(hx * length / 2);
+                }
+                // Entry rotation (bend frame)
+                double const spin_x_1 = spin_x_0 * cos_hxl2 + spin_z_0 * sin_hxl2;
+                double const spin_y_1 = spin_y_0;
+                double const spin_z_1 = -spin_x_0 * sin_hxl2 + spin_z_0 * cos_hxl2;
+
+                // BMT rotation
+                double const spin_x_2 = M11 * spin_x_1 + M12 * spin_y_1 + M13 * spin_z_1;
+                double const spin_y_2 = M21 * spin_x_1 + M22 * spin_y_1 + M23 * spin_z_1;
+                double const spin_z_2 = M31 * spin_x_1 + M32 * spin_y_1 + M33 * spin_z_1;
+
+                // Exit rotation (bend frame)
+                double const spin_x_3 = spin_x_2 * cos_hxl2 + spin_z_2 * sin_hxl2;
+                double const spin_y_3 = spin_y_2;
+                double const spin_z_3 = -spin_x_2 * sin_hxl2 + spin_z_2 * cos_hxl2;
+
+                LocalParticle_set_spin_x(part, spin_x_3);
+                LocalParticle_set_spin_y(part, spin_y_3);
+                LocalParticle_set_spin_z(part, spin_z_3);
             }
-            // Entry rotation (bend frame)
-            double const spin_x_1 = spin_x_0 * cos_hxl2 + spin_z_0 * sin_hxl2;
-            double const spin_y_1 = spin_y_0;
-            double const spin_z_1 = -spin_x_0 * sin_hxl2 + spin_z_0 * cos_hxl2;
-
-            // BMT rotation
-            double const spin_x_2 = M11 * spin_x_1 + M12 * spin_y_1 + M13 * spin_z_1;
-            double const spin_y_2 = M21 * spin_x_1 + M22 * spin_y_1 + M23 * spin_z_1;
-            double const spin_z_2 = M31 * spin_x_1 + M32 * spin_y_1 + M33 * spin_z_1;
-
-            // Exit rotation (bend frame)
-            double const spin_x_3 = spin_x_2 * cos_hxl2 + spin_z_2 * sin_hxl2;
-            double const spin_y_3 = spin_y_2;
-            double const spin_z_3 = -spin_x_2 * sin_hxl2 + spin_z_2 * cos_hxl2;
-
-            LocalParticle_set_spin_x(part, spin_x_3);
-            LocalParticle_set_spin_y(part, spin_y_3);
-            LocalParticle_set_spin_z(part, spin_z_3);
-        }
+        #endif
     }
 
     // Synchrotron radiation

{xtrack-0.83.2 → xtrack-0.83.4}/xtrack/line.py

@@ -2248,8 +2248,10 @@ class Line:
     def cut_at_s(self, s: List[float], s_tol=1e-6, return_slices=False):
         """Slice the line so that positions in s never fall inside an element."""
 
-        if self._has_valid_tracker():
-            self.discard_tracker()
+        if not self._has_valid_tracker():
+            self.build_tracker() # To resolve replicase and slices
+
+        self.discard_tracker()
 
         cuts_for_element = self._elements_intersecting_s(s, s_tol=s_tol)
         strategies = [Strategy(None)]  # catch-all, ignore unaffected elements
@@ -3582,6 +3584,7 @@ class Line:
         assert inplace is True, 'Only inplace is supported for now'
 
         self._frozen_check()
+        self.replace_all_repeated_elements()
 
         if keep is None:
             keep = []
@@ -3904,6 +3907,7 @@ class Line:
                                       ' used')
 
         self._frozen_check()
+        self.replace_all_repeated_elements()
 
         if keep is None:
             keep = []
@@ -4182,6 +4186,7 @@ class Line:
         self._env_if_needed()
 
         out = self.env.new_line(components=list(tt.env_name), name=name)
+        out.particle_ref = self.particle_ref.copy() if self.particle_ref else None
 
         if hasattr(self, '_in_multiline') and self._in_multiline is not None:
             out.env._var_management = None

{xtrack-0.83.2 → xtrack-0.83.4}/xtrack/particles/particles.py

@@ -221,7 +221,7 @@ class Particles(xo.HybridClass):
 
         accepted_args = set(self._xofields.keys()) | {
             'energy0', 'tau', 'pzeta', 'mass_ratio', 'mass', 'kinetic_energy0',
-            '_context', '_buffer', '_offset', 'p0',
+            '_context', '_buffer', '_offset', 'p0', 'name',
         }
         if set(kwargs.keys()) - accepted_args:
             raise NameError(f'Invalid argument(s) provided: '
@@ -383,6 +383,8 @@ class Particles(xo.HybridClass):
         if isinstance(self._context, xo.ContextCpu) and not _no_reorganize:
             self.reorganize()
 
+        if 'name' in kwargs.keys():
+            self.name = kwargs['name']
 
     @classmethod
     def from_dict(cls, dct, load_rng_state=True, **kwargs):

{xtrack-0.83.2 → xtrack-0.83.4}/xtrack/tapering.py

@@ -7,7 +7,9 @@ import xtrack as xt
 import xobjects as xo
 
 def compensate_radiation_energy_loss(line, delta0=0, rtol_eneloss=1e-12,
-                                     max_iter=100, verbose=True, **kwargs):
+                                     max_iter=100, verbose=True,
+                                     co_search_at=None,
+                                     **kwargs):
 
     assert isinstance(line._context, xo.ContextCpu), "Only CPU context is supported"
     assert line.particle_ref is not None, "Particle reference is not set"
@@ -24,7 +26,7 @@ def compensate_radiation_energy_loss(line, delta0=0, rtol_eneloss=1e-12,
 
     line.config.XTRACK_MULTIPOLE_NO_SYNRAD = True
     with xt.freeze_longitudinal(line):
-        particle_on_co = line.find_closed_orbit()
+        particle_on_co = line.find_closed_orbit(co_search_at=co_search_at)
     line.config.XTRACK_MULTIPOLE_NO_SYNRAD = False
 
     beta0 = float(particle_on_co._xobject.beta0[0])

{xtrack-0.83.2 → xtrack-0.83.4}/xtrack/twiss.py

@@ -449,6 +449,12 @@ def twiss_line(line, particle_ref=None, method=None,
     else:
         periodic = True
         periodic_mode = init or 'periodic'
+        assert x is None, '`x` not supported for periodic twiss'
+        assert px is None, '`px` not supported for periodic twiss'
+        assert y is None, '`y` not supported for periodic twiss'
+        assert py is None, '`py` not supported for periodic twiss'
+        assert zeta is None, '`zeta` not supported for periodic twiss'
+        assert delta is None, '`delta` not supported for periodic twiss'
 
     if freeze_longitudinal:
         kwargs = _updated_kwargs_from_locals(kwargs, locals().copy())
@@ -631,6 +637,11 @@ def twiss_line(line, particle_ref=None, method=None,
             raise ValueError(f'init={init} not anymore supported')
         assert init == 'periodic' or 'full_periodic'
 
+    if not periodic:
+        if delta0 is not None or zeta0 is not None:
+            raise ValueError(
+                'delta0 and zeta0 cannot be provided for open twiss')
+
     if periodic:
 
         assert not _initial_particles
@@ -747,6 +758,8 @@ def twiss_line(line, particle_ref=None, method=None,
 
     if eneloss_and_damping and not only_orbit:
         assert 'R_matrix' in twiss_res._data
+        if method == '4d':
+            raise ValueError('method="4d" not supported for eneloss_and_damping=True')
         if radiation_method != 'full' or twiss_res._data['R_matrix_ebe'] is None:
             with xt.line._preserve_config(line):
                 line.config.XTRACK_SYNRAD_KICK_SAME_AS_FIRST = False
@@ -2123,6 +2136,14 @@ def _handle_init_inside_range(kwargs):
     reverse = kwargs.pop('reverse')
 
     ele_name_init =  init.element_name
+    ele_init = line.get(ele_name_init)
+    if isinstance(ele_init, xt.Replica):
+        ele_init = ele_init.resolve()
+    if not isinstance(ele_init, xt.Marker):
+        raise ValueError(
+            'The element at the initial position is not a Marker. '
+            'This is not yet supported')
+
     if reverse:
         assert _str_to_index(line, ele_name_init) <= _str_to_index(line, start)
         assert _str_to_index(line, ele_name_init) >= _str_to_index(line, end)

{xtrack-0.83.2 → xtrack-0.83.4}/xtrack/twissplot.py

@@ -223,7 +223,7 @@ class TwissPlot(object):
 
         if self.lattice:
             self.lattice.clear()
-            self._lattice(["k0l", "kn0l", "angle"], "#a0ffa0", "Bend h")
+            self._lattice(["angle_rad"], "#a0ffa0", "Bend h")
             self._lattice(["ks0l"], "#ffa0a0", "Bend v")
             self._lattice(["kn1l", "k1l"], "#a0a0ff", "Quad")
             self._lattice(["hkick"], "#e0a0e0", "Kick h")

{xtrack-0.83.2 → xtrack-0.83.4/xtrack.egg-info}/PKG-INFO

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

xtrack-0.83.2/xtrack/_version.py

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