xtrack 0.48.1__tar.gz → 0.48.2__tar.gz

{xtrack-0.48.1/xtrack.egg-info → xtrack-0.48.2}/PKG-INFO

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

{xtrack-0.48.1 → xtrack-0.48.2}/ducktrack/elements.py

@@ -731,6 +731,8 @@ class LinearTransferMatrix(Element):
         #  both the position and the momentum are scaled,
         #  rather than only the momentum.
         if self.energy_ref_increment != 0:
+            old_px = p.px.copy()
+            old_py = p.py.copy()
             new_energy0 = p.mass0*p.gamma0 + self.energy_ref_increment
             new_p0c = sqrt(new_energy0*new_energy0-p.mass0*p.mass0)
             new_beta0 = new_p0c / new_energy0
@@ -740,9 +742,9 @@ class LinearTransferMatrix(Element):
             p.p0c = new_p0c
 
             p.x *= geo_emit_factor
-            p.px *= geo_emit_factor
+            p.px = old_px * geo_emit_factor
             p.y *= geo_emit_factor
-            p.py *= geo_emit_factor
+            p.py = old_py * geo_emit_factor
 
         if self.damping_rate_x < 0.0 or self.damping_rate_y < 0.0 or self.damping_rate_s < 0.0:
             raise ValueError("Damping rates cannot be negative")

xtrack-0.48.2/xtrack/_version.py

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

{xtrack-0.48.1 → xtrack-0.48.2}/xtrack/beam_elements/elements_src/linesegmentmap.h

@@ -304,6 +304,8 @@ void energy_and_reference_increments(LocalParticle *part0,
         // both the position and the momentum are scaled,
         // rather than only the momentum.
         if (energy_ref_increment != 0){
+            double const old_px = LocalParticle_get_px(part);
+            double const old_py = LocalParticle_get_py(part);
             double const new_energy0 = LocalParticle_get_mass0(part)
                 *LocalParticle_get_gamma0(part) + energy_ref_increment;
             double const new_p0c = sqrt(new_energy0*new_energy0
@@ -312,11 +314,11 @@ void energy_and_reference_increments(LocalParticle *part0,
             double const new_gamma0 = new_energy0 / LocalParticle_get_mass0(part);
             double const geo_emit_factor = sqrt(LocalParticle_get_beta0(part)
                     *LocalParticle_get_gamma0(part)/new_beta0/new_gamma0);
-            LocalParticle_update_p0c(part,new_p0c);
-            LocalParticle_scale_x(part,geo_emit_factor);
-            LocalParticle_scale_px(part,geo_emit_factor);
-            LocalParticle_scale_y(part,geo_emit_factor);
-            LocalParticle_scale_py(part,geo_emit_factor);
+            LocalParticle_update_p0c(part, new_p0c); // updates px, py but not in the smoothed way
+            LocalParticle_set_px(part, old_px * geo_emit_factor);
+            LocalParticle_set_py(part, old_py * geo_emit_factor);
+            LocalParticle_scale_x(part, geo_emit_factor);
+            LocalParticle_scale_y(part, geo_emit_factor);
         }
     //end_per_particle_block
 

{xtrack-0.48.1 → xtrack-0.48.2/xtrack.egg-info}/PKG-INFO

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

xtrack-0.48.1/xtrack/_version.py

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