Merge branch 'develop'

PyCOMPLETE · Mar 16, 2016 · a29cfe4 · a29cfe4
2 parents dd0a957 + 8e0005e
commit a29cfe4
Show file tree

Hide file tree

Showing 41 changed files with 39 additions and 38 deletions.
diff --git a/MP_system.py b/MP_system.py
@@ -7,7 +7,7 @@
 #     
 #     This file is part of the code:
 #                                                                                          
-#                   PyECLOUD Version 5.0.1                     
+#                   PyECLOUD Version 5.0.2                     
 #                  
 #                                                                       
 #     Author and contact:   Giovanni IADAROLA 

diff --git a/PyEC4PyHT.py b/PyEC4PyHT.py
@@ -8,7 +8,7 @@
 #     
 #     This file is part of the code:
 #                                                                                          
-#                   PyECLOUD Version 5.0.1                     
+#                   PyECLOUD Version 5.0.2                     
 #                  
 #                                                                       
 #     Author and contact:   Giovanni IADAROLA 
@@ -86,7 +86,7 @@ def __init__(self, L_ecloud, slicer, Dt_ref, pyecl_input_folder='./', flag_clean
 				slice_by_slice_mode=False, **kwargs):
 
 
-		print 'PyECLOUD Version 5.0.1'
+		print 'PyECLOUD Version 5.0.2'
 		print 'PyHEADTAIL module'
 		print 'Initializing ecloud from folder: '+pyecl_input_folder
 		self.slicer = slicer
@@ -295,7 +295,8 @@ def replace_with_recorded_field_map(self, delete_ecloud_data=True):
 			from PyHEADTAIL.field_maps.Transverse_Efield_map import Transverse_Efield_map
 			self.efieldmap = Transverse_Efield_map(xg = self.spacech_ele.xg, yg = self.spacech_ele.yg, 
 			    Ex=self.Ex_ele_last_track, Ey=self.Ey_ele_last_track, n_slices=self.slicer.n_slices, 
-			    z_cut=self.slicer.z_cuts, L_interaction=self.L_ecloud, flag_clean_slices = True)
+			    z_cut=self.slicer.z_cuts, L_interaction=self.L_ecloud, flag_clean_slices = True,
+			    x_beam_offset = self.x_beam_offset, y_beam_offset = self.y_beam_offset)
 
 			self._ecloud_track = self.track
 

diff --git a/beam_and_timing.py b/beam_and_timing.py
@@ -7,7 +7,7 @@
 #     
 #     This file is part of the code:
 #                                                                                          
-#                   PyECLOUD Version 5.0.1                     
+#                   PyECLOUD Version 5.0.2                     
 #                  
 #                                                                       
 #     Author and contact:   Giovanni IADAROLA 
@@ -107,7 +107,7 @@ def __init__(self,flag_bunched_beam, fact_beam, coast_dens, beam_field_file, lam
                     exec(f.read())
                     f.close()
             else:
-                ppb_vect = np.array(filling_pattern_file) 
+                ppb_vect = np.float_(np.array(filling_pattern_file)) 
 
             if flag_secodary_beam:
                 t=t_primary_beam

diff --git a/buildup_simulation.py b/buildup_simulation.py
@@ -9,7 +9,7 @@
 #     
 #     This file is part of the code:
 #                                                                      		            
-#		           PyECLOUD Version 5.0.1                   
+#		           PyECLOUD Version 5.0.2                   
 #                  
 #                                                                       
 #     Author and contact:   Giovanni IADAROLA 
@@ -59,7 +59,7 @@
 class BuildupSimulation(object):
 	def __init__(self, pyecl_input_folder='./', **kwargs):
 
-		print 'PyECLOUD Version 5.0.1'
+		print 'PyECLOUD Version 5.0.2'
 		beamtim,MP_e, dynamics,impact_man, pyeclsaver, \
 				gas_ion_flag, resgasion, t_ion, \
 				spacech_ele,t_sc_ON, photoem_flag, phemiss,\

diff --git a/change_version_number.py b/change_version_number.py
@@ -9,7 +9,7 @@
         with open(filename) as fid:
             content=fid.read()
         if '[email protected]' in content:
-            content=content.replace('PyECLOUD Version 5.0.1', 'PyECLOUD Version 5.0.1')
+            content=content.replace('PyECLOUD Version 5.0.2', 'PyECLOUD Version 5.0.2')
             with open(filename,'w') as fid:
                 fid.write(content)
 

diff --git a/dynamics_Boris_f2py.py b/dynamics_Boris_f2py.py
@@ -7,7 +7,7 @@
 #     
 #     This file is part of the code:
 #                                                                      		            
-#		           PyECLOUD Version 5.0.1                     
+#		           PyECLOUD Version 5.0.2                     
 #                  
 #                                                                       
 #     Author and contact:   Giovanni IADAROLA 

diff --git a/dynamics_Boris_multipole.py b/dynamics_Boris_multipole.py
@@ -7,7 +7,7 @@
 #     
 #     This file is part of the code:
 #                                                                                           
-#                          PyECLOUD Version 5.0.1                   
+#                          PyECLOUD Version 5.0.2                   
 #                  
 #                                                                       
 #     Author and contact:   Giovanni IADAROLA 

diff --git a/dynamics_dipole.py b/dynamics_dipole.py
@@ -7,7 +7,7 @@
 #     
 #     This file is part of the code:
 #                                                                      		            
-#		           PyECLOUD Version 5.0.1                     
+#		           PyECLOUD Version 5.0.2                     
 #                  
 #                                                                       
 #     Author and contact:   Giovanni IADAROLA 

diff --git a/dynamics_strong_B_generalized.py b/dynamics_strong_B_generalized.py
@@ -7,7 +7,7 @@
 #     
 #     This file is part of the code:
 #                                                                      		            
-#		           PyECLOUD Version 5.0.1                     
+#		           PyECLOUD Version 5.0.2                     
 #                  
 #                                                                       
 #     Author and contact:   Giovanni IADAROLA 

diff --git a/gas_ionization_class.py b/gas_ionization_class.py
@@ -7,7 +7,7 @@
 #     
 #     This file is part of the code:
 #                                                                      		            
-#		           PyECLOUD Version 5.0.1                     
+#		           PyECLOUD Version 5.0.2                     
 #                  
 #                                                                       
 #     Author and contact:   Giovanni IADAROLA 

diff --git a/gen_photoemission_class.py b/gen_photoemission_class.py
@@ -7,7 +7,7 @@
 #     
 #     This file is part of the code:
 #                                                                      		            
-#		           PyECLOUD Version 5.0.1                   
+#		           PyECLOUD Version 5.0.2                   
 #                  
 #                                                                       
 #     Author and contact:   Giovanni IADAROLA 

diff --git a/geom_impact_ellip.py b/geom_impact_ellip.py
@@ -7,7 +7,7 @@
 #     
 #     This file is part of the code:
 #                                                                      		            
-#		           PyECLOUD Version 5.0.1               
+#		           PyECLOUD Version 5.0.2               
 #                  
 #                                                                       
 #     Author and contact:   Giovanni IADAROLA 

diff --git a/geom_impact_poly.py b/geom_impact_poly.py
@@ -7,7 +7,7 @@
 #     
 #     This file is part of the code:
 #                                                                                          
-#                   PyECLOUD Version 5.0.1                   
+#                   PyECLOUD Version 5.0.2                   
 #                  
 #                                                                       
 #     Author and contact:   Giovanni IADAROLA 

diff --git a/geom_impact_poly_fast_impact.py b/geom_impact_poly_fast_impact.py
@@ -7,7 +7,7 @@
 #     
 #     This file is part of the code:
 #                                                                                          
-#                   PyECLOUD Version 5.0.1                   
+#                   PyECLOUD Version 5.0.2                   
 #                  
 #                                                                       
 #     Author and contact:   Giovanni IADAROLA 

diff --git a/geom_impact_rect_fast_impact.py b/geom_impact_rect_fast_impact.py
@@ -7,7 +7,7 @@
 #     
 #     This file is part of the code:
 #                                                                                          
-#                   PyECLOUD Version 5.0.1                   
+#                   PyECLOUD Version 5.0.2                   
 #                  
 #                                                                       
 #     Author and contact:   Giovanni IADAROLA 

diff --git a/impact_management_class.py b/impact_management_class.py
@@ -7,7 +7,7 @@
 #     
 #     This file is part of the code:
 #                                                                      		            
-#		           PyECLOUD Version 5.0.1                     
+#		           PyECLOUD Version 5.0.2                     
 #                  
 #                                                                       
 #     Author and contact:   Giovanni IADAROLA 

diff --git a/init.py b/init.py
@@ -7,7 +7,7 @@
 #     
 #     This file is part of the code:
 #                                                                      		            
-#		           PyECLOUD Version 5.0.1                      
+#		           PyECLOUD Version 5.0.2                      
 #                  
 #                                                                       
 #     Author and contact:   Giovanni IADAROLA 

diff --git a/main.py b/main.py
@@ -9,7 +9,7 @@
 #     
 #     This file is part of the code:
 #                                                                      		            
-#		           PyECLOUD Version 5.0.1                   
+#		           PyECLOUD Version 5.0.2                   
 #                  
 #                                                                       
 #     Author and contact:   Giovanni IADAROLA 

diff --git a/proc_video3.py b/proc_video3.py
@@ -7,7 +7,7 @@
 #     
 #     This file is part of the code:
 #                                                                      		            
-#		           PyECLOUD Version 5.0.1                  
+#		           PyECLOUD Version 5.0.2                  
 #                  
 #                                                                       
 #     Author and contact:   Giovanni IADAROLA 

diff --git a/pyecloud_saver.py b/pyecloud_saver.py
@@ -8,7 +8,7 @@
 #     
 #     This file is part of the code:
 #                                                                                          
-#                   PyECLOUD Version 5.0.1                     
+#                   PyECLOUD Version 5.0.2                     
 #                  
 #                                                                       
 #     Author and contact:   Giovanni IADAROLA 
@@ -68,7 +68,7 @@ def __init__(self, logfile_path):
 		self.logfile_path = logfile_path
 		print 'Starting pyecloud_saver init.'
 		flog=open(self.logfile_path,'w')
-		flog.write('PyECLOUD Version 5.0.1\n')
+		flog.write('PyECLOUD Version 5.0.2\n')
 		timestr = time.strftime("%d %b %Y %H:%M:%S", time.localtime())
 		flog.write('Simulation started on %s\n'%timestr)
 		flog.close()

diff --git a/sec_emission.py b/sec_emission.py
@@ -7,7 +7,7 @@
 #     
 #     This file is part of the code:
 #                                                                      		            
-#		           PyECLOUD Version 5.0.1                     
+#		           PyECLOUD Version 5.0.2                     
 #                  
 #                                                                       
 #     Author and contact:   Giovanni IADAROLA 

diff --git a/sec_emission_model_ECLOUD.py b/sec_emission_model_ECLOUD.py
@@ -7,7 +7,7 @@
 #     
 #     This file is part of the code:
 #                                                                      		            
-#		           PyECLOUD Version 5.0.1                     
+#		           PyECLOUD Version 5.0.2                     
 #                  
 #                                                                       
 #     Author and contact:   Giovanni IADAROLA 

diff --git a/sec_emission_model_ECLOUD_nunif.py b/sec_emission_model_ECLOUD_nunif.py
@@ -7,7 +7,7 @@
 #     
 #     This file is part of the code:
 #                                                                      		            
-#		           PyECLOUD Version 5.0.1                     
+#		           PyECLOUD Version 5.0.2                     
 #                  
 #                                                                       
 #     Author and contact:   Giovanni IADAROLA 

diff --git a/sec_emission_model_accurate_low_ene.py b/sec_emission_model_accurate_low_ene.py
@@ -7,7 +7,7 @@
 #     
 #     This file is part of the code:
 #                                                                      		            
-#		           PyECLOUD Version 5.0.1                     
+#		           PyECLOUD Version 5.0.2                     
 #                  
 #                                                                       
 #     Author and contact:   Giovanni IADAROLA 

diff --git a/sec_emission_model_cos_low_ener.py b/sec_emission_model_cos_low_ener.py
@@ -7,7 +7,7 @@
 #     
 #     This file is part of the code:
 #                                                                      		            
-#		           PyECLOUD Version 5.0.1                     
+#		           PyECLOUD Version 5.0.2                     
 #                  
 #                                                                       
 #     Author and contact:   Giovanni IADAROLA 

diff --git a/sec_emission_model_flat_low_ener.py b/sec_emission_model_flat_low_ener.py
@@ -7,7 +7,7 @@
 #     
 #     This file is part of the code:
 #                                                                      		            
-#		           PyECLOUD Version 5.0.1                     
+#		           PyECLOUD Version 5.0.2                     
 #                  
 #                                                                       
 #     Author and contact:   Giovanni IADAROLA 

diff --git a/sincc_cosincc_cubsincc.py b/sincc_cosincc_cubsincc.py
@@ -7,7 +7,7 @@
 #     
 #     This file is part of the code:
 #                                                                      		            
-#		           PyECLOUD Version 5.0.1                      
+#		           PyECLOUD Version 5.0.2                      
 #                  
 #                                                                       
 #     Author and contact:   Giovanni IADAROLA 

diff --git a/space_charge_class.py b/space_charge_class.py
@@ -8,7 +8,7 @@
 #     This file is part of the code:
 #                                                                      		    
 # 
-#		           PyECLOUD Version 5.0.1                     
+#		           PyECLOUD Version 5.0.2                     
 #                  
 #                                                                       
 #     Author and contact:   Giovanni IADAROLA 

diff --git a/space_charge_class_SW_old.py b/space_charge_class_SW_old.py
@@ -8,7 +8,7 @@
 #     This file is part of the code:
 #                                                                      		    
 # 
-#		           PyECLOUD Version 5.0.1                     
+#		           PyECLOUD Version 5.0.2                     
 #                  
 #                                                                       
 #     Author and contact:   Giovanni IADAROLA 

diff --git a/test_StrongB_generalized.py b/test_StrongB_generalized.py
@@ -7,7 +7,7 @@
 #     
 #     This file is part of the code:
 #                                                                                          
-#                   PyECLOUD Version 5.0.1                     
+#                   PyECLOUD Version 5.0.2                     
 #                  
 #                                                                       
 #     Author and contact:   Giovanni IADAROLA 

diff --git a/test_StrongB_generalized_2.py b/test_StrongB_generalized_2.py
@@ -7,7 +7,7 @@
 #     
 #     This file is part of the code:
 #                                                                                          
-#                   PyECLOUD Version 5.0.1                     
+#                   PyECLOUD Version 5.0.2                     
 #                  
 #                                                                       
 #     Author and contact:   Giovanni IADAROLA 

diff --git a/testing/tests_buildup/000_run_simulation.py b/testing/tests_buildup/000_run_simulation.py
@@ -17,5 +17,5 @@
 print ''
 print 'Test simulation done!'
 print 'To instpect the results you can run:'
-print '002_comparison_against_reference.py'
+print '001_comparison_against_reference.py'
 print ''
diff --git a/testing/tests_buildup/001_comparison_against_reference.py b/testing/tests_buildup/001_comparison_against_reference.py
@@ -14,7 +14,7 @@
 
 pl.close('all')
 
-# sim_folder = 'LHC_ArcQuadReal_450GeV_sey1.70_2.5e11ppb_bl_1.00ns'
+# sim_folder = 'LHC_ArcDipReal_450GeV_sey1.70_2.5e11ppb_bl_1.00ns'
 # sim_folder = 'LHC_ArcQuadReal_450GeV_sey1.65_2.5e11ppb_bl_1.00ns'
 sim_folder = 'LHC_ArcDipReal_450GeV_sey1.00_2.5e11ppb_bl_1.00ns_gas_ionization'
 

diff --git a/....60_2.5e11ppb_bl_1.00ns/Pyecltest_ref.mat → ....70_2.5e11ppb_bl_1.00ns/Pyecltest_ref.mat b/....60_2.5e11ppb_bl_1.00ns/Pyecltest_ref.mat → ....70_2.5e11ppb_bl_1.00ns/Pyecltest_ref.mat
diff --git a/...450GeV_sey1.60_2.5e11ppb_bl_1.00ns/STDERR → ...450GeV_sey1.70_2.5e11ppb_bl_1.00ns/STDERR b/...450GeV_sey1.60_2.5e11ppb_bl_1.00ns/STDERR → ...450GeV_sey1.70_2.5e11ppb_bl_1.00ns/STDERR
diff --git a/...450GeV_sey1.60_2.5e11ppb_bl_1.00ns/STDOUT → ...450GeV_sey1.70_2.5e11ppb_bl_1.00ns/STDOUT b/...450GeV_sey1.60_2.5e11ppb_bl_1.00ns/STDOUT → ...450GeV_sey1.70_2.5e11ppb_bl_1.00ns/STDOUT
diff --git a/...GeV_sey1.60_2.5e11ppb_bl_1.00ns/beam.beam → ...GeV_sey1.70_2.5e11ppb_bl_1.00ns/beam.beam b/...GeV_sey1.60_2.5e11ppb_bl_1.00ns/beam.beam → ...GeV_sey1.70_2.5e11ppb_bl_1.00ns/beam.beam
diff --git a/...50GeV_sey1.60_2.5e11ppb_bl_1.00ns/job.job → ...50GeV_sey1.70_2.5e11ppb_bl_1.00ns/job.job b/...50GeV_sey1.60_2.5e11ppb_bl_1.00ns/job.job → ...50GeV_sey1.70_2.5e11ppb_bl_1.00ns/job.job
diff --git a/...e11ppb_bl_1.00ns/machine_parameters.input → ...e11ppb_bl_1.00ns/machine_parameters.input b/...e11ppb_bl_1.00ns/machine_parameters.input → ...e11ppb_bl_1.00ns/machine_parameters.input
diff --git a/....00ns/secondary_emission_parameters.input → ....00ns/secondary_emission_parameters.input b/....00ns/secondary_emission_parameters.input → ....00ns/secondary_emission_parameters.input
diff --git a/...ppb_bl_1.00ns/simulation_parameters.input → ...ppb_bl_1.00ns/simulation_parameters.input b/...ppb_bl_1.00ns/simulation_parameters.input → ...ppb_bl_1.00ns/simulation_parameters.input