xtrack 0.57.0__tar.gz → 0.57.1__tar.gz

{xtrack-0.57.0 → xtrack-0.57.1}/PKG-INFO

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

{xtrack-0.57.0 → xtrack-0.57.1}/tests/test_fcc_ee_solenoid_correction.py

@@ -351,7 +351,7 @@ def test_fcc_ee_solenoid_correction():
     assert_allclose = np.testing.assert_allclose
 
     # Check that tilt is present
-    assert_allclose(tw_sol_off['x_prime', 'ip.1'], np.tan(0.015), atol=1e-14, rtol=0)
+    assert_allclose(tw_sol_off['kin_xprime', 'ip.1'], np.tan(0.015), atol=1e-14, rtol=0)
 
     # Check that solenoid introduces coupling
     assert tw_sol_on.c_minus > 1e-4
@@ -361,21 +361,16 @@ def test_fcc_ee_solenoid_correction():
 
     assert_allclose(tw_chk['x', 'ip.1'], 0, atol=1e-8, rtol=0)
     assert_allclose(tw_chk['y', 'ip.1'], 0, atol=1e-10, rtol=0)
-    assert_allclose(tw_chk['x_prime', 'ip.1'], tw_sol_off['x_prime', 'ip.1'],  atol=1e-9, rtol=0)
-    assert_allclose(tw_chk['y_prime', 'ip.1'], 0,  atol=1e-8, rtol=0)
+    assert_allclose(tw_chk['kin_xprime', 'ip.1'], tw_sol_off['kin_xprime', 'ip.1'],  atol=1e-9, rtol=0)
+    assert_allclose(tw_chk['kin_yprime', 'ip.1'], 0,  atol=1e-8, rtol=0)
     assert_allclose(tw_chk['x', 'pqc2re.1'], 0, atol=5e-8, rtol=0)
     assert_allclose(tw_chk['y', 'pqc2re.1'], 0, atol=5e-8, rtol=0)
-    assert_allclose(tw_chk['x_prime', 'pqc2re.1'], 0, atol=1e-8, rtol=0)
-    assert_allclose(tw_chk['y_prime', 'pqc2re.1'], 0, atol=1e-8, rtol=0)
+    assert_allclose(tw_chk['kin_xprime', 'pqc2re.1'], 0, atol=1e-8, rtol=0)
+    assert_allclose(tw_chk['kin_yprime', 'pqc2re.1'], 0, atol=1e-8, rtol=0)
     assert_allclose(tw_chk['x', 'pqc2le.4'], 0, atol=5e-8, rtol=0)
     assert_allclose(tw_chk['y', 'pqc2le.4'], 0, atol=5e-8, rtol=0)
-    assert_allclose(tw_chk['x_prime', 'pqc2le.4'], 0, atol=1e-8, rtol=0)
-    assert_allclose(tw_chk['y_prime', 'pqc2le.4'], 0, atol=1e-8, rtol=0)
-
-    assert tw_chk['ax', 'pqc2le.4'] == 0
-    assert tw_chk['ay', 'pqc2le.4'] == 0
-    assert tw_chk['ax', 'pqc2re.1'] == 0
-    assert tw_chk['ay', 'pqc2re.1'] == 0
+    assert_allclose(tw_chk['kin_xprime', 'pqc2le.4'], 0, atol=1e-8, rtol=0)
+    assert_allclose(tw_chk['kin_yprime', 'pqc2le.4'], 0, atol=1e-8, rtol=0)
 
     assert_allclose(tw_chk['betx', 'ip.1'], tw_sol_off['betx', 'ip.1'], atol=0, rtol=5e-5)
     assert_allclose(tw_chk['bety', 'ip.1'], tw_sol_off['bety', 'ip.1'], atol=0, rtol=5e-5)

{xtrack-0.57.0 → xtrack-0.57.1}/tests/test_radiation.py

@@ -162,6 +162,7 @@ def test_ring_with_radiation(test_context):
     mad.input(f'''
     select, flag=MAKETHIN, SLICE=4, thick=false;
     select, flag=MAKETHIN, pattern=wig, slice=1;
+    select, flag=makethin, class=rfcavity, slice=1;
     MAKETHIN, SEQUENCE=ring, MAKEDIPEDGE=true;
     use, sequence=RING;
     ''')

xtrack-0.57.1/xtrack/_version.py

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

{xtrack-0.57.0 → xtrack-0.57.1}/xtrack/monitors/particles_monitor.py

@@ -176,7 +176,7 @@ per_particle_vars = xt.Particles.per_particle_vars
 for tt, nn in per_particle_vars:
     setattr(ParticlesMonitor, nn, _FieldOfMonitor(name=nn))
 
-for nn in ['pzeta']:
+for nn in ['pzeta', 'kin_px', 'kin_py', 'kin_ps', 'kin_xprime', 'kin_yprime']:
     setattr(ParticlesMonitor, nn, _FieldOfMonitor(name=nn))
 
 

{xtrack-0.57.0 → xtrack-0.57.1}/xtrack/particles/particles.py

@@ -1300,6 +1300,46 @@ class Particles(xo.HybridClass):
             pzeta, mode='readonly',
             container=self)
 
+    @property
+    def kin_px(self):
+        out = self.px - self.ax
+        return self._buffer.context.linked_array_type.from_array(
+            out,
+            mode='readonly',
+            container=self)
+
+    @property
+    def kin_py(self):
+        out = self.py - self.ay
+        return self._buffer.context.linked_array_type.from_array(
+            out,
+            mode='readonly',
+            container=self)
+
+    @property
+    def kin_ps(self):
+        out = np.sqrt((1 + self.delta) ** 2 - self.kin_px ** 2 - self.kin_py ** 2)
+        return self._buffer.context.linked_array_type.from_array(
+            out,
+            mode='readonly',
+            container=self)
+
+    @property
+    def kin_xprime(self):
+        out = self.kin_px / self.kin_ps
+        return self._buffer.context.linked_array_type.from_array(
+            out,
+            mode='readonly',
+            container=self)
+
+    @property
+    def kin_yprime(self):
+        out = self.kin_py / self.kin_ps
+        return self._buffer.context.linked_array_type.from_array(
+            out,
+            mode='readonly',
+            container=self)
+
     def add_to_energy(self, delta_energy):
         """
         Add `delta_energy` to the `energy` of the particles object. `delta`,

{xtrack-0.57.0 → xtrack-0.57.1}/xtrack/prebuilt_kernels/kernel_definitions.py

@@ -62,6 +62,7 @@ ONLY_XTRACK_ELEMENTS = [
     ThickSliceOctupole,
     ThickSliceQuadrupole,
     ThickSliceSextupole,
+    ThickSliceSolenoid,
     ThinSliceBend,
     ThinSliceBendEntry,
     ThinSliceBendExit,

{xtrack-0.57.0 → xtrack-0.57.1}/xtrack/twiss.py

@@ -888,11 +888,11 @@ def _twiss_open(line, init,
     delta_co = np.array(line.record_last_track.delta[0, i_start:i_stop+1].copy())
     ptau_co = np.array(line.record_last_track.ptau[0, i_start:i_stop+1].copy())
     s_co = line.record_last_track.s[0, i_start:i_stop+1].copy()
-    ax_co = line.record_last_track.ax[0, i_start:i_stop+1].copy()
-    ay_co = line.record_last_track.ay[0, i_start:i_stop+1].copy()
-    pz_co = np.sqrt((1 + delta_co)**2 - (px_co - ax_co)**2 - (py_co - ay_co)**2)
-    x_prime_co = (px_co - ax_co) / pz_co
-    y_prime_co = (py_co - ay_co) / pz_co
+    kin_px_co = line.record_last_track.kin_px[0, i_start:i_stop+1].copy()
+    kin_py_co = line.record_last_track.kin_py[0, i_start:i_stop+1].copy()
+    kin_ps_co = line.record_last_track.kin_ps[0, i_start:i_stop+1].copy()
+    kin_xprime_co = line.record_last_track.kin_xprime[0, i_start:i_stop+1].copy()
+    kin_yprime_co = line.record_last_track.kin_yprime[0, i_start:i_stop+1].copy()
 
     Ws = np.zeros(shape=(len(s_co), 6, 6), dtype=np.float64)
     Ws[:, 0, :] = 0.5 * (line.record_last_track.x[1:7, i_start:i_stop+1] - x_co).T / scale_eigen
@@ -934,10 +934,11 @@ def _twiss_open(line, init,
         'delta': delta_co,
         'ptau': ptau_co,
         'W_matrix': Ws,
-        'x_prime': x_prime_co,
-        'y_prime': y_prime_co,
-        'ax': ax_co,
-        'ay': ay_co,
+        'kin_px': kin_px_co,
+        'kin_py': kin_py_co,
+        'kin_ps': kin_ps_co,
+        'kin_xprime': kin_xprime_co,
+        'kin_yprime': kin_yprime_co,
     })
 
     if not only_orbit and compute_lattice_functions:
@@ -2978,6 +2979,12 @@ class TwissTable(Table):
         out.delta = out.delta
         out.ptau = out.ptau
 
+        if 'kin_px' in out:
+            out.kin_px = out.kin_px
+            out.kin_py = -out.kin_py
+            out.kin_xprime = out.kin_xprime
+            out.kin_yprime = -out.kin_yprime
+
         if 'betx' in out:
             # if optics calculation is not skipped
             out.betx = out.betx

{xtrack-0.57.0 → xtrack-0.57.1}/xtrack.egg-info/PKG-INFO

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

xtrack-0.57.0/xtrack/_version.py

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