Merge pull request #12 from PyCOMPLETE/python3_master

Python 3 migration of PyPIC v2.4.4

Author: giadarol

000_test_round_chamber.py

@@ -7,7 +7,7 @@
 try:
     from CyFPPS import PyFPPS as PIC_FPPS
 except ImportError:
-    print "Not possible to import PyFPPS, replaced with FFT_Open"
+    print("Not possible to import PyFPPS, replaced with FFT_Open")
     PIC_FPPS = None
 from PyPIC.MultiGrid import AddInternalGrid
 
@@ -83,7 +83,7 @@
 Ex_FFTSq, Ey_FFTSq = picFFTSq.gather(x_probes, y_probes)
 if PIC_FPPS: Ex_FPPS,Ey_FPPS = picFPPS.gather(x_probes,y_probes)
 Ex_dualgrid, Ey_dualgrid = pic_dualgrid.gather(x_probes, y_probes)
-E_r_th = map(lambda x: -np.sum(x_part**2+y_part**2<x**2)*qe/eps0/(2*np.pi*x), x_probes)
+E_r_th = [-np.sum(x_part**2+y_part**2<x**2)*qe/eps0/(2*np.pi*x) for x in x_probes]
 
 
 import pylab as pl

003_Xmas_tree.py

@@ -11,7 +11,7 @@
 try:
     from CyFPPS import PyFPPS as PIC_FPPS
 except ImportError:
-    print "Not possible to import PyFPPS, replaced with FFT_Open"
+    print("Not possible to import PyFPPS, replaced with FFT_Open")
     PIC_FPPS = None
 
 na = np.array
@@ -142,7 +142,7 @@
     E = np.zeros_like(X)
     for i in range(np.shape(X)[0]):
         Ex_FPPS,Ey_FPPS = picFPPS.gather(X[i,:],Y[i,:])
-        print(np.shape(Ex_FPPS))
+        print((np.shape(Ex_FPPS)))
         E[i,:] = Ex_FPPS**2+Ey_FPPS**2
     pl.figure(303)
     pl.pcolor(X,Y,E)

004_test_gaussian.py

@@ -47,7 +47,7 @@
 #~ Ex_FDSW, Ey_FDSW = picFDSW.gather(x_probes, y_probes)
 Ex_FFT, Ey_FFT = picFFT.gather(x_probes, y_probes)
 
-E_r_th = map(lambda x: np.sum(rho_mat[:][XX[:]**2+YY[:]**2<x**2])/eps0/(2*np.pi*x)*Dh*Dh, x_probes)
+E_r_th = [np.sum(rho_mat[:][XX[:]**2+YY[:]**2<x**2])/eps0/(2*np.pi*x)*Dh*Dh for x in x_probes]
 
 
 import pylab as pl

005_testfftw.py

@@ -76,13 +76,13 @@
 
 
 t_start_npfft = time.mktime(time.localtime())
-for _ in xrange(N_rep):
+for _ in range(N_rep):
     transf = np.fft.fft2(data)
     itransf = np.real(np.fft.ifft2(transf*data))
 
 t_stop_npfft = time.mktime(time.localtime())
 t_npfft = t_stop_npfft-t_start_npfft
-print 't_npfft', t_npfft
+print('t_npfft', t_npfft)
 
 
 
@@ -93,11 +93,11 @@
 ifftobj = pyfftw.builders.ifft2(temptransf)
 
 t_start_npfftw = time.mktime(time.localtime())
-for _ in xrange(N_rep):
+for _ in range(N_rep):
     transfw = fftobj(data)
     itransfw = ifftobj(transfw)
 t_stop_npfftw = time.mktime(time.localtime())
 t_npfftw = t_stop_npfftw-t_start_npfftw
-print 't_npfftw', t_npfftw
+print('t_npfftw', t_npfftw)
 
 

006_time_solve.py

@@ -74,26 +74,26 @@
 
 import time
 t_start_sw = time.mktime(time.localtime())
-for _ in xrange(N_rep):
+for _ in range(N_rep):
     picFDSW.solve()
 t_stop_sw = time.mktime(time.localtime())
 t_sw = t_stop_sw-t_start_sw
-print 't_sw', t_sw
+print('t_sw', t_sw)
 
 
 t_start_fftpec = time.mktime(time.localtime())
-for _ in xrange(N_rep):
+for _ in range(N_rep):
     picFFTPEC.solve()
 t_stop_fftpec = time.mktime(time.localtime())
 t_fftpec = t_stop_fftpec-t_start_fftpec
-print 't_fftpec', t_fftpec
+print('t_fftpec', t_fftpec)
 
 
 t_start_fftopen = time.mktime(time.localtime())
-for _ in xrange(N_rep):
+for _ in range(N_rep):
     picFFT.solve()
 t_stop_fftopen = time.mktime(time.localtime())
 t_fftopen = t_stop_fftopen-t_start_fftopen
-print 't_fftopen', t_fftopen
+print('t_fftopen', t_fftopen)
 
 

007_test_separately.py

@@ -45,7 +45,7 @@
 #pic gather
 Ex_FFT, Ey_FFT = picFFT.gather(x_probes, y_probes)
 
-E_r_th = map(lambda x: -np.sum(x_part**2+y_part**2<x**2)*qe/eps0/(2*np.pi*x), x_probes)
+E_r_th = [-np.sum(x_part**2+y_part**2<x**2)*qe/eps0/(2*np.pi*x) for x in x_probes]
 
 
 import pylab as pl
@@ -79,8 +79,8 @@
 pl.figure(100)
 pl.semilogy(np.abs(fftphi.flatten()))
 
-print 'type(fftphi[0,0])', type(fftphi[0,0])
-print 'type(self.fgreentr[0,0])',type(self.fgreentr[0,0])
+print('type(fftphi[0,0])', type(fftphi[0,0]))
+print('type(self.fgreentr[0,0])',type(self.fgreentr[0,0]))
 tmpphi = np.fft.ifft2(fftphi)
 pl.figure(101)
 pl.semilogy(np.abs(tmpphi.flatten()))

008a_check_interpolation_near_borders.py

@@ -49,7 +49,7 @@
 try:
     pic.solve(rho = rho_mat)
 except ValueError as err:
-    print 'Got ValueError:', err
+    print('Got ValueError:', err)
 
 
 Ex_list = []

008b_check_interpolation_near_borders_plots.py

@@ -28,7 +28,7 @@
 erry_rel_list_old = []
 erry_rel_list = []
 
-for ii in xrange(N_points): 
+for ii in range(N_points): 
 
     Ex_ref = ob_ref.Ex[ii,:]
     Ey_ref = ob_ref.Ey[ii,:]

009_test_round_chamber_for_new_interp_devel.py

@@ -46,7 +46,7 @@
 #pic gather
 Ex_FDSW, Ey_FDSW = picFDSW.gather(x_probes, y_probes)
 
-E_r_th = map(lambda x: -np.sum(x_part**2+y_part**2<x**2)*qe/eps0/(2*np.pi*x), x_probes)
+E_r_th = [-np.sum(x_part**2+y_part**2<x**2)*qe/eps0/(2*np.pi*x) for x in x_probes]
 
 
 import pylab as pl

011_LHC_multigrid_test.py

@@ -80,22 +80,22 @@
 #pic solve timing
 import time
 N_rep_test_single = 1000
-print 'Solving PIC single %d times'%N_rep_test_single
+print('Solving PIC single %d times'%N_rep_test_single)
 t_start = time.mktime(time.localtime())
-for _ in xrange(N_rep_test_single):
+for _ in range(N_rep_test_single):
     pic_singlegrid.solve()
 t_stop = time.mktime(time.localtime())
 t_sw_single = (t_stop-t_start)/N_rep_test_single   
-print 'solving time singlegrid ', t_sw_single
+print('solving time singlegrid ', t_sw_single)
 
 N_rep_test_multi = 10000                                              
-print 'Solving PIC multi %d times'%N_rep_test_multi
+print('Solving PIC multi %d times'%N_rep_test_multi)
 t_start = time.mktime(time.localtime())
-for _ in xrange(N_rep_test_multi):
+for _ in range(N_rep_test_multi):
     pic_multigrid.solve()
 t_stop = time.mktime(time.localtime())
 t_sw_multi = (t_stop-t_start)/N_rep_test_multi
-print 'solving time multigrid ', t_sw_multi
+print('solving time multigrid ', t_sw_multi)
 
 
 # build probes for single circle
@@ -119,7 +119,7 @@
 pl.subplot(1,3,1)
 #~ pl.plot(pic_singlegrid.xn, pic_singlegrid.yn,'.y', label = 'Singlegrid')
 #~ pl.plot(pic_singlegrid_ext.xn, pic_singlegrid_ext.yn,'.m', label = 'Singlegrid telescope')
-for ii in xrange(pic_multigrid.n_grids):
+for ii in range(pic_multigrid.n_grids):
     pl.plot(pic_multigrid.pic_list[ii].pic_internal.chamb.Vx, pic_multigrid.pic_list[ii].pic_internal.chamb.Vy, '.-', label = 'Internal grid %d'%ii)
 pl.plot(bunch.x, bunch.y, '.k')
 pl.plot(Vx, Vy, 'k--', label = 'Chamber')