Python 3 migration of PyPARIS_sim_class v1.2.4

Author: giadarol

LHC_custom.py

@@ -91,7 +91,7 @@ def __init__(self, n_segments, machine_configuration, optics_dict=None, **kwargs
         pp.i_octupole_defocusing = None
         pp.octupole_knob = None	
 
-        for attr in kwargs.keys():
+        for attr in list(kwargs.keys()):
             if kwargs[attr] is not None:
                 if type(kwargs[attr]) is list or type(kwargs[attr]) is np.ndarray:
                     str2print = '[%s ...]'%repr(kwargs[attr][0])

Save_Load_Status.py

@@ -33,7 +33,7 @@ def load_from_file(self):
 
     def print_from_file(self):
         with open(self.filename) as fid:
-            print fid.read()
+            print(fid.read())
 
     def before_simulation(self):
         self.first_run = False
@@ -43,7 +43,7 @@ def before_simulation(self):
             self.first_turn_part += self.N_turns_per_run
             self.last_turn_part += self.N_turns_per_run
         except IOError:
-            print 'Simulation Status not found --> initializing simulation'
+            print('Simulation Status not found --> initializing simulation')
             self.first_run = True
             self.present_simulation_part = 0
             self.first_turn_part = 0
@@ -59,24 +59,24 @@ def before_simulation(self):
 
         self.dump_to_file()
 
-        print 'Starting part:\n\n'
+        print('Starting part:\n\n')
         self.print_from_file()
-        print '\n\n'
+        print('\n\n')
 
     def after_simulation(self):
         self.load_from_file()
         self.present_part_done = True
         self.present_part_running = False
         self.dump_to_file()
 
-        print 'Done part:\n\n'
+        print('Done part:\n\n')
         self.print_from_file()
-        print '\n\n'
+        print('\n\n')
 
         if self.check_for_resubmit:
 
             if self.last_turn_part+1<self.N_turns_target:
-                print 'resubmit the job'
+                print('resubmit the job')
                 os.system('bsub < job.cmd')
 
     def restart_last(self):
@@ -93,7 +93,7 @@ def restart_last(self):
 
         self.dump_to_file()
 
-        print 'Restored status:\n\n'
+        print('Restored status:\n\n')
         self.print_from_file()
-        print '\n\n'
+        print('\n\n')
 

Simulation.py

@@ -30,7 +30,7 @@ def init_all(self):
             self.n_kick_smooth = pp.n_segments
 
         # define the machine
-        from LHC_custom import LHC
+        from .LHC_custom import LHC
         self.machine = LHC(
                         n_segments=pp.n_segments,
                         machine_configuration=pp.machine_configuration,
@@ -181,10 +181,10 @@ def init_all(self):
         i_start_part, i_end_part = sharing.my_part(myid)
         self.mypart = self.machine.one_turn_map[i_start_part:i_end_part]
         if self.ring_of_CPUs.I_am_a_worker:
-            print 'I am id=%d/%d (worker) and my part is %d long'%(myid, self.ring_of_CPUs.N_nodes, len(self.mypart))
+            print('I am id=%d/%d (worker) and my part is %d long'%(myid, self.ring_of_CPUs.N_nodes, len(self.mypart)))
         elif self.ring_of_CPUs.I_am_the_master:
             self.non_parallel_part = self.machine.one_turn_map[i_end_parallel:]
-            print 'I am id=%d/%d (master) and my part is %d long'%(myid, self.ring_of_CPUs.N_nodes, len(self.mypart))
+            print('I am id=%d/%d (master) and my part is %d long'%(myid, self.ring_of_CPUs.N_nodes, len(self.mypart)))
 
         #install eclouds in my part
         my_new_part = []
@@ -248,7 +248,7 @@ def init_all(self):
         self.mypart = my_new_part
 
         if pp.footprint_mode:
-            print 'Proc. %d computing maps'%myid
+            print('Proc. %d computing maps'%myid)
             # generate a bunch 
             bunch_for_map=self.machine.generate_6D_Gaussian_bunch_matched(
                         n_macroparticles=pp.n_macroparticles_for_footprint_map, intensity=pp.intensity,
@@ -283,7 +283,7 @@ def init_all(self):
                 else:
                     for ss in slices_list_for_map:
                         ele.track(ss)
-            print 'Proc. %d done with maps'%myid
+            print('Proc. %d done with maps'%myid)
 
             with open('measured_optics_%d.pkl'%myid, 'wb') as fid:
                 pickle.dump({
@@ -322,10 +322,10 @@ def init_master(self):
         elif SimSt.first_run:
 
             if pp.bunch_from_file is not None:
-                print 'Loading bunch from file %s ...'%pp.bunch_from_file
+                print('Loading bunch from file %s ...'%pp.bunch_from_file)
                 with h5py.File(pp.bunch_from_file, 'r') as fid:
                     self.bunch = self.buffer_to_piece(np.array(fid['bunch']).copy())
-                print 'Bunch loaded from file.\n'
+                print('Bunch loaded from file.\n')
 
             else:
                 self.bunch = self.machine.generate_6D_Gaussian_bunch_matched(
@@ -344,12 +344,12 @@ def init_master(self):
                     self.bunch.x += x_kick
                     self.bunch.y += y_kick
 
-                print 'Bunch initialized.'
+                print('Bunch initialized.')
         else:
-            print 'Loading bunch from file...'
+            print('Loading bunch from file...')
             with h5py.File('bunch_status_part%02d.h5'%(SimSt.present_simulation_part-1), 'r') as fid:
                 self.bunch = self.buffer_to_piece(np.array(fid['bunch']).copy())
-            print 'Bunch loaded from file.'
+            print('Bunch loaded from file.')
 
         # initial slicing
         self.slicer = UniformBinSlicer(n_slices = pp.n_slices, z_cuts=(-pp.z_cut, pp.z_cut))
@@ -371,7 +371,7 @@ def init_master(self):
 
         pieces_to_be_treated = slice_obj_list
 
-        print 'N_turns', self.N_turns
+        print('N_turns', self.N_turns)
 
         if pp.footprint_mode:
             self.recorded_particles = ParticleTrajectories(pp.n_macroparticles_for_footprint_track, self.N_turns)
@@ -413,7 +413,7 @@ def finalize_turn_on_master(self, pieces_treated):
         if not pp.footprint_mode and self.bunch.macroparticlenumber < pp.sim_stop_frac * pp.n_macroparticles:
             orders_to_pass.append('stop')
             self.SimSt.check_for_resubmit = False
-            print 'Stop simulation due to beam losses.'
+            print('Stop simulation due to beam losses.')
 
         # 2. for the emittance growth
         if pp.flag_check_emittance_growth:
@@ -422,7 +422,7 @@ def finalize_turn_on_master(self, pieces_treated):
             if not pp.footprint_mode and (self.bunch.epsn_x() > epsn_x_max or self.bunch.epsn_y() > epsn_y_max):
                 orders_to_pass.append('stop')
                 self.SimSt.check_for_resubmit = False
-                print 'Stop simulation due to emittance growth.'
+                print('Stop simulation due to emittance growth.')
 
         return orders_to_pass, new_pieces_to_be_treated
 
@@ -438,13 +438,13 @@ def finalize_simulation(self):
             # Tunes
 
             import NAFFlib
-            print 'NAFFlib spectral analysis...'
+            print('NAFFlib spectral analysis...')
             qx_i = np.empty_like(self.recorded_particles.x_i[:,0])
             qy_i = np.empty_like(self.recorded_particles.x_i[:,0])
             for ii in range(len(qx_i)):
                 qx_i[ii] = NAFFlib.get_tune(self.recorded_particles.x_i[ii] + 1j*self.recorded_particles.xp_i[ii])
                 qy_i[ii] = NAFFlib.get_tune(self.recorded_particles.y_i[ii] + 1j*self.recorded_particles.yp_i[ii])
-            print 'NAFFlib spectral analysis done.'
+            print('NAFFlib spectral analysis done.')
 
             # Save
             import h5py
@@ -460,7 +460,7 @@ def finalize_simulation(self):
             'y_centroid': np.mean(self.recorded_particles.y_i, axis=1)}
 
             with h5py.File('footprint.h5', 'w') as fid:
-                for kk in dict_beam_status.keys():
+                for kk in list(dict_beam_status.keys()):
                     fid[kk] = dict_beam_status[kk]
         else:
             #save data for multijob operation and launch new job

examples/000_feedback_damping_time/mystyle.py

@@ -8,7 +8,7 @@ def mystyle(fontsz=16):
 	font = {#'family' : 'normal',
 			#'weight' : 'bold',
 			'size'   : fontsz}
-	print fontsz
+	print(fontsz)
 	rcdefaults()
 	rc('font', **font)
 

examples/001_simulation_with_eclouds/mystyle.py

@@ -8,7 +8,7 @@ def mystyle(fontsz=16):
 	font = {#'family' : 'normal',
 			#'weight' : 'bold',
 			'size'   : fontsz}
-	print fontsz
+	print(fontsz)
 	rcdefaults()
 	rc('font', **font)
 

examples/003_save_electron_potential/000_save_pinch_first_ecloud_average.py

@@ -41,7 +41,7 @@ def one_pinch(save_rho=True, save_sigmas=False, save_coords=False):
     t_start = time.mktime(time.localtime())
     for i_ss, ss in enumerate(list_slice_objects[::-1]):
         if np.mod(i_ss, 20)==0:
-            print("%d / %d"%(i_ss, N_slices))
+            print(("%d / %d"%(i_ss, N_slices)))
         first_ecloud.track(ss)
         if ss.slice_info != 'unsliced':
             z_centers.append(ss.slice_info['z_bin_center'])
@@ -51,7 +51,7 @@ def one_pinch(save_rho=True, save_sigmas=False, save_coords=False):
 
     t_end = time.mktime(time.localtime())
 
-    print('Track time %.2f s' % (t_end - t_start))
+    print(('Track time %.2f s' % (t_end - t_start)))
 
     dd = {}
     dd['phi'] = first_ecloud.phi_ele_last_track
@@ -74,7 +74,7 @@ def one_pinch(save_rho=True, save_sigmas=False, save_coords=False):
     dd['rho'] /= 1.*n_pinches_to_average
 
 for i in range(n_pinches_to_average-1):
-    print('Running pinch #%d/%d.'%(i,n_pinches_to_average))
+    print(('Running pinch #%d/%d.'%(i,n_pinches_to_average)))
     dd_temp = one_pinch(save_rho=save_rho, save_sigmas=False, save_coords=False)
     dd['phi'] += dd_temp['phi']/(1.*n_pinches_to_average)
     if save_rho:

examples/003_save_electron_potential/001_plots_and_video_of_saved_pinch.py

@@ -61,7 +61,7 @@
 
 for i_frame, z_obs in enumerate(list(z_movie) + [z_single_frame_interactive]):
 
-    print('Frame %d/%d'%(i_frame, len(z_movie)))
+    print(('Frame %d/%d'%(i_frame, len(z_movie))))
 
     if not gen_movie and i_frame < len(z_movie):
         continue

generate_python3

@@ -3,4 +3,4 @@ rm -rf ../python3/PyPARIS_sim_class
 cp -r ../PyPARIS_sim_class ../python3/PyPARIS_sim_class
 rm ../python3/PyPARIS_sim_class/*.so
 2to3 --output-dir=../python3/PyPARIS_sim_class -W -n ../PyPARIS_sim_class
-rm -rf ../python3/PyPARIS_sim_class/.git
+#rm -rf ../python3/PyPARIS_sim_class/.git

t000_build_single_instance.py

@@ -1,4 +1,4 @@
-import Simulation as sim_mod
+from . import Simulation as sim_mod
 
 N_proc_pretend = 4
 myid_pretend = 2

t001_run_single_core.py

@@ -1,4 +1,4 @@
-import Simulation as sim_mod
+from . import Simulation as sim_mod
 
 ring = sim_mod.get_serial_CPUring()
 ring.run()