xtrack 0.82.1__tar.gz → 0.82.2__tar.gz

{xtrack-0.82.1/xtrack.egg-info → xtrack-0.82.2}/PKG-INFO

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

{xtrack-0.82.1 → xtrack-0.82.2}/tests/test_particles_basics.py

@@ -32,23 +32,22 @@ def _check_consistency_energy_variables(particles):
 
     beta = particles.beta0 * particles.rvv
     gamma = 1/np.sqrt(1 - beta**2)
-    pc = particles.mass0 * gamma * beta
+    pc = particles.mass * gamma * beta
 
     # Check consistency of delta with rvv
-    xo.assert_allclose(particles.delta, (pc-particles.p0c)/(particles.p0c),
+    xo.assert_allclose(particles.delta, (pc/particles.mass_ratio - particles.p0c)/(particles.p0c),
                        rtol=1e-14, atol=1e-14)
 
     # Check consistency of ptau with rvv
-    energy = particles.mass0 * gamma
-    xo.assert_allclose(particles.ptau, (energy - particles.energy0)/particles.p0c,
+    energy = particles.mass * gamma
+    xo.assert_allclose(particles.ptau, (energy/particles.mass_ratio - particles.energy0)/particles.p0c,
                        rtol=1e-14, atol=1e-14)
 
     # Check consistency of pzeta
-    energy = particles.mass0 * gamma
-    xo.assert_allclose(particles.pzeta, (energy - particles.energy0)/(particles.beta0 * particles.p0c),
+    energy = particles.mass * gamma
+    xo.assert_allclose(particles.pzeta, (energy/particles.mass_ratio  - particles.energy0)/(particles.beta0 * particles.p0c),
                        rtol=1e-14, atol=1e-14)
 
-
     # Check energy property
     xo.assert_allclose(particles.energy, energy, rtol=1e-14, atol=1e-14)
 
@@ -294,6 +293,25 @@ def test_python_add_to_energy(test_context):
 
     assert np.all(particles.zeta == zeta_before)
 
+    particles = xp.Particles(_context=test_context, mass0=xp.PROTON_MASS_EV,
+                             q0=1, p0c=1.4e9, x=[1e-3, 0], px=[1e-6, -1e-6],
+                             y=[0, 1e-3], py=[2e-6, 0], zeta=[1e-2, 2e-2],
+                             delta=[0, 1e-4], mass_ratio=[0.2, 1.7], charge_ratio=[0.5, 2])
+
+    energy_before = particles.copy(_context=xo.ContextCpu()).energy
+    zeta_before = particles.copy(_context=xo.ContextCpu()).zeta
+
+    particles.add_to_energy(3e6)
+
+    expected_energy = energy_before + 3e6
+    particles.move(_context=xo.ContextCpu())
+    xo.assert_allclose(particles.energy, expected_energy,
+                       atol=1e-14, rtol=1e-14)
+
+    _check_consistency_energy_variables(particles)
+
+    assert np.all(particles.zeta == zeta_before)
+
 
 @for_all_test_contexts
 def test_python_delta_setter(test_context):

xtrack-0.82.2/xtrack/_version.py

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

{xtrack-0.82.1 → xtrack-0.82.2}/xtrack/particles/particles.py

@@ -349,6 +349,14 @@ class Particles(xo.HybridClass):
             mask=input_mask,
         )
 
+        # Init chi and charge ratio
+        self._update_chi_charge_ratio(
+            chi=kwargs.get('chi'),
+            charge_ratio=kwargs.get('charge_ratio'),
+            mass_ratio=kwargs.get('mass_ratio'),
+            mask=input_mask,
+        )
+
         # Init energy deviations
         self._update_energy_deviations(
             delta=kwargs.get('delta'),
@@ -366,14 +374,6 @@ class Particles(xo.HybridClass):
             mask=input_mask,
         )
 
-        # Init chi and charge ratio
-        self._update_chi_charge_ratio(
-            chi=kwargs.get('chi'),
-            charge_ratio=kwargs.get('charge_ratio'),
-            mass_ratio=kwargs.get('mass_ratio'),
-            mask=input_mask,
-        )
-
         self.unhide_first_n_particles()
         if isinstance(self._context, xo.ContextCpu) and not _no_reorganize:
             self.reorganize()
@@ -1394,7 +1394,7 @@ class Particles(xo.HybridClass):
         Add `delta_energy` to the `energy` of the particles object. `delta`,
         'ptau', `rvv` and `rpp` are updated accordingly.
         """
-        self.ptau += delta_energy / self.p0c * self.mass_ratio
+        self.ptau += delta_energy / self.p0c / self.mass_ratio
 
     def set_particle(self, index, set_scalar_vars=False, **kwargs):
         raise NotImplementedError('This functionality has been removed')
@@ -1873,9 +1873,9 @@ class Particles(xo.HybridClass):
                         double const p0c = LocalParticle_get_p0c(part);
                         double const charge_ratio = LocalParticle_get_charge_ratio(part);
                         double const chi = LocalParticle_get_chi(part);
-                        double const mass_ratio = chi / charge_ratio;
-                        
-                        ptau += delta_energy/p0c * mass_ratio;
+                        double const mass_ratio = charge_ratio / chi;
+
+                        ptau += delta_energy/p0c / mass_ratio;
 
                         double const old_rpp = LocalParticle_get_rpp(part);
 
@@ -2083,6 +2083,9 @@ class Particles(xo.HybridClass):
             if _rpp is not None or _rvv is not None:
                 raise ValueError('Setting `delta` and `ptau` by only giving '
                                  '`_rpp` and `_rvv` is not supported.')
+            if any(self.mass_ratio != 1.0):
+                raise ValueError('Need to provide `delta` or `ptau` with '
+                                 'non-default mass ratios.')
             self._delta = 0.0
             delta = self._delta  # Cupy complains if we later assign LinkedArray
 

{xtrack-0.82.1 → xtrack-0.82.2/xtrack.egg-info}/PKG-INFO

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

xtrack-0.82.1/xtrack/_version.py

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