xfields 0.27.2__tar.gz → 0.27.4__tar.gz

{xfields-0.27.2/xfields.egg-info → xfields-0.27.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xfields
-Version: 0.27.2
+Version: 0.27.4
 Summary: Field Maps and Particle In Cell
 Author: G. Iadarola et al.
 License-Expression: Apache-2.0

xfields-0.27.4/xfields/_version.py

@@ -0,0 +1 @@
+__version__ = "0.27.4"

{xfields-0.27.2 → xfields-0.27.4}/xfields/beam_elements/touschek_src/touschek.h

@@ -41,6 +41,7 @@
 
 #include "xtrack/headers/track.h"
 #include "xtrack/random/random_src/uniform_accurate.h"
+#include "xfields/headers/constants.h"
 #include "xfields/headers/elegant_rng.h"
 
 #include <math.h>
@@ -119,8 +120,8 @@ void bunch2cm(double *p1, double *p2, double *q, double *beta, double *gamma) {
     pp1 = pp1 + POW2(p1[i]);
     pp2 = pp2 + POW2(p2[i]);
   }
-  e1 = sqrt(ELECTRON_MASS_EV * ELECTRON_MASS_EV + pp1);
-  e2 = sqrt(ELECTRON_MASS_EV * ELECTRON_MASS_EV + pp2);
+  e1 = sqrt(MELECTRON_EV * MELECTRON_EV + pp1);
+  e2 = sqrt(MELECTRON_EV * MELECTRON_EV + pp2);
   ee = e1 + e2;
 
   betap1 = 0.0;
@@ -178,7 +179,7 @@ void cm2bunch(double *p1, double *p2, double *q, double *beta, double *gamma) {
     pq = pq + q[i] * q[i];
   }
 
-  e = sqrt(ELECTRON_MASS_EV * ELECTRON_MASS_EV + pq);
+  e = sqrt(MELECTRON_EV * MELECTRON_EV + pq);
 
   betaq = 0.0;
   bb = 0.0;
@@ -460,7 +461,7 @@ void TouschekScatter(TouschekScatteringData el,
         }
 
         if (p1[5] < delta_neg || p2[5] > delta_pos) {
-          beta0 = qabs / sqrt(qabs * qabs + ELECTRON_MASS_EV * ELECTRON_MASS_EV);
+          beta0 = qabs / sqrt(qabs * qabs + MELECTRON_EV * MELECTRON_EV);
           cross = moeller(beta0, theta);
           temp *= cross * beta0 / gamma / gamma;
 

{xfields-0.27.2 → xfields-0.27.4}/xfields/config_tools/electroncloud_config_tools.py

@@ -143,7 +143,7 @@ def config_electronclouds(line, twiss=None, ecloud_info=None, shift_to_closed_or
                 temp_part.zeta = twiss["zeta"][ii]
                 temp_part.px = 0
                 temp_part.py = 0
-                temp_part.ptau = 0 #pzeta has no setter
+                temp_part.pzeta = 0
                 line.elements[ii].track(temp_part)
 
                 ctx_to_np = line._context.nparray_from_context_array

{xfields-0.27.2 → xfields-0.27.4}/xfields/headers/beamstrahlung_spectrum.h

@@ -106,7 +106,7 @@ double beamstrahlung_avg(LocalParticle *part, BeamBeamBiGaussian3DRecordData bea
     const double gamma          = initial_energy / m0; // [1] 
 
     // constants
-    const double r  = pow(QELEM, 2.0)/(4.0* PI * EPSILON_0 * MELECTRON_KG * pow(C_LIGHT, 2.0));      // [m] electron radius
+    const double r  = pow(QELEM, 2.0)/(4.0* PI * EPSILON_0 * MASS_ELECTRON * pow(C_LIGHT, 2.0));      // [m] electron radius
     const double c1 = 2.59 * ( 5.0/ 6.0) * (    r*r) / REDUCED_COMPTON_WAVELENGTH_ELECTRON;          // [m]
     const double c2 =  1.2 * (25.0/36.0) * (r*r*r*r) / REDUCED_COMPTON_WAVELENGTH_ELECTRON * 137.0;  // [m^3]
 

{xfields-0.27.2 → xfields-0.27.4}/xfields/headers/constants.h

@@ -12,16 +12,12 @@
     #define MPROTON_GEV (0.93827208816)
 #endif
 
-#if !defined( MELECTRON_GEV )
-    #define MELECTRON_GEV (0.00051099895000)
-#endif
-
 #if !defined( MELECTRON_EV )
     #define MELECTRON_EV (510998.95)
 #endif
 
-#if !defined( MELECTRON_KG )
-    #define MELECTRON_KG (9.1093837015e-31)
+#if !defined( MELECTRON_GEV )
+    #define MELECTRON_GEV (MELECTRON_EV * 1e-9)
 #endif
 
 #if !defined( HBAR_GEVS )

{xfields-0.27.2 → xfields-0.27.4/xfields.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xfields
-Version: 0.27.2
+Version: 0.27.4
 Summary: Field Maps and Particle In Cell
 Author: G. Iadarola et al.
 License-Expression: Apache-2.0

{xfields-0.27.2 → xfields-0.27.4}/xfields.egg-info/SOURCES.txt

@@ -4,7 +4,6 @@ NOTICE
 README.md
 pyproject.toml
 setup.py
-temp_changes.md
 tests/test_alpha_pi_setter.py
 tests/test_beambeam2d.py
 tests/test_beambeam3d_part1.py

xfields-0.27.2/temp_changes.md

@@ -1,21 +0,0 @@
-Compared refs: `origin/main...origin/fix/repr_fieldmap`.
-
-The branch has `2` commits over `origin/main`, while `origin/main` has `0` commits not in the branch, so the merge should be fast-forwardable from the fetched refs.
-
-**Changes**
-
-- `TriLinearInterpolatedFieldMap` exposes the grid-origin properties `x_min`, `y_min`, and `z_min`.
-
-- `TriLinearInterpolatedFieldMap` representation has coverage for the grid minima, ensuring `x_min`, `y_min`, and `z_min` appear correctly in `repr(...)`.
-
-- Beam-beam dummy lens installation obtains IP positions from `line.get_table()` instead of querying positions through line helper methods.
-
-- Frozen space-charge installation obtains inserted space-charge element positions from `line.get_table()` instead of querying positions through line helper methods.
-
-- Added `tests/test_fieldmaps.py` coverage for `TriLinearInterpolatedFieldMap` minima properties and representation.
-
-**Deprecations**
-
-- No new public xfields deprecations are introduced.
-
-- Internal use of the deprecated xtrack API `Line.get_s_position(...)` was replaced in favour of table-based position lookup through `Line.get_table()`.

xfields-0.27.2/xfields/_version.py

@@ -1 +0,0 @@
-__version__ = "0.27.2"