xfields 0.22.0__tar.gz → 0.22.2__tar.gz

{xfields-0.22.0/xfields.egg-info → xfields-0.22.2}/PKG-INFO

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

xfields-0.22.2/xfields/_version.py

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

{xfields-0.22.0 → xfields-0.22.2}/xfields/beam_elements/waketracker/convolution.py

@@ -1,20 +1,11 @@
 import numpy as np
-import xtrack as xt
-import xobjects as xo
-
-try:
-    import cupy
-    cupy_imported = True
-except ImportError:
-    cupy_imported = False
-
 from scipy.constants import e as qe
 
-from typing import Tuple
+import xobjects as xo
 
 
-class _ConvData(xt.BeamElement):
-    '''
+class _ConvData:
+    """
     This class is used to perform the convolution of the wakefields with the
     beam. It is not meant to be used directly by the user, but only by the
     WakeTracker class.
@@ -24,10 +15,10 @@ class _ConvData(xt.BeamElement):
     which was originally developed for PyHEADTAIL by J. Komppula
     (https://indico.cern.ch/event/735184/contributions/3032237/attachments/1668727/2676169/Multibunch_pyheadtail_algorithms.pdf)
     and N. Mounet (https://indico.cern.ch/event/735184/contributions/3032242/attachments/1668613/2676354/20180615_PyHEADTAIL_convolution_algorithm.pdf).
-    '''
+    """
     def __init__(self, component, waketracker=None, _flatten=False, log_moments=None,
-                **kwargs):
-        '''
+                _context=xo.context_default):
+        """
         Parameters:
         -----------
         component: xfields.beam_elements.waketracker.WakeField
@@ -36,13 +27,13 @@ class _ConvData(xt.BeamElement):
             The WakeTracker object that will use this ConvData object
         log_moments: list of str
             List of moments to be logged in the moments_data object
-        '''
-
-        self.xoinitialize(**kwargs)
+        """
 
         # for now we do not support Pyopencl to avoid complications with the
         # rfft and irfft below
-        if type(self.context) == xo.ContextPyopencl:
+        self._context = _context
+
+        if type(self._context) == xo.ContextPyopencl:
             raise NotImplementedError('Pyopencl not implemented yet')
 
         self._flatten = _flatten
@@ -72,24 +63,14 @@ class _ConvData(xt.BeamElement):
                 raise NotImplementedError('Higher order moments not implemented yet')
 
     def my_rfft(self, data, **kwargs):
-        if type(self.context) == xo.ContextCpu:
-            return np.fft.rfft(data, **kwargs)
-        elif type(self.context) == xo.ContextCupy:
-            if cupy_imported:
-                return cupy.fft.rfft(data, **kwargs)
-            else:
-                raise ImportError('Cupy not installed')
+        if type(self._context) in (xo.ContextCpu, xo.ContextCupy):
+            return self._context.nplike_lib.fft.rfft(data, **kwargs)
         else:
             raise NotImplementedError('Waketacker implemented only for CPU and Cupy')
 
     def my_irfft(self, data, **kwargs):
-        if type(self.context) == xo.ContextCpu:
-            return np.fft.irfft(data, **kwargs)
-        elif type(self.context) == xo.ContextCupy:
-            if cupy_imported:
-                return cupy.fft.irfft(data, **kwargs)
-            else:
-                raise ImportError('Cupy not installed')
+        if type(self._context) in (xo.ContextCpu, xo.ContextCupy):
+            return self._context.nplike_lib.fft.irfft(data, **kwargs)
         else:
             raise NotImplementedError('Waketacker implemented only for CPU and Cupy')
 
@@ -119,11 +100,12 @@ class _ConvData(xt.BeamElement):
             assert beta0 is not None
             # here below I had to add float() to beta0 because when using Cupy
             # context particles.beta0[0] turns out to be a 0d array. To be checked
-            self.G_aux = self._arr2ctx(self.component.function_vs_zeta(
-                zeta=self.z_wake, beta0=float(beta0), dzeta=moments_data.dz))
+            self.G_aux = self._context.nparray_to_context_array(
+                self.component.function_vs_zeta(
+                    zeta=self.z_wake, beta0=float(beta0), dzeta=moments_data.dz))
 
             # only positive frequencies because we are using rfft
-            phase_term = self._arr2ctx(np.exp(
+            phase_term = self._context.nparray_to_context_array(np.exp(
                 1j * 2 * np.pi * np.arange(self._M_aux//2 + 1) *
                 ((self._N_S - 1) * self._N_aux + self._N_1) / self._M_aux))
 
@@ -204,7 +186,7 @@ class _ConvData(xt.BeamElement):
         if isinstance(moment_names, str):
             moment_names = [moment_names]
 
-        rho_aux = self.context.nplike_lib.ones(
+        rho_aux = self._context.nplike_lib.ones(
             shape=moments_data['result'].shape, dtype=np.float64)
 
         for nn in moment_names:

{xfields-0.22.0 → xfields-0.22.2}/xfields/fieldmaps/bigaussian_src/bigaussian.h

@@ -39,8 +39,10 @@ void get_transv_field_gauss_round(
   double r2, temp;
 
   r2 = (x-Delta_x)*(x-Delta_x)+(y-Delta_y)*(y-Delta_y);
-  if (r2<1e-20) temp = sqrt(r2)/(2.*PI*EPSILON_0*sigma); //linearised
-  else          temp = (1-exp(-0.5*r2/(sigma*sigma)))/(2.*PI*EPSILON_0*r2);
+  double const inv_sig2 = 1./(sigma*sigma);
+  double const r2_sig2 = r2 * inv_sig2;
+  if (r2_sig2<1e-10) temp = inv_sig2/(4.*PI*EPSILON_0); //linearised
+  else temp = inv_sig2 * (1-exp(-0.5*r2_sig2))/(2.*PI*EPSILON_0*r2_sig2);
 
   (*Ex) = temp * (x-Delta_x);
   (*Ey) = temp * (y-Delta_y);

{xfields-0.22.0 → xfields-0.22.2/xfields.egg-info}/PKG-INFO

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

{xfields-0.22.0 → xfields-0.22.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_from_parameters_no_vdisp.py
-examples/005_ibs/001_growth_rates_from_parameters_with_vdisp.py
-examples/005_ibs/002_growth_rates_from_particles.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_beambeam2d.py
 tests/test_beambeam3d_part1.py
 tests/test_beambeam3d_part2.py

xfields-0.22.0/.gitignore

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

xfields-0.22.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.22.0/examples/000_sphere/.gitignore

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

xfields-0.22.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.22.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()