xfields 0.23.0__tar.gz → 0.23.2__tar.gz

{xfields-0.23.0/xfields.egg-info → xfields-0.23.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xfields
-Version: 0.23.0
+Version: 0.23.2
 Summary: Field Maps and Particle In Cell
 Home-page: https://xsuite.readthedocs.io/
 Download-URL: https://pypi.python.org/pypi/xfields

xfields-0.23.2/xfields/_version.py

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

{xfields-0.23.0 → xfields-0.23.2}/xfields/beam_elements/spacecharge_src/spacechargebigaussian.h

@@ -67,7 +67,7 @@ void SpaceChargeBiGaussian_track_local_particle(
 			const double dy = fabs(y / (n_integ - 1));
 
 			double phi = 0.0;
-			double dphi_integ;
+			double dphi_integ = 0.0;
 			for (int ii=0; ii<n_integ; ii++){
 				double const x_integ = ii*dx;
 				double const y_integ = ii*dy;

{xfields-0.23.0 → xfields-0.23.2}/xfields/beam_elements/temp_slicer.py

@@ -2,6 +2,7 @@ import numpy as np
 from scipy import special
 import xobjects as xo
 import xpart as xp
+import xtrack as xt
 from ..general import _pkg_root
 
 _digitize_kernel = xo.Kernel(
@@ -106,6 +107,13 @@ class TempSlicer(xo.HybridClass):
 
         self.compile_kernels(only_if_needed=False)
 
+    def compile_kernels(self, *args, **kwargs):
+        extra_compile_args = kwargs.pop('extra_compile_args', [])
+        extra_compile_args.append(f'-I{xt.__path__[0]}')
+        kwargs['extra_compile_args'] = extra_compile_args
+
+        return super().compile_kernels(*args, **kwargs)
+
     def rho(self, z):
         """
         Gaussian charge density.

{xfields-0.23.0 → xfields-0.23.2}/xfields/config_tools/electroncloud_config_tools.py

@@ -171,7 +171,9 @@ def full_electroncloud_setup(line=None, ecloud_info=None, filenames=None, contex
                              zeta_max=None, subtract_dipolar_kicks=True, shift_to_closed_orbit=True,
                              steps_r_matrix=None):
 
-    buffer = context.new_buffer()
+    line.build_tracker(compile=False) # To move all elements to the same buffer
+    buffer = line._buffer
+    line.discard_tracker()
     fieldmaps = {
         ecloud_type: get_electroncloud_fieldmap_from_h5(
             filename=filename,

{xfields-0.23.0 → xfields-0.23.2}/xfields/fieldmaps/interpolated.py

@@ -215,7 +215,10 @@ class TriLinearInterpolatedFieldMap(xo.HybridClass):
                  dphi_dy = nelem,
                  dphi_dz = nelem)
 
-        self.compile_kernels(only_if_needed=True)
+        self.compile_kernels(
+            only_if_needed=True,
+            extra_compile_args=[f"-I{xt.__path__[0]}"],
+        )
 
         if isinstance(solver, str):
             self.solver = self.generate_solver(solver, fftplan)
@@ -237,7 +240,6 @@ class TriLinearInterpolatedFieldMap(xo.HybridClass):
     def _assert_updatable(self):
         assert self.updatable, 'This FieldMap is not updatable!'
 
-    #@profile
     def get_values_at_points(self,
             x, y, z,
             return_rho=True,

{xfields-0.23.0 → xfields-0.23.2}/xfields/fieldmaps/tricubicinterpolated.py

@@ -233,6 +233,13 @@ class TriCubicInterpolatedFieldMap(xo.HybridClass):
                 if solver is not None and rho is not None:
                     self.update_phi_from_rho()
 
+    def compile_kernels(self, *args, **kwargs):
+        extra_compile_args = kwargs.pop('extra_compile_args', [])
+        extra_compile_args.append(f'-I{xt.__path__[0]}')
+        kwargs['extra_compile_args'] = extra_compile_args
+
+        return super().compile_kernels(*args, **kwargs)
+
     def _assert_updatable(self):
         assert self.updatable, 'This FieldMap is not updatable!'
 

{xfields-0.23.0 → xfields-0.23.2/xfields.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xfields
-Version: 0.23.0
+Version: 0.23.2
 Summary: Field Maps and Particle In Cell
 Home-page: https://xsuite.readthedocs.io/
 Download-URL: https://pypi.python.org/pypi/xfields

{xfields-0.23.0 → xfields-0.23.2}/xfields.egg-info/SOURCES.txt

@@ -1,77 +1,8 @@
-.gitignore
 LICENSE
 MANIFEST.in
 README.md
-contributors_and_credits.txt
-mktest
 pyproject.toml
-release.sh
-requirements.txt
 setup.py
-update_cprght_statement.py
-examples/000_sphere/.gitignore
-examples/000_sphere/000_sphere_xfields3D.py
-examples/000_sphere/001_sphere_xfields2p5D.py
-examples/001_spacecharge/000_spacecharge_example.py
-examples/001_spacecharge/001_shared_fieldmap.py
-examples/001_spacecharge/002_spacecharge_with_losses.py
-examples/002_beambeam/000_beambeam.py
-examples/002_beambeam/001_beambeam3d.py
-examples/002_beambeam/002_beambeam3d_old_interface.py
-examples/002_beambeam/003_beambeam3d_strongstrong_track.py
-examples/002_beambeam/004_beambeam2d_strongstrong_pyheadtail.py
-examples/002_beambeam/005_beambeam6d_strongstrong_pipeline.py
-examples/002_beambeam/006_beambeam6d_strongstrong_pipeline_MPI2Procs.py
-examples/002_beambeam/007_beambeam3d_beamstrahlung.py
-examples/002_beambeam/008_beambeam6d_collective_beamstrahlung.py
-examples/002_beambeam/009_constant_charge_slicing.py
-examples/002_beambeam/010_beambeam2d_strongstrong_pipeline.py
-examples/002_beambeam/010_beambeam2d_weakstrong.py
-examples/002_beambeam/011a_inspect_kick_vs_zeta_hirata.py
-examples/002_beambeam/011b_lhc_one_bb.py
-examples/002_beambeam/011c_dev_pic.py
-examples/002_beambeam/011d_pic_pipeline.py
-examples/002_beambeam/011e_multiple_kicks_multiple_turns.py
-examples/002_beambeam/011g_pic_pipeline_gpu.py
-examples/003_electronlens/electronlens_interpolated_ideal.py
-examples/004_fadeeva/000_check_fadeeva.py
-examples/005_ibs/000_growth_rates_no_vdisp.py
-examples/005_ibs/001_growth_rates_with_vdisp.py
-examples/005_ibs/002_growth_rates_conventions.py
-examples/005_ibs/003_tracking_with_kicks.py
-examples/005_ibs/004_tracking_with_kicks_tbt_emittances.py
-examples/longitudinal_kick_in_spacecharge/000_gaussian_3d.py
-examples/longitudinal_kick_in_spacecharge/001_dev_spacecharge.py
-examples/longitudinal_kick_in_spacecharge/002_sps_ion.py
-examples/longitudinal_kick_in_spacecharge/003_sps_ion_with_builtin_z_kick.py
-examples/longitudinal_kick_in_spacecharge/004_qgaussian_derivative.py
-examples/longitudinal_kick_in_spacecharge/sps_ion_2021.json
-examples/slicer/000_dev.py
-examples/slicer/001_slicer_operations.py
-examples/slicer/002a_example_slicer.py
-examples/slicer/002b_example_slicer_gpu.py
-examples/slicer/003_multilog.py
-examples/slicer/004_log_moments.py
-examples/slicer/005a_moment_profile.py
-examples/slicer/005b_moment_profile_gpu.py
-examples/slicer/005c_moment_profile_from_wake.py
-examples/slicer/005d_moment_profile_from_wake_gpu.py
-test_data/HLLHC_wake.dat
-test_data/pyecloud_pinch/README.md
-test_data/pyecloud_pinch/eclouds.json
-test_data/pyecloud_pinch/refined_Pinch_MTI1.0_MLI1.0_DTO2.0_DLO1.0.h5
-test_data/pyecloud_pinch/Pinch_creation/.gitignore
-test_data/pyecloud_pinch/Pinch_creation/000_buildup.py
-test_data/pyecloud_pinch/Pinch_creation/001_pinch.py
-test_data/pyecloud_pinch/Pinch_creation/beam.beam
-test_data/pyecloud_pinch/Pinch_creation/filemanager.py
-test_data/pyecloud_pinch/Pinch_creation/machine_parameters.input
-test_data/pyecloud_pinch/Pinch_creation/secondary_emission_parameters.input
-test_data/pyecloud_pinch/Pinch_creation/simulation_parameters.input
-test_data/test_beamstrahlung/README.txt
-test_data/test_beamstrahlung/test_beamstrahlung_guineapig_ttbar2_beamstrahlung_photon_hist.txt
-tests/ibs_conftest.py
-tests/pytest_onebyone.sh
 tests/test_alpha_pi_setter.py
 tests/test_beambeam2d.py
 tests/test_beambeam3d_part1.py

xfields-0.23.0/.gitignore

@@ -1,13 +0,0 @@
-*.DS_Store
-*.swp
-*.so
-*.pyc
-.project
-.pydevproject
-*.png
-norepository_*
-*~
-build
-CyFPPS.cpp
-*.egg-info
-.idea/**

xfields-0.23.0/contributors_and_credits.txt

@@ -1,16 +0,0 @@
-The following people contributed to the development of this package:
-
-CERN contributors:
- - H. Bartosik
- - X. Buffat
- - R. De Maria
- - L. Giacomel
- - G. Iadarola
- - P. Kicsiny
- - S. Lopaciuk
- - K. Paraschou
- - M. Schwinzerl
- - F. Soubelet
- - E. Waagaard
-
-The Particle In Cell implementation is largely based on the PyPIC package (https://github.com/pycomplete/pypic)

xfields-0.23.0/examples/000_sphere/.gitignore

@@ -1 +0,0 @@
-picsphere.pkl

xfields-0.23.0/examples/000_sphere/000_sphere_xfields3D.py

@@ -1,167 +0,0 @@
-# copyright ################################# #
-# This file is part of the Xfields Package.   #
-# Copyright (c) CERN, 2021.                   #
-# ########################################### #
-
-import time
-
-import numpy as np
-from numpy.random import rand
-from scipy.constants import epsilon_0
-from numpy import pi
-
-from xobjects import ContextCpu, ContextCupy, ContextPyopencl
-from xfields import TriLinearInterpolatedFieldMap
-
-context = ContextCpu()
-context = ContextCupy(default_block_size=256)
-#context = ContextPyopencl()
-
-print(repr(context))
-
-import matplotlib.pyplot as plt
-plt.close('all')
-
-center_xyz = np.array([0.1, 0.2, -0.3])
-radius = .5
-n_part_cube = 10000000
-
-x_cube = radius*(2. * rand(n_part_cube) - 1.) + center_xyz[0]
-y_cube = radius*(2. * rand(n_part_cube) - 1.) + center_xyz[1]
-z_cube = radius*(2. * rand(n_part_cube) - 1.) + center_xyz[2]
-
-mask_sphere = ((x_cube - center_xyz[0])**2
-             + (y_cube - center_xyz[1])**2
-             + (z_cube - center_xyz[2])**2) < radius**2
-x = x_cube[mask_sphere]
-y = y_cube[mask_sphere]
-z = z_cube[mask_sphere]
-pweights = 1. + 0*x
-
-
-# PIC
-x_lim = (-1.1, 1.)
-y_lim = (-1.2, 1.)
-z_lim = (-1.3, 1.)
-
-nx = 128
-ny = 128
-nz = 200
-
-theta_test = 70. * np.pi/360
-phi_test = 300 * np.pi/360.
-r_test = 2.5*radius*np.linspace(-1, 1., 1000)
-
-x0_test = r_test * np.sin(theta_test) * np.cos(phi_test)
-y0_test = r_test * np.sin(theta_test) * np.sin(phi_test)
-z0_test = r_test * np.cos(theta_test)
-
-x_test = center_xyz[0] + x0_test
-y_test = center_xyz[1] + y0_test
-z_test = center_xyz[2] + z0_test
-
-# Moving particles and test coordinates to GPU (if needed)
-np2platf = context.nparray_to_context_array
-x_dev = np2platf(x)
-y_dev = np2platf(y)
-z_dev = np2platf(z)
-pweights_dev = np2platf(pweights)
-x_test_dev = np2platf(x_test)
-y_test_dev = np2platf(y_test)
-z_test_dev = np2platf(z_test)
-
-###############
-# Actual test #
-###############
-
-# Build fieldmap object
-fmap = TriLinearInterpolatedFieldMap(
-        _context=context,
-        x_range=x_lim, nx=nx,
-        y_range=y_lim, ny=ny,
-        z_range=z_lim, nz=nz,
-        solver='FFTSolver3D')
-
-
-# Compute potential
-n_rep = 4
-for _ in range(n_rep):
-    t1 = time.time()
-    fmap.update_from_particles(x_p=x_dev, y_p=y_dev, z_p=z_dev,
-            ncharges_p=pweights_dev, q0_coulomb=1.)
-
-    # Check on the x axis
-    (rho_test_dev, phi_test_dev, dx_test_dev, dy_test_dev,
-            dz_test_dev) = fmap.get_values_at_points(
-                x=x_test_dev, y=y_test_dev, z=z_test_dev)
-    context.synchronize()
-    t2 = time.time()
-    print(f'Time: {t2-t1:.2e}')
-
-# Copy back for plotting
-platf2np = context.nparray_from_context_array
-rho_test =  platf2np(rho_test_dev)
-phi_test = platf2np(phi_test_dev)
-dx_test = platf2np(dx_test_dev)
-dy_test = platf2np(dy_test_dev)
-dz_test = platf2np(dz_test_dev)
-
-# pickle for other tests
-import pickle
-# with open('picsphere.pkl', 'wb') as fid:
-#     pickle.dump({
-#         'fmap': fmap,
-#         'x_test': x_test,
-#         'y_test': y_test,
-#         'z_test': z_test,
-#         }, fid)
-
-####################
-# Plots and checks #
-####################
-
-ex_test = -dx_test
-ey_test = -dy_test
-ez_test = -dz_test
-
-plt.figure(100)
-plt.plot(r_test, rho_test)
-plt.axhline(y=len(x)/(4/3*np.pi*radius**3))
-
-plt.figure(101)
-plt.plot(r_test, phi_test)
-
-e_ref = len(x)/(4*pi*epsilon_0) * (
-        r_test/radius**3*(np.abs(r_test)<radius)
-      + np.sign(r_test)/r_test**2*(np.abs(r_test)>=radius))
-plt.figure(102)
-plt.plot(r_test, ex_test*x0_test/r_test
-        + ey_test*y0_test/r_test + ez_test*z0_test/r_test)
-plt.plot(r_test, e_ref)
-plt.grid(True)
-
-# Check integral
-int_rho = np.sum(platf2np(fmap.rho))*fmap.dx*fmap.dy*fmap.dz
-assert np.isclose(int_rho, len(x))
-
-
-fig1 = plt.figure(1)
-ax1 = fig1.add_subplot(111)
-ax1.pcolormesh(fmap.x_grid, fmap.y_grid,
-        np.sum(platf2np(fmap.rho), axis=2).T, shading='gouraud')
-ax1.set_aspect('equal')
-ax1.add_patch(plt.Circle((center_xyz[0], center_xyz[1]), radius,
-                         color='w', fill=False))
-ax1.set_xlabel('x')
-ax1.set_ylabel('y')
-
-fig2 = plt.figure(2)
-ax2 = fig2.add_subplot(111)
-ax2.pcolormesh(fmap.y_grid, fmap.z_grid,
-        np.sum(platf2np(fmap.rho), axis=0).T, shading='gouraud')
-ax2.set_aspect('equal')
-ax2.add_patch(plt.Circle((center_xyz[1], center_xyz[2]), radius,
-                         color='w', fill=False))
-ax2.set_xlabel('y')
-ax2.set_ylabel('z')
-plt.show()

xfields-0.23.0/examples/000_sphere/001_sphere_xfields2p5D.py

@@ -1,170 +0,0 @@
-# copyright ################################# #
-# This file is part of the Xfields Package.   #
-# Copyright (c) CERN, 2021.                   #
-# ########################################### #
-
-import time
-
-import numpy as np
-from numpy.random import rand
-from scipy.constants import epsilon_0
-from numpy import pi
-
-from xobjects import ContextCpu, ContextCupy, ContextPyopencl
-from xfields import TriLinearInterpolatedFieldMap
-
-context = ContextCpu()
-#context = ContextCupy(default_block_size=256)
-#context = ContextPyopencl()
-
-print(repr(context))
-
-import matplotlib.pyplot as plt
-plt.close('all')
-
-center_xyz = np.array([0.1, 0.2, -0.3])
-radius = .5
-n_part_cube = 10000000
-
-x_cube = radius*(2. * rand(n_part_cube) - 1.) + center_xyz[0]
-y_cube = radius*(2. * rand(n_part_cube) - 1.) + center_xyz[1]
-z_cube = radius*(2. * rand(n_part_cube) - 1.) + center_xyz[2]
-
-mask_sphere = ((x_cube - center_xyz[0])**2
-             + (y_cube - center_xyz[1])**2
-             + (z_cube - center_xyz[2])**2) < radius**2
-x = x_cube[mask_sphere]
-y = y_cube[mask_sphere]
-z = z_cube[mask_sphere]
-pweights = 1. + 0*x
-
-
-# PIC
-x_lim = (-1.1, 1.)
-y_lim = (-1.2, 1.)
-z_lim = (-1.3, 1.)
-
-nx = 256
-ny = 256
-nz = 50
-
-theta_test = 70. * np.pi/360
-r_test = 2.5*radius*np.linspace(-1, 1., 1000)
-z_test = 0.4
-
-x0_test = r_test * np.cos(theta_test)
-y0_test = r_test * np.sin(theta_test)
-z0_test = z_test + 0*r_test
-
-x_test = center_xyz[0] + x0_test
-y_test = center_xyz[1] + y0_test
-z_test = center_xyz[2] + z0_test
-
-# Moving particles and test coordinates to GPU (if needed)
-np2platf = context.nparray_to_context_array
-x_dev = np2platf(x)
-y_dev = np2platf(y)
-z_dev = np2platf(z)
-pweights_dev = np2platf(pweights)
-x_test_dev = np2platf(x_test)
-y_test_dev = np2platf(y_test)
-z_test_dev = np2platf(z_test)
-
-###############
-# Actual test #
-###############
-
-# Build fieldmap object
-fmap = TriLinearInterpolatedFieldMap(
-    _context=context,
-    x_range=x_lim, nx=nx,
-    y_range=y_lim, ny=ny, z_range=z_lim, nz=nz,
-    solver='FFTSolver2p5D')
-
-
-# Compute potential
-n_rep = 10
-for _ in range(n_rep):
-    t1 = time.time()
-    fmap.update_from_particles(x_p=x_dev, y_p=y_dev, z_p=z_dev,
-            ncharges_p=pweights_dev, q0_coulomb=1.)
-
-    # Check on the x axis
-    (rho_test_dev, phi_test_dev, dx_test_dev, dy_test_dev,
-            dz_test_dev) = fmap.get_values_at_points(
-                x=x_test_dev, y=y_test_dev, z=z_test_dev)
-    context.synchronize()
-    t2 = time.time()
-    print(f'Time: {t2-t1:.2e}')
-
-# Copy back for plotting
-platf2np = context.nparray_from_context_array
-rho_test =  platf2np(rho_test_dev)
-phi_test = platf2np(phi_test_dev)
-dx_test = platf2np(dx_test_dev)
-dy_test = platf2np(dy_test_dev)
-dz_test = platf2np(dz_test_dev)
-
-# pickle for other tests
-import pickle
-# with open('picsphere.pkl', 'wb') as fid:
-#     pickle.dump({
-#         'fmap': fmap,
-#         'x_test': x_test,
-#         'y_test': y_test,
-#         'z_test': z_test,
-#         }, fid)
-
-####################
-# Plots and checks #
-####################
-
-ex_test = -dx_test
-ey_test = -dy_test
-ez_test = -dz_test
-
-plt.figure(100)
-plt.plot(r_test, rho_test)
-plt.axhline(y=len(x)/(4/3*np.pi*radius**3))
-
-plt.figure(101)
-plt.plot(r_test, phi_test)
-
-assert z0_test[0]<radius
-r_loc = np.sqrt(radius**2 - z0_test[0]**2)
-rho_ref = len(x)/(4/3*pi*radius**3)
-lam_loc = rho_ref*pi*r_loc**2
-e_ref = rho_ref/(epsilon_0) * (
-        r_test/2*(np.abs(r_test)<r_loc)
-      + r_loc**2/r_test/2*(np.abs(r_test)>=r_loc))
-plt.figure(102)
-plt.plot(r_test, ex_test*x0_test/r_test
-        + ey_test*y0_test/r_test)
-plt.plot(r_test, e_ref)
-plt.grid(True)
-
-# Check integral
-int_rho = np.sum(platf2np(fmap.rho))*fmap.dx*fmap.dy*fmap.dz
-assert np.isclose(int_rho, len(x))
-
-
-fig1 = plt.figure(1)
-ax1 = fig1.add_subplot(111)
-ax1.pcolormesh(fmap.x_grid, fmap.y_grid,
-        np.sum(platf2np(fmap.rho), axis=2).T, shading='gouraud')
-ax1.set_aspect('equal')
-ax1.add_patch(plt.Circle((center_xyz[0], center_xyz[1]), radius,
-                         color='w', fill=False))
-ax1.set_xlabel('x')
-ax1.set_ylabel('y')
-
-fig2 = plt.figure(2)
-ax2 = fig2.add_subplot(111)
-ax2.pcolormesh(fmap.y_grid, fmap.z_grid,
-        np.sum(platf2np(fmap.rho), axis=0).T, shading='gouraud')
-ax2.set_aspect('equal')
-ax2.add_patch(plt.Circle((center_xyz[1], center_xyz[2]), radius,
-                         color='w', fill=False))
-ax2.set_xlabel('y')
-ax2.set_ylabel('z')
-plt.show()